Skip to content

Commit fc373ee

Browse files
SimonZhao888SimonZhao888
authored
[main] Source code updates from dotnet/dotnet (#50274)
2 parents 37c10e6 + b829caa commit fc373ee

17 files changed

+408
-581
lines changed

‎eng/Version.Details.props

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

‎eng/Version.Details.xml

Lines changed: 260 additions & 260 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.25414.103",
25+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25414.103",
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",

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

Lines changed: 1 addition & 13 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"
@@ -36241,4 +36229,4 @@
3624136229
]
3624236230
}
3624336231
]
36244-
}
36232+
}

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

Lines changed: 1 addition & 13 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"
@@ -43779,4 +43767,4 @@
4377943767
]
4378043768
}
4378143769
]
43782-
}
43770+
}

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

Lines changed: 1 addition & 13 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"
@@ -37826,4 +37814,4 @@
3782637814
]
3782737815
}
3782837816
]
37829-
}
37817+
}

‎test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5711,10 +5711,6 @@
57115711
}
57125712
],
57135713
"ResponseHeaders": [
5714-
{
5715-
"Name": "Accept-Ranges",
5716-
"Value": "bytes"
5717-
},
57185714
{
57195715
"Name": "Cache-Control",
57205716
"Value": "no-cache"
@@ -6611,10 +6607,6 @@
66116607
}
66126608
],
66136609
"ResponseHeaders": [
6614-
{
6615-
"Name": "Accept-Ranges",
6616-
"Value": "bytes"
6617-
},
66186610
{
66196611
"Name": "Cache-Control",
66206612
"Value": "no-cache"
@@ -22102,10 +22094,6 @@
2210222094
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
2210322095
"Selectors": [],
2210422096
"ResponseHeaders": [
22105-
{
22106-
"Name": "Accept-Ranges",
22107-
"Value": "bytes"
22108-
},
2210922097
{
2211022098
"Name": "Cache-Control",
2211122099
"Value": "no-cache"
@@ -22151,10 +22139,6 @@
2215122139
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
2215222140
"Selectors": [],
2215322141
"ResponseHeaders": [
22154-
{
22155-
"Name": "Accept-Ranges",
22156-
"Value": "bytes"
22157-
},
2215822142
{
2215922143
"Name": "Cache-Control",
2216022144
"Value": "max-age=31536000, immutable"
@@ -22200,4 +22184,4 @@
2220022184
]
2220122185
}
2220222186
]
22203-
}
22187+
}

‎test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5642,10 +5642,6 @@
56425642
}
56435643
],
56445644
"ResponseHeaders": [
5645-
{
5646-
"Name": "Accept-Ranges",
5647-
"Value": "bytes"
5648-
},
56495645
{
56505646
"Name": "Cache-Control",
56515647
"Value": "no-cache"
@@ -6366,10 +6362,6 @@
63666362
}
63676363
],
63686364
"ResponseHeaders": [
6369-
{
6370-
"Name": "Accept-Ranges",
6371-
"Value": "bytes"
6372-
},
63736365
{
63746366
"Name": "Cache-Control",
63756367
"Value": "no-cache"
@@ -21820,10 +21812,6 @@
2182021812
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
2182121813
"Selectors": [],
2182221814
"ResponseHeaders": [
21823-
{
21824-
"Name": "Accept-Ranges",
21825-
"Value": "bytes"
21826-
},
2182721815
{
2182821816
"Name": "Cache-Control",
2182921817
"Value": "no-cache"
@@ -21869,10 +21857,6 @@
2186921857
"AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js",
2187021858
"Selectors": [],
2187121859
"ResponseHeaders": [
21872-
{
21873-
"Name": "Accept-Ranges",
21874-
"Value": "bytes"
21875-
},
2187621860
{
2187721861
"Name": "Cache-Control",
2187821862
"Value": "max-age=31536000, immutable"
@@ -21918,4 +21902,4 @@
2191821902
]
2191921903
}
2192021904
]
21921-
}
21905+
}

0 commit comments

Comments
 (0)