Skip to content

[release/10.0.1xx-rc1] Source code updates from dotnet/dotnet #50308

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
merged 9 commits into from
Aug 19, 2025
Merged

[release/10.0.1xx-rc1] Source code updates from dotnet/dotnet #50308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb28721
Backflow from https://github.com/dotnet/dotnet / 670981c build 279601
dotnet-maestro[bot] Aug 16, 2025
4d4f67c
Merge release/10.0.1xx-rc1 into darc-release/10.0.1xx-rc1-82a65ebf-8d…
dotnet-maestro[bot] Aug 16, 2025
6f06705
Update dependencies from https://github.com/dotnet/dotnet build 279601
dotnet-maestro[bot] Aug 16, 2025
747dc82
Update dependencies from https://github.com/dotnet/dotnet build 279607
dotnet-maestro[bot] Aug 16, 2025
5cf9480
Update dependencies from https://github.com/dotnet/dotnet build 279620
dotnet-maestro[bot] Aug 17, 2025
7df2da8
Update dependencies from https://github.com/dotnet/dotnet build 279630
dotnet-maestro[bot] Aug 17, 2025
2a6bbb5
revert the backflow code changes
Aug 18, 2025
da23f30
Fix baselines
Aug 18, 2025
13d3fe8
Update CSC arguments
Aug 18, 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
267 changes: 131 additions & 136 deletions eng/Version.Details.props
View file
Open in desktop

Large diffs are not rendered by default.

524 changes: 262 additions & 262 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
<MicrosoftBuildLocatorPackageVersion>1.6.10</MicrosoftBuildLocatorPackageVersion>
<MicrosoftBuildLocatorPackageVersion>1.8.1</MicrosoftBuildLocatorPackageVersion>
<MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>4.0.1</MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>
</PropertyGroup>
<!-- Get .NET Framework reference assemblies from NuGet packages -->
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
},
"tools": {
"dotnet": "10.0.100-preview.7.25372.107",
"dotnet": "10.0.100-rc.1.25411.109",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCorePlatformsPackageVersion)"
Expand All @@ -21,8 +21,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25411.109",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25411.109",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.112",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.112",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ private IEnumerable<string> GetCscArguments(
"/warnaserror-",
"/utf8output",
"/deterministic+",
"/langversion:13.0",
"/langversion:14.0",
"/features:FileBasedProgram",
$"/analyzerconfig:{SdkPath}/Sdks/Microsoft.NET.Sdk/codestyle/cs/build/config/analysislevelstyle_default.globalconfig",
$"/analyzerconfig:{objDir}/{fileNameWithoutExtension}.GeneratedMSBuildEditorConfig.editorconfig",
Expand Down
2 changes: 1 addition & 1 deletion src/Layout/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
because it is large (100MB+). -->
<_IsCommunityPlatform Condition="'$(OSName)' != 'win' and '$(OSName)' != 'osx'
and !('$(OSName)' == 'linux' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64'))">true</_IsCommunityPlatform>
<BundleCrossgen2 Condition="'$(BundleCrossgen2)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true' and '$( _IsCommunityPlatform )' == 'true'">true</BundleCrossgen2>
<BundleCrossgen2 Condition="'$(BundleCrossgen2)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true' and '$(_IsCommunityPlatform)' == 'true'">true</BundleCrossgen2>

<!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. -->
<UsePortableLinuxSharedFramework Condition="'$(UsePortableLinuxSharedFramework)' == '' and '$(IsLinux)' == 'true' and !$(TargetRid.StartsWith('linux-musl'))">true</UsePortableLinuxSharedFramework>
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.CodeAnalysis.NetAnalyzers/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Microsoft.CodeAnalysis.NetAnalyzers
This folder contains the source code for the .NET analyzers that are part of the Microsoft.CodeAnalysis.NetAnalyzers package.
This code formerly lived in the [dotnet/roslyn-analyzers](https://github.com/dotnet/roslyn-analyzers) repository.
# Microsoft.CodeAnalysis.NetAnalyzers

This folder contains the source code for the .NET analyzers that are part of the Microsoft.CodeAnalysis.NetAnalyzers package.
This code formerly lived in the [dotnet/roslyn-analyzers](https://github.com/dotnet/roslyn-analyzers) repository.
12 changes: 0 additions & 12 deletions ...GenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17459,10 +17459,6 @@
}
],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -36143,10 +36139,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -36192,10 +36184,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "max-age=31536000, immutable"
Expand Down
12 changes: 0 additions & 12 deletions ...ssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21081,10 +21081,6 @@
}
],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -43681,10 +43677,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -43730,10 +43722,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "max-age=31536000, immutable"
Expand Down
12 changes: 0 additions & 12 deletions ...WebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10220,10 +10220,6 @@
}
],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -37728,10 +37724,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -37777,10 +37769,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "max-age=31536000, immutable"
Expand Down
16 changes: 0 additions & 16 deletions ...ebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5711,10 +5711,6 @@
}
],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -6611,10 +6607,6 @@
}
],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -22102,10 +22094,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -22151,10 +22139,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "max-age=31536000, immutable"
Expand Down
16 changes: 0 additions & 16 deletions ...tsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5642,10 +5642,6 @@
}
],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -6366,10 +6362,6 @@
}
],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -21820,10 +21812,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -21869,10 +21857,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "max-age=31536000, immutable"
Expand Down
16 changes: 0 additions & 16 deletions ...sBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5965,10 +5965,6 @@
}
],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -6065,10 +6061,6 @@
}
],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -24106,10 +24098,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -24155,10 +24143,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "max-age=31536000, immutable"
Expand Down
16 changes: 0 additions & 16 deletions ...nerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5642,10 +5642,6 @@
}
],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -6366,10 +6362,6 @@
}
],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -21820,10 +21812,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -21869,10 +21857,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "max-age=31536000, immutable"
Expand Down
12 changes: 0 additions & 12 deletions ...ts/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17551,10 +17551,6 @@
}
],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -36767,10 +36763,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -36816,10 +36808,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "max-age=31536000, immutable"
Expand Down
12 changes: 0 additions & 12 deletions ...ts/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10128,10 +10128,6 @@
}
],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -37354,10 +37350,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "no-cache"
Expand Down Expand Up @@ -37403,10 +37395,6 @@
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
"Selectors": [],
"ResponseHeaders": [
{
"Name": "Accept-Ranges",
"Value": "bytes"
},
{
"Name": "Cache-Control",
"Value": "max-age=31536000, immutable"
Expand Down
Loading