Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<NetCoreAppMinVersion>8.0</NetCoreAppMinVersion>
<NetCoreAppMinTargetFramework>net$(NetCoreAppMinVersion)</NetCoreAppMinTargetFramework>
<!-- This is the list of TFMs we build our debuggees and tracees as. -->
<SupportedSubProcessTargetFrameworks>net8.0;net9.0;net10.0</SupportedSubProcessTargetFrameworks>
<SupportedSubProcessTargetFrameworks>net8.0;net9.0;net10.0;net11.0</SupportedSubProcessTargetFrameworks>
<!-- This is the list of TFMs we build our unit tests as. -->
<SupportedXUnitTestTargetFrameworks>net8.0</SupportedXUnitTestTargetFrameworks>
</PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
<add key="dotnet11-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11-transport/nuget/v3/index.json" />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
Expand Down
96 changes: 74 additions & 22 deletions eng/AuxMsbuildFiles/SdkPackOverrides.targets
Original file line number Diff line number Diff line change
Expand Up @@ -5,137 +5,189 @@
<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>
<RuntimeVersion11>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net11.0')->Metadata('Runtime'))</RuntimeVersion11>

<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>
<AspNetVersion11>@(RuntimeTestVersions->WithMetadataValue('TargetFramework', 'net11.0')->Metadata('AspNet'))</AspNetVersion11>
</PropertyGroup>

<ItemGroup>
<Message Importance="High" Text="OverrideTestingVersions: RuntimeTestVersions='@(RuntimeTestVersions)'" />

<!-- Skip overrides when RuntimeTestVersions is not populated (e.g. test-time CLI builds
where eng/Versions.props is not imported). The SDK's built-in versions are used instead. -->
<ItemGroup Condition="'@(RuntimeTestVersions)' != ''">
<!--
CrossGen2 Pack
-->
<KnownCrossgen2Pack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
<KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2" Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App.Crossgen2'">
<Crossgen2PackVersion>$(RuntimeVersion80)</Crossgen2PackVersion>
</KnownCrossgen2Pack>

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

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

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

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

<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<KnownFrameworkReference Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<TargetingPackVersion>$(RuntimeVersion90)</TargetingPackVersion>
<LatestRuntimeFrameworkVersion>$(RuntimeVersion90)</LatestRuntimeFrameworkVersion>
</KnownFrameworkReference>

<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<KnownFrameworkReference Update="Microsoft.NETCore.App" 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'">
<KnownFrameworkReference Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<TargetingPackVersion>$(RuntimeVersion11)</TargetingPackVersion>
<LatestRuntimeFrameworkVersion>$(RuntimeVersion11)</LatestRuntimeFrameworkVersion>
</KnownFrameworkReference>

<KnownAppHostPack Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<AppHostPackVersion>$(RuntimeVersion80)</AppHostPackVersion>
</KnownAppHostPack>

<KnownAppHostPack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<KnownAppHostPack Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<AppHostPackVersion>$(RuntimeVersion90)</AppHostPackVersion>
</KnownAppHostPack>

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

<KnownRuntimePack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<KnownAppHostPack Update="Microsoft.NETCore.App" Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.NETCore.App'">
<AppHostPackVersion>$(RuntimeVersion11)</AppHostPackVersion>
</KnownAppHostPack>

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

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

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

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

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

<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<TargetingPackVersion>$(AspNetVersion90)</TargetingPackVersion>
<LatestRuntimeFrameworkVersion>$(AspNetVersion90)</LatestRuntimeFrameworkVersion>
</KnownFrameworkReference>

<KnownFrameworkReference Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" 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'">
<KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<TargetingPackVersion>$(AspNetVersion11)</TargetingPackVersion>
<LatestRuntimeFrameworkVersion>$(AspNetVersion11)</LatestRuntimeFrameworkVersion>
</KnownFrameworkReference>

<KnownAppHostPack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<AppHostPackVersion>$(AspNetVersion80)</AppHostPackVersion>
</KnownAppHostPack>

<KnownAppHostPack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<KnownAppHostPack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<AppHostPackVersion>$(AspNetVersion90)</AppHostPackVersion>
</KnownAppHostPack>

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

<KnownRuntimePack Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<KnownAppHostPack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<AppHostPackVersion>$(AspNetVersion11)</AppHostPackVersion>
</KnownAppHostPack>

<KnownRuntimePack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<LatestRuntimeFrameworkVersion>$(AspNetVersion80)</LatestRuntimeFrameworkVersion>
</KnownRuntimePack>

<KnownRuntimePack Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<KnownRuntimePack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<LatestRuntimeFrameworkVersion>$(AspNetVersion90)</LatestRuntimeFrameworkVersion>
</KnownRuntimePack>

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

<KnownRuntimePack Update="Microsoft.AspNetCore.App" Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.AspNetCore.App'">
<LatestRuntimeFrameworkVersion>$(AspNetVersion11)</LatestRuntimeFrameworkVersion>
</KnownRuntimePack>

<KnownILCompilerPack
Update="Microsoft.NET.ILCompiler"
Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NET.ILCompiler'">
<ILCompilerPackVersion>$(RuntimeVersion80)</ILCompilerPackVersion>
</KnownILCompilerPack>
<KnownILCompilerPack
Update="Microsoft.NET.ILCompiler"
Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NET.ILCompiler'">
<ILCompilerPackVersion>$(RuntimeVersion90)</ILCompilerPackVersion>
</KnownILCompilerPack>
<KnownILCompilerPack
Update="Microsoft.NET.ILCompiler"
Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NET.ILCompiler'">
<ILCompilerPackVersion>$(RuntimeVersion10)</ILCompilerPackVersion>
</KnownILCompilerPack>
<KnownILCompilerPack
Update="Microsoft.NET.ILCompiler"
Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.NET.ILCompiler'">
<ILCompilerPackVersion>$(RuntimeVersion11)</ILCompilerPackVersion>
</KnownILCompilerPack>

<KnownILLinkPack
Update="Microsoft.NET.ILLink.Tasks"
Condition="'%(TargetFramework)' == 'net8.0' and '%(Identity)' == 'Microsoft.NET.ILLink.Tasks'">
<ILLinkPackVersion>$(RuntimeVersion80)</ILLinkPackVersion>
</KnownILLinkPack>
<KnownILLinkPack
Update="Microsoft.NET.ILLink.Tasks"
Condition="'%(TargetFramework)' == 'net9.0' and '%(Identity)' == 'Microsoft.NET.ILLink.Tasks'">
<ILLinkPackVersion>$(RuntimeVersion90)</ILLinkPackVersion>
</KnownILLinkPack>
<KnownILLinkPack
Update="Microsoft.NET.ILLink.Tasks"
Condition="'%(TargetFramework)' == 'net10.0' and '%(Identity)' == 'Microsoft.NET.ILLink.Tasks'">
<ILLinkPackVersion>$(RuntimeVersion10)</ILLinkPackVersion>
</KnownILLinkPack>
<KnownILLinkPack
Update="Microsoft.NET.ILLink.Tasks"
Condition="'%(TargetFramework)' == 'net11.0' and '%(Identity)' == 'Microsoft.NET.ILLink.Tasks'">
<ILLinkPackVersion>$(RuntimeVersion11)</ILLinkPackVersion>
</KnownILLinkPack>
</ItemGroup>
</Target>
</Project>
Loading
Loading