Skip to content

Commit 7f56354

Browse files
authored
[release/10.0.1xx-rc1] Source code updates from dotnet/dotnet (#50308)
2 parents a3ab5c9 + 13d3fe8 commit 7f56354

19 files changed

+403
-580
lines changed

eng/Version.Details.props

Lines changed: 131 additions & 136 deletions
Large diffs are not rendered by default.

eng/Version.Details.xml

Lines changed: 262 additions & 262 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
</PropertyGroup>
129129
<PropertyGroup Label="Manually updated">
130130
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
131-
<MicrosoftBuildLocatorPackageVersion>1.6.10</MicrosoftBuildLocatorPackageVersion>
131+
<MicrosoftBuildLocatorPackageVersion>1.8.1</MicrosoftBuildLocatorPackageVersion>
132132
<MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>4.0.1</MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>
133133
</PropertyGroup>
134134
<!-- Get .NET Framework reference assemblies from NuGet packages -->

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
88
},
99
"tools": {
10-
"dotnet": "10.0.100-preview.7.25372.107",
10+
"dotnet": "10.0.100-rc.1.25411.109",
1111
"runtimes": {
1212
"dotnet": [
1313
"$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -21,8 +21,8 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25411.109",
25-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25411.109",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.112",
25+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.112",
2626
"Microsoft.Build.NoTargets": "3.7.0",
2727
"Microsoft.Build.Traversal": "3.4.0",
2828
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ private IEnumerable<string> GetCscArguments(
199199
"/warnaserror-",
200200
"/utf8output",
201201
"/deterministic+",
202-
"/langversion:13.0",
202+
"/langversion:14.0",
203203
"/features:FileBasedProgram",
204204
$"/analyzerconfig:{SdkPath}/Sdks/Microsoft.NET.Sdk/codestyle/cs/build/config/analysislevelstyle_default.globalconfig",
205205
$"/analyzerconfig:{objDir}/{fileNameWithoutExtension}.GeneratedMSBuildEditorConfig.editorconfig",

src/Layout/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
because it is large (100MB+). -->
5858
<_IsCommunityPlatform Condition="'$(OSName)' != 'win' and '$(OSName)' != 'osx'
5959
and !('$(OSName)' == 'linux' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64'))">true</_IsCommunityPlatform>
60-
<BundleCrossgen2 Condition="'$(BundleCrossgen2)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true' and '$( _IsCommunityPlatform )' == 'true'">true</BundleCrossgen2>
60+
<BundleCrossgen2 Condition="'$(BundleCrossgen2)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true' and '$(_IsCommunityPlatform)' == 'true'">true</BundleCrossgen2>
6161

6262
<!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. -->
6363
<UsePortableLinuxSharedFramework Condition="'$(UsePortableLinuxSharedFramework)' == '' and '$(IsLinux)' == 'true' and !$(TargetRid.StartsWith('linux-musl'))">true</UsePortableLinuxSharedFramework>
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Microsoft.CodeAnalysis.NetAnalyzers
2-
3-
This folder contains the source code for the .NET analyzers that are part of the Microsoft.CodeAnalysis.NetAnalyzers package.
4-
This code formerly lived in the [dotnet/roslyn-analyzers](https://github.com/dotnet/roslyn-analyzers) repository.
1+
# Microsoft.CodeAnalysis.NetAnalyzers
2+
3+
This folder contains the source code for the .NET analyzers that are part of the Microsoft.CodeAnalysis.NetAnalyzers package.
4+
This code formerly lived in the [dotnet/roslyn-analyzers](https://github.com/dotnet/roslyn-analyzers) repository.

test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17459,10 +17459,6 @@
1745917459
}
1746017460
],
1746117461
"ResponseHeaders": [
17462-
{
17463-
"Name": "Accept-Ranges",
17464-
"Value": "bytes"
17465-
},
1746617462
{
1746717463
"Name": "Cache-Control",
1746817464
"Value": "no-cache"
@@ -36143,10 +36139,6 @@
3614336139
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
3614436140
"Selectors": [],
3614536141
"ResponseHeaders": [
36146-
{
36147-
"Name": "Accept-Ranges",
36148-
"Value": "bytes"
36149-
},
3615036142
{
3615136143
"Name": "Cache-Control",
3615236144
"Value": "no-cache"
@@ -36192,10 +36184,6 @@
3619236184
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
3619336185
"Selectors": [],
3619436186
"ResponseHeaders": [
36195-
{
36196-
"Name": "Accept-Ranges",
36197-
"Value": "bytes"
36198-
},
3619936187
{
3620036188
"Name": "Cache-Control",
3620136189
"Value": "max-age=31536000, immutable"

test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21081,10 +21081,6 @@
2108121081
}
2108221082
],
2108321083
"ResponseHeaders": [
21084-
{
21085-
"Name": "Accept-Ranges",
21086-
"Value": "bytes"
21087-
},
2108821084
{
2108921085
"Name": "Cache-Control",
2109021086
"Value": "no-cache"
@@ -43681,10 +43677,6 @@
4368143677
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
4368243678
"Selectors": [],
4368343679
"ResponseHeaders": [
43684-
{
43685-
"Name": "Accept-Ranges",
43686-
"Value": "bytes"
43687-
},
4368843680
{
4368943681
"Name": "Cache-Control",
4369043682
"Value": "no-cache"
@@ -43730,10 +43722,6 @@
4373043722
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
4373143723
"Selectors": [],
4373243724
"ResponseHeaders": [
43733-
{
43734-
"Name": "Accept-Ranges",
43735-
"Value": "bytes"
43736-
},
4373743725
{
4373843726
"Name": "Cache-Control",
4373943727
"Value": "max-age=31536000, immutable"

test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10220,10 +10220,6 @@
1022010220
}
1022110221
],
1022210222
"ResponseHeaders": [
10223-
{
10224-
"Name": "Accept-Ranges",
10225-
"Value": "bytes"
10226-
},
1022710223
{
1022810224
"Name": "Cache-Control",
1022910225
"Value": "no-cache"
@@ -37728,10 +37724,6 @@
3772837724
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
3772937725
"Selectors": [],
3773037726
"ResponseHeaders": [
37731-
{
37732-
"Name": "Accept-Ranges",
37733-
"Value": "bytes"
37734-
},
3773537727
{
3773637728
"Name": "Cache-Control",
3773737729
"Value": "no-cache"
@@ -37777,10 +37769,6 @@
3777737769
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
3777837770
"Selectors": [],
3777937771
"ResponseHeaders": [
37780-
{
37781-
"Name": "Accept-Ranges",
37782-
"Value": "bytes"
37783-
},
3778437772
{
3778537773
"Name": "Cache-Control",
3778637774
"Value": "max-age=31536000, immutable"

0 commit comments

Comments
 (0)