Skip to content

[release/10.0] Source code updates from dotnet/dotnet #121366

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
lewing merged 32 commits into from
Dec 5, 2025
Merged

[release/10.0] Source code updates from dotnet/dotnet #121366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ddb80d6
Backflow from https://github.com/dotnet/dotnet / 8ee0cc0 build 289521
dotnet-maestro[bot] Nov 5, 2025
4361470
Merge release/10.0 into darc-release/10.0-dff90b19-95ba-456f-a4a6-a82…
dotnet-maestro[bot] Nov 5, 2025
a9642f1
Update dependencies from https://github.com/dotnet/dotnet build 289521
dotnet-maestro[bot] Nov 5, 2025
c21d01c
Merge branch 'release/10.0' into darc-release/10.0-dff90b19-95ba-456f…
mmitche Nov 6, 2025
c1ad1c6
Remove System.Threading.AccessControl package reference
ericstj Nov 6, 2025
d7235aa
Merge branch 'release/10.0' into darc-release/10.0-dff90b19-95ba-456f…
agocke Nov 13, 2025
2ae0c99
Make RuntimeInformation tests expect stable framework version in serv…
ericstj Nov 14, 2025
b5c8c90
Update SdkVersionForWorkloadTesting
akoeplinger Nov 14, 2025
f49ce51
Don't use pre-release version when testing FrameworkDescription
ericstj Nov 19, 2025
8bd3613
Merge branch 'release/10.0' into darc-release/10.0-dff90b19-95ba-456f…
ViktorHofer Nov 19, 2025
83f6c63
Make host tests more granular on version.
ericstj Nov 19, 2025
41b18de
Update SdkVersionForWorkloadTesting
akoeplinger Nov 19, 2025
a309061
Revert resource name lookup change in BenchmarksGame
akoeplinger Oct 29, 2025
eb69b37
Make RuntimeProductVersion match InformationalVersion instead of (Pac…
ericstj Nov 21, 2025
2ef4d91
Revert "Make RuntimeProductVersion match InformationalVersion instead…
ericstj Nov 24, 2025
dc667f1
Revert "Make host tests more granular on version."
ericstj Nov 24, 2025
297ee07
Revert "Don't use pre-release version when testing FrameworkDescription"
ericstj Nov 24, 2025
da754a9
Revert "Make RuntimeInformation tests expect stable framework version…
ericstj Nov 24, 2025
760e018
Don't special case InformationalVersion in servicing
ericstj Nov 24, 2025
4430b5d
Update SdkVersionForWorkloadTesting
ericstj Nov 24, 2025
5a95e03
Set SdkVersionForWorkloadTesting to 10.0.100
akoeplinger Nov 25, 2025
08828ca
Revert xharness downgrade
akoeplinger Nov 25, 2025
55b48bd
Revert xharness downgrade
akoeplinger Nov 25, 2025
2d865af
Don't use the transport version in stable builds
lewing Dec 1, 2025
0acf56f
Try a different pattern
lewing Dec 2, 2025
6226bad
Try a different pattern again
lewing Dec 2, 2025
153324e
Get the sdk version directly from apicompat and use that version dire…
lewing Dec 2, 2025
3b04c40
remove stale comment
lewing Dec 2, 2025
e564fd2
Hold the sdk version back but let the emscripten version float forward
lewing Dec 3, 2025
20de5c7
Merge branch 'release/10.0' into darc-release/10.0-dff90b19-95ba-456f…
lewing Dec 3, 2025
e20bfd5
Update the workload sdk version logic
lewing Dec 4, 2025
50fba2f
Revert "Update the workload sdk version logic"
steveisok Dec 5, 2025
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
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
<NetFrameworkToolCurrent Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
<NetFrameworkCurrent Condition="'$(DotNetBuildSourceOnly)' == 'true'" />

<ApiCompatNetCoreAppBaselineVersion>9.0.0</ApiCompatNetCoreAppBaselineVersion>
<ApiCompatNetCoreAppBaselineTFM>net9.0</ApiCompatNetCoreAppBaselineTFM>
<ApiCompatNetCoreAppBaselineVersion>10.0.0</ApiCompatNetCoreAppBaselineVersion>
<ApiCompatNetCoreAppBaselineTFM>net10.0</ApiCompatNetCoreAppBaselineTFM>
</PropertyGroup>

<PropertyGroup Label="CalculateConfiguration">
Expand Down
1 change: 0 additions & 1 deletion Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<Product>Microsoft%AE .NET</Product>
<!-- Use the .NET product branding version for informational version description -->
<InformationalVersion Condition="'$(InformationalVersion)' == '' and '$(VersionSuffix)' == ''">$(ProductVersion)</InformationalVersion>
<InformationalVersion Condition="'$(InformationalVersion)' == '' and '$(PreReleaseVersionLabel)' == 'servicing'">$(ProductVersion)</InformationalVersion>
<InformationalVersion Condition="'$(InformationalVersion)' == '' and '$(VersionSuffix)' != ''">$(ProductVersion)-$(VersionSuffix)</InformationalVersion>
</PropertyGroup>

Expand Down
4 changes: 3 additions & 1 deletion NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-79c85d9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-79c85d96/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-8ee0cc0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-8ee0cc0b/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!--
Expand All @@ -26,6 +26,8 @@
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
<!-- Need for prototype Roslyn compiler for runtime-async -->
<add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" />
<!-- Temporary, remove after GA. Temporary apicompat baseline feed for 10.0.1 prior to release -->
<add key="api-baseline-feed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-7b29526f/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
5 changes: 5 additions & 0 deletions eng/Publishing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
</PropertyGroup>

<!-- remove the manifest packages, they are built in the SDK repo now -->
<ItemGroup>
<Artifact Remove="$(ArtifactsShippingPackagesDir)*.Manifest-*.nupkg" />
</ItemGroup>

<!-- The PGO runtime should always have External visibility, even if someone changes the default artifact visibility -->
<ItemGroup>
<Artifact Update="$(ArtifactsNonShippingPackagesDir)dotnet-runtime-pgo-*" Visibility="External" />
Expand Down
78 changes: 39 additions & 39 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,45 +40,45 @@ This file should be imported by eng/Versions.props
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion>19.1.0-alpha.1.25461.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion>19.1.0-alpha.1.25461.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion>
<!-- dotnet/dotnet dependencies -->
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25515.111</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25515.111</MicrosoftCodeAnalysisAnalyzersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25515.111</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.100</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
<MicrosoftDotNetApiCompatTaskPackageVersion>10.0.100</MicrosoftDotNetApiCompatTaskPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksArchivesPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksArchivesPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25515.111</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetPackageTestingPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetPackageTestingPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetXliffTasksPackageVersion>
<MicrosoftDotNetXUnitAssertPackageVersion>2.9.3-beta.25515.111</MicrosoftDotNetXUnitAssertPackageVersion>
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.9.3-beta.25515.111</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25515.111</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-2.25515.111</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftNETSdkILPackageVersion>10.0.0</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>10.0.100-rtm.25515.111</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0</MicrosoftNETCoreILAsmPackageVersion>
<NuGetFrameworksPackageVersion>7.0.0-rc.1611</NuGetFrameworksPackageVersion>
<NuGetPackagingPackageVersion>7.0.0-rc.1611</NuGetPackagingPackageVersion>
<NuGetProjectModelPackageVersion>7.0.0-rc.1611</NuGetProjectModelPackageVersion>
<NuGetVersioningPackageVersion>7.0.0-rc.1611</NuGetVersioningPackageVersion>
<runtimenativeSystemIOPortsPackageVersion>10.0.0</runtimenativeSystemIOPortsPackageVersion>
<SystemCommandLinePackageVersion>2.0.0</SystemCommandLinePackageVersion>
<SystemReflectionMetadataPackageVersion>10.0.0</SystemReflectionMetadataPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0</SystemReflectionMetadataLoadContextPackageVersion>
<SystemTextJsonPackageVersion>10.0.0</SystemTextJsonPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25554.104</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25554.104</MicrosoftCodeAnalysisAnalyzersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25554.104</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.101</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
<MicrosoftDotNetApiCompatTaskPackageVersion>10.0.101</MicrosoftDotNetApiCompatTaskPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksArchivesPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetBuildTasksArchivesPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25554.104</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetPackageTestingPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetPackageTestingPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetXliffTasksPackageVersion>
<MicrosoftDotNetXUnitAssertPackageVersion>2.9.3-beta.25554.104</MicrosoftDotNetXUnitAssertPackageVersion>
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.9.3-beta.25554.104</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25554.104</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-2.25554.104</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftNETSdkILPackageVersion>10.0.1</MicrosoftNETSdkILPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>10.0.101-servicing.25554.104</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.1</MicrosoftNETCoreILAsmPackageVersion>
<NuGetFrameworksPackageVersion>7.0.0-rc.5504</NuGetFrameworksPackageVersion>
<NuGetPackagingPackageVersion>7.0.0-rc.5504</NuGetPackagingPackageVersion>
<NuGetProjectModelPackageVersion>7.0.0-rc.5504</NuGetProjectModelPackageVersion>
<NuGetVersioningPackageVersion>7.0.0-rc.5504</NuGetVersioningPackageVersion>
<runtimenativeSystemIOPortsPackageVersion>10.0.1</runtimenativeSystemIOPortsPackageVersion>
<SystemCommandLinePackageVersion>2.0.1</SystemCommandLinePackageVersion>
<SystemReflectionMetadataPackageVersion>10.0.1</SystemReflectionMetadataPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.1</SystemReflectionMetadataLoadContextPackageVersion>
<SystemTextJsonPackageVersion>10.0.1</SystemTextJsonPackageVersion>
<!-- dotnet/runtime-assets dependencies -->
<MicrosoftDotNetCilStripSourcesPackageVersion>10.0.0-beta.25418.1</MicrosoftDotNetCilStripSourcesPackageVersion>
<MicrosoftNETHostModelTestDataPackageVersion>10.0.0-beta.25418.1</MicrosoftNETHostModelTestDataPackageVersion>
Expand Down
Loading
Loading