Skip to content

Update to build with net8, remove net6 and start net10 testing #5103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikem8361 merged 5 commits into from
Dec 13, 2024
Merged

Update to build with net8, remove net6 and start net10 testing #5103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee5f9f0
Update target framework to net8.0
Dec 11, 2024
9b3a1aa
Test against .NET 10
Dec 12, 2024
ddb3e56
Fix net10 desktop webapp test
Dec 12, 2024
f95a7a2
Fix Windows dumps; hardcoded 9 in DumpGenerationFixture
Dec 12, 2024
6133b57
Code review feedback; remove more hardcoded net8.0, etc. references
Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,19 @@
</PropertyGroup>

<PropertyGroup>
<!-- This represents the minimum supported .NET Version, so the min
version that the tools must be able to run against for a simple customer
experience.
When bumping this, bump __targetRid in build.sh/build-native.cmd
and modify the Debugger.Tests.Configs to reflect the new TFMs -->
<NetCoreAppMinVersion>6.0</NetCoreAppMinVersion>
<DesktopTargetFramework>net462</DesktopTargetFramework>
<!--
This represents the minimum supported .NET Version, so the min version that the tools must
be able to run against for a simple customer experience.

When bumping this, bump __targetRid in build.sh/build-native.cmd and modify the
Debugger.Tests.Configs to reflect the new TFMs
-->
<NetCoreAppMinVersion>8.0</NetCoreAppMinVersion>
<NetCoreAppMinTargetFramework>net$(NetCoreAppMinVersion)</NetCoreAppMinTargetFramework>
<!-- this is the list of TFMs we build our debuggees and tracees as. -->
<SupportedSubProcessTargetFrameworks>net6.0;net8.0;net9.0</SupportedSubProcessTargetFrameworks>
<!-- this is the list of TFMs we build our unit tests as. -->
<SupportedXUnitTestTargetFrameworks>net6.0;net8.0</SupportedXUnitTestTargetFrameworks>
<!-- This is the list of TFMs we build our debuggees and tracees as. -->
<SupportedSubProcessTargetFrameworks>net8.0;net9.0;net10.0</SupportedSubProcessTargetFrameworks>
<!-- This is the list of TFMs we build our unit tests as. -->
<SupportedXUnitTestTargetFrameworks>net8.0</SupportedXUnitTestTargetFrameworks>
</PropertyGroup>
</Project>
2 changes: 0 additions & 2 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-pub-dotnet-aspnetcore-401ae7c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-401ae7cb/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-pub-dotnet-runtime-756e620" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-756e6205/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
Expand Down
56 changes: 28 additions & 28 deletions eng/AuxMsbuildFiles/SdkPackOverrides.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,19 @@
<Target Name="OverrideTestingVersions">

<PropertyGroup>
<RuntimeVersion60>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net6.0')->Metadata('Runtime'))</RuntimeVersion60>
<RuntimeVersion80>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net8.0')->Metadata('Runtime'))</RuntimeVersion80>
<RuntimeVersion90>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net9.0')->Metadata('Runtime'))</RuntimeVersion90>
<RuntimeVersion10>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net10.0')->Metadata('Runtime'))</RuntimeVersion10>

<AspNetVersion60>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net6.0')->Metadata('AspNet'))</AspNetVersion60>
<AspNetVersion80>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net8.0')->Metadata('AspNet'))</AspNetVersion80>
<AspNetVersion90>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net9.0')->Metadata('AspNet'))</AspNetVersion90>
<AspNetVersion10>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net10.0')->Metadata('AspNet'))</AspNetVersion10>
</PropertyGroup>

<ItemGroup>
<!--
CrossGen2 Pack
-->
<KnownCrossgen2Pack Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
<Crossgen2PackVersion>$(RuntimeVersion60)</Crossgen2PackVersion>
</KnownCrossgen2Pack>

<KnownCrossgen2Pack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
<Crossgen2PackVersion>$(RuntimeVersion80)</Crossgen2PackVersion>
</KnownCrossgen2Pack>
Expand All @@ -27,14 +23,13 @@
<Crossgen2PackVersion>$(RuntimeVersion90)</Crossgen2PackVersion>
</KnownCrossgen2Pack>

<KnownCrossgen2Pack Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
<Crossgen2PackVersion>$(RuntimeVersion10)</Crossgen2PackVersion>
</KnownCrossgen2Pack>

<!--
Microsoft.NETCore.App Runtimes
-->
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<TargetingPackVersion>$(RuntimeVersion60)</TargetingPackVersion>
<LatestRuntimeFrameworkVersion>$(RuntimeVersion60)</LatestRuntimeFrameworkVersion>
</KnownFrameworkReference>

<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<TargetingPackVersion>$(RuntimeVersion80)</TargetingPackVersion>
<LatestRuntimeFrameworkVersion>$(RuntimeVersion80)</LatestRuntimeFrameworkVersion>
Expand All @@ -45,9 +40,10 @@
<LatestRuntimeFrameworkVersion>$(RuntimeVersion90)</LatestRuntimeFrameworkVersion>
</KnownFrameworkReference>

<KnownAppHostPack Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<AppHostPackVersion>$(RuntimeVersion60)</AppHostPackVersion>
</KnownAppHostPack>
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<TargetingPackVersion>$(RuntimeVersion10)</TargetingPackVersion>
<LatestRuntimeFrameworkVersion>$(RuntimeVersion10)</LatestRuntimeFrameworkVersion>
</KnownFrameworkReference>

<KnownAppHostPack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<AppHostPackVersion>$(RuntimeVersion80)</AppHostPackVersion>
Expand All @@ -57,9 +53,9 @@
<AppHostPackVersion>$(RuntimeVersion90)</AppHostPackVersion>
</KnownAppHostPack>

<KnownRuntimePack Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<LatestRuntimeFrameworkVersion>$(RuntimeVersion60)</LatestRuntimeFrameworkVersion>
</KnownRuntimePack>
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<AppHostPackVersion>$(RuntimeVersion10)</AppHostPackVersion>
</KnownAppHostPack>

<KnownRuntimePack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<LatestRuntimeFrameworkVersion>$(RuntimeVersion80)</LatestRuntimeFrameworkVersion>
Expand All @@ -69,14 +65,13 @@
<LatestRuntimeFrameworkVersion>$(RuntimeVersion90)</LatestRuntimeFrameworkVersion>
</KnownRuntimePack>

<KnownRuntimePack Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<LatestRuntimeFrameworkVersion>$(RuntimeVersion10)</LatestRuntimeFrameworkVersion>
</KnownRuntimePack>

<!--
Microsoft.AspNetCore.App Runtimes
-->
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<TargetingPackVersion>$(AspNetVersion60)</TargetingPackVersion>
<LatestRuntimeFrameworkVersion>$(AspNetVersion60)</LatestRuntimeFrameworkVersion>
</KnownFrameworkReference>

<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<TargetingPackVersion>$(AspNetVersion80)</TargetingPackVersion>
<LatestRuntimeFrameworkVersion>$(AspNetVersion80)</LatestRuntimeFrameworkVersion>
Expand All @@ -87,9 +82,10 @@
<LatestRuntimeFrameworkVersion>$(AspNetVersion90)</LatestRuntimeFrameworkVersion>
</KnownFrameworkReference>

<KnownAppHostPack Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<AppHostPackVersion>$(AspNetVersion60)</AppHostPackVersion>
</KnownAppHostPack>
<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<TargetingPackVersion>$(AspNetVersion10)</TargetingPackVersion>
<LatestRuntimeFrameworkVersion>$(AspNetVersion10)</LatestRuntimeFrameworkVersion>
</KnownFrameworkReference>

<KnownAppHostPack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<AppHostPackVersion>$(AspNetVersion80)</AppHostPackVersion>
Expand All @@ -99,9 +95,9 @@
<AppHostPackVersion>$(AspNetVersion90)</AppHostPackVersion>
</KnownAppHostPack>

<KnownRuntimePack Condition="'%(TargetFramework)' == 'net6.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<LatestRuntimeFrameworkVersion>$(AspNetVersion60)</LatestRuntimeFrameworkVersion>
</KnownRuntimePack>
<KnownAppHostPack Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<AppHostPackVersion>$(AspNetVersion10)</AppHostPackVersion>
</KnownAppHostPack>

<KnownRuntimePack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<LatestRuntimeFrameworkVersion>$(AspNetVersion80)</LatestRuntimeFrameworkVersion>
Expand All @@ -110,6 +106,10 @@
<KnownRuntimePack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<LatestRuntimeFrameworkVersion>$(AspNetVersion90)</LatestRuntimeFrameworkVersion>
</KnownRuntimePack>

<KnownRuntimePack Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<LatestRuntimeFrameworkVersion>$(AspNetVersion10)</LatestRuntimeFrameworkVersion>
</KnownRuntimePack>
</ItemGroup>
</Target>
</Project>
2 changes: 1 addition & 1 deletion eng/Build-Native.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ if %__BuildNative% EQU 1 (

REM Copy the native SOS binaries to where these tools expect for CI & VS testing

set "__targetRid=net6.0"
set "__targetRid=net8.0"
set "__dotnet_sos=%__RootBinDir%\bin\dotnet-sos\%__BuildType%\%__targetRid%"
set "__dotnet_dump=%__RootBinDir%\bin\dotnet-dump\%__BuildType%\%__targetRid%"
mkdir %__dotnet_sos%\win-%__TargetArch%
Expand Down
1 change: 1 addition & 0 deletions eng/InstallRuntimes.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
<![CDATA[
<RuntimeVersion%(RuntimeTestVersions.Identity)>%(RuntimeTestVersions.Runtime)</RuntimeVersion%(RuntimeTestVersions.Identity)>
<AspNetCoreVersion%(RuntimeTestVersions.Identity)>%(RuntimeTestVersions.AspNet)</AspNetCoreVersion%(RuntimeTestVersions.Identity)>
<TargetFramework%(RuntimeTestVersions.Identity)>%(RuntimeTestVersions.TargetFramework)</TargetFramework%(RuntimeTestVersions.Identity)>
]]>
</ConfigFileEntry>
</TestConfigFileLines>
Expand Down
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,25 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.102-servicing.24605.31">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-alpha.1.24611.5">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>92d3e8bae1b2c04b64cb333fb78b5294fa32731a</Sha>
<Sha>4869a2ac6914f7732d4c1805b6f9c0f9fc6c6a4a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.1-rtm.24577.14">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-alpha.2.24612.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>401ae7cb55f1460e038f7f8be0e8c782bfeec1ef</Sha>
<Sha>d159687000f1775b941fcf177fe455b99efc0dd1</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.1">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24612.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>401ae7cb55f1460e038f7f8be0e8c782bfeec1ef</Sha>
<Sha>d159687000f1775b941fcf177fe455b99efc0dd1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.1">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-alpha.1.24612.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>756e62050722c168cd3b753be73b7cbcd93f06d6</Sha>
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.1-servicing.24610.11">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24612.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>756e62050722c168cd3b753be73b7cbcd93f06d6</Sha>
<Sha>f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.561001">
Expand All @@ -62,13 +62,13 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>40e6b96cad11400acb5b8999057ac8ba748df940</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24225.1">
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.24605.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>8dccccec1ce3bd2fb532ec77d7e092ab9d684db7</Sha>
<Sha>7f449a5d6f05c6aed77e4abf85aac2ce19f6a2d6</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24225.1">
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.24605.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>8dccccec1ce3bd2fb532ec77d7e092ab9d684db7</Sha>
<Sha>7f449a5d6f05c6aed77e4abf85aac2ce19f6a2d6</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
39 changes: 14 additions & 25 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Latest shared runtime version updated by darc -->
<VSRedistCommonNetCoreSharedFrameworkx6490Version>9.0.1-servicing.24610.11</VSRedistCommonNetCoreSharedFrameworkx6490Version>
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.1</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-alpha.1.24612.1</VSRedistCommonNetCoreSharedFrameworkx64100Version>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-alpha.1.24612.1</MicrosoftNETCoreAppRuntimewinx64Version>
<!-- Latest shared aspnetcore version updated by darc -->
<MicrosoftAspNetCoreAppRefInternalVersion>9.0.1-rtm.24577.14</MicrosoftAspNetCoreAppRefInternalVersion>
<MicrosoftAspNetCoreAppRefVersion>9.0.1</MicrosoftAspNetCoreAppRefVersion>
<MicrosoftAspNetCoreAppRefInternalVersion>10.0.0-alpha.2.24612.1</MicrosoftAspNetCoreAppRefInternalVersion>
<MicrosoftAspNetCoreAppRefVersion>10.0.0-alpha.2.24612.1</MicrosoftAspNetCoreAppRefVersion>
<!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
<MicrosoftDotnetSdkVersion>9.0.100-rc.1.24409.1</MicrosoftDotnetSdkVersion>
<MicrosoftDotnetSdkVersion>10.0.100-alpha.1.24611.5</MicrosoftDotnetSdkVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Opt-in/out repo features -->
Expand Down Expand Up @@ -83,8 +83,8 @@
<MicrosoftCodeAnalysisVersion_4_4>4.4.0</MicrosoftCodeAnalysisVersion_4_4>
<MicrosoftCodeAnalysisVersion_LatestVS>4.8.0</MicrosoftCodeAnalysisVersion_LatestVS>
<MicrosoftCodeAnalysisVersion_LatestVS Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVersion_LatestVS>
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.23420.2</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23420.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisAnalyzersVersion>3.12.0-beta1.24605.1</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.24605.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
<!--
These packages affect the design-time experience in VS, so we update them at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
-->
Expand All @@ -102,10 +102,8 @@

-->
<PropertyGroup>
<MicrosoftNETCoreApp90Version>
</MicrosoftNETCoreApp90Version>
<MicrosoftNETCoreApp90Version>9.0.0</MicrosoftNETCoreApp90Version>
<MicrosoftNETCoreApp80Version>8.0.8</MicrosoftNETCoreApp80Version>
<MicrosoftNETCoreApp60Version>6.0.33</MicrosoftNETCoreApp60Version>
</PropertyGroup>
<PropertyGroup>
<DotnetRuntimeVersion Condition="'$(DotnetRuntimeVersion)' == ''">default</DotnetRuntimeVersion>
Expand All @@ -116,44 +114,35 @@
</PropertyGroup>
<ItemGroup Condition="!$(PrivateBuildTesting) AND !$(InternalReleaseTesting)">
<RuntimeTestVersions Include="Latest">
<RuntimeDownload>$(VSRedistCommonNetCoreSharedFrameworkx6490Version)</RuntimeDownload>
<RuntimeDownload>$(VSRedistCommonNetCoreSharedFrameworkx64100Version)</RuntimeDownload>
<Runtime>$(MicrosoftNETCoreAppRuntimewinx64Version)</Runtime>
<AspNetDownload>$(MicrosoftAspNetCoreAppRefInternalVersion)</AspNetDownload>
<AspNet>$(MicrosoftAspNetCoreAppRefVersion)</AspNet>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</RuntimeTestVersions>
<!--
<RuntimeTestVersions Include="Servicing1">
<RuntimeTestVersions Include="Servicing2">
<RuntimeDownload>$(MicrosoftNETCoreApp90Version)</RuntimeDownload>
<Runtime>$(MicrosoftNETCoreApp90Version)</Runtime>
<AspNetDownload>$(MicrosoftNETCoreApp90Version)</AspNetDownload>
<AspNet>$(MicrosoftNETCoreApp90Version)</AspNet>
<TargetFramework>net9.0</TargetFramework>
</RuntimeTestVersions>
-->
<RuntimeTestVersions Include="Servicing2">
<RuntimeTestVersions Include="Servicing3">
<RuntimeDownload>$(MicrosoftNETCoreApp80Version)</RuntimeDownload>
<Runtime>$(MicrosoftNETCoreApp80Version)</Runtime>
<AspNetDownload>$(MicrosoftNETCoreApp80Version)</AspNetDownload>
<AspNet>$(MicrosoftNETCoreApp80Version)</AspNet>
<TargetFramework>net8.0</TargetFramework>
</RuntimeTestVersions>
<RuntimeTestVersions Include="Servicing3">
<RuntimeDownload>$(MicrosoftNETCoreApp60Version)</RuntimeDownload>
<Runtime>$(MicrosoftNETCoreApp60Version)</Runtime>
<AspNetDownload>$(MicrosoftNETCoreApp60Version)</AspNetDownload>
<AspNet>$(MicrosoftNETCoreApp60Version)</AspNet>
<TargetFramework>net6.0</TargetFramework>
</RuntimeTestVersions>
</ItemGroup>
<!-- Private build testing -->
<ItemGroup Condition="$(PrivateBuildTesting)">
<RuntimeTestVersions Include="Latest">
<RuntimeDownload>$(VSRedistCommonNetCoreSharedFrameworkx6490Version)</RuntimeDownload>
<RuntimeDownload>$(VSRedistCommonNetCoreSharedFrameworkx64100Version)</RuntimeDownload>
<Runtime>$(MicrosoftNETCoreAppRuntimewinx64Version)</Runtime>
<AspNetDownload>$(MicrosoftAspNetCoreAppRefInternalVersion)</AspNetDownload>
<AspNet>$(MicrosoftAspNetCoreAppRefVersion)</AspNet>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</RuntimeTestVersions>
</ItemGroup>
<!-- Internal service release testing -->
Expand Down
2 changes: 1 addition & 1 deletion eng/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ fi
#

if [[ "$__NativeBuild" == 1 || "$__Test" == 1 ]]; then
__targetRid=net6.0
__targetRid=net8.0
__dotnet_sos=$__RootBinDir/bin/dotnet-sos/$__BuildType/$__targetRid/publish/$__OutputRid
__dotnet_dump=$__RootBinDir/bin/dotnet-dump/$__BuildType/$__targetRid/publish/$__OutputRid

Expand Down
4 changes: 1 addition & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{
"tools": {
"dotnet": "9.0.100",
"dotnet": "10.0.100-alpha.1.24611.5",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreApp60Version)",
"$(MicrosoftNETCoreApp80Version)"
],
"dotnet/x86": [
"$(MicrosoftNETCoreApp60Version)",
"$(MicrosoftNETCoreApp80Version)"
]
}
Expand Down
Loading