Skip to content

[main] Source code updates from dotnet/dotnet #50274

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 13 commits into from
Aug 18, 2025
Merged

[main] Source code updates from dotnet/dotnet #50274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
587a67a
Backflow from https://github.com/dotnet/dotnet / 5088919 build 279336
dotnet-maestro[bot] Aug 15, 2025
10743f1
Merge main into darc-main-42dcf7a8-ca62-4c4b-b7d6-160730000a92
dotnet-maestro[bot] Aug 15, 2025
518a9f3
Update dependencies from https://github.com/dotnet/dotnet build 279336
dotnet-maestro[bot] Aug 15, 2025
31f2ca3
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-4…
Aug 15, 2025
144eb0a
Revert the non-version update changes.
Aug 15, 2025
7454f29
Remove the empty line
Aug 15, 2025
7cd6380
Remove the empty line.
Aug 15, 2025
70fb214
Merge branch 'main' into darc-main-42dcf7a8-ca62-4c4b-b7d6-160730000a92
dsplaisted Aug 15, 2025
a71295a
Fix bad merge
dsplaisted Aug 15, 2025
ad4f536
Fix baselines
javiercn Aug 16, 2025
f9804a9
Merge branch 'main' into darc-main-42dcf7a8-ca62-4c4b-b7d6-160730000a92
SimonZhao888 Aug 18, 2025
0697f2c
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-4…
Aug 18, 2025
b829caa
Update CSC arguments
jjonescz 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
263 changes: 131 additions & 132 deletions eng/Version.Details.props
View file
Open in desktop

Large diffs are not rendered by default.

520 changes: 260 additions & 260 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.25414.103",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25414.103",
"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
14 changes: 1 addition & 13 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 Expand Up @@ -36241,4 +36229,4 @@
]
}
]
}
}
14 changes: 1 addition & 13 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 Expand Up @@ -43779,4 +43767,4 @@
]
}
]
}
}
14 changes: 1 addition & 13 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 Expand Up @@ -37826,4 +37814,4 @@
]
}
]
}
}
18 changes: 1 addition & 17 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 Expand Up @@ -22200,4 +22184,4 @@
]
}
]
}
}
18 changes: 1 addition & 17 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 Expand Up @@ -21918,4 +21902,4 @@
]
}
]
}
}
18 changes: 1 addition & 17 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 Expand Up @@ -24204,4 +24188,4 @@
]
}
]
}
}
18 changes: 1 addition & 17 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 Expand Up @@ -21918,4 +21902,4 @@
]
}
]
}
}
Loading
Loading