Skip to content

Commit 9b237d1

Browse files
lewinglewing
authored
Merge branch 'release/9.0' into merge/release/9.0-rc2-to-release/9.0
2 parents 4e1a9ba + faf43ae commit 9b237d1

File tree

8 files changed

+65
-42
lines changed

8 files changed

+65
-42
lines changed

‎eng/Version.Details.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -278,43 +278,43 @@
278278
<Uri>https://github.com/dotnet/llvm-project</Uri>
279279
<Sha>b9b4464b3b10c1961ed0ff39b5f33b3b3bbf62d1</Sha>
280280
</Dependency>
281-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rc.2.24463.7">
281+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rtm.24473.2">
282282
<Uri>https://github.com/dotnet/runtime</Uri>
283-
<Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
283+
<Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
284284
</Dependency>
285-
<Dependency Name="runtime.native.System.IO.Ports" Version="9.0.0-rc.2.24463.7">
285+
<Dependency Name="runtime.native.System.IO.Ports" Version="9.0.0-rtm.24473.2">
286286
<Uri>https://github.com/dotnet/runtime</Uri>
287-
<Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
287+
<Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
288288
</Dependency>
289-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="9.0.0-rc.2.24463.7">
289+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="9.0.0-rtm.24473.2">
290290
<Uri>https://github.com/dotnet/runtime</Uri>
291-
<Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
291+
<Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
292292
</Dependency>
293-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="9.0.0-rc.2.24463.7">
293+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="9.0.0-rtm.24473.2">
294294
<Uri>https://github.com/dotnet/runtime</Uri>
295-
<Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
295+
<Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
296296
</Dependency>
297-
<Dependency Name="System.Text.Json" Version="9.0.0-rc.2.24463.7">
297+
<Dependency Name="System.Text.Json" Version="9.0.0-rtm.24473.2">
298298
<Uri>https://github.com/dotnet/runtime</Uri>
299-
<Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
299+
<Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
300300
</Dependency>
301301
<!-- Intermediate is necessary for source build. -->
302-
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-rc.2.24463.7">
302+
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-rtm.24473.2">
303303
<Uri>https://github.com/dotnet/runtime</Uri>
304-
<Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
304+
<Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
305305
<SourceBuild RepoName="runtime" ManagedOnly="false" />
306306
</Dependency>
307-
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="9.0.0-rc.2.24463.7">
307+
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="9.0.0-rtm.24473.2">
308308
<Uri>https://github.com/dotnet/runtime</Uri>
309-
<Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
309+
<Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
310310
</Dependency>
311-
<Dependency Name="System.Reflection.Metadata" Version="9.0.0-rc.2.24463.7">
311+
<Dependency Name="System.Reflection.Metadata" Version="9.0.0-rtm.24473.2">
312312
<Uri>https://github.com/dotnet/runtime</Uri>
313-
<Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
313+
<Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
314314
</Dependency>
315-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-rc.2.24463.7">
315+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-rtm.24473.2">
316316
<Uri>https://github.com/dotnet/runtime</Uri>
317-
<Sha>46cfb747b4c22471242dee0d106f5c79cf9fd4c5</Sha>
317+
<Sha>3d9da91a9720f7bda3e4cef127b8195441fb2580</Sha>
318318
</Dependency>
319319
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24405.1">
320320
<Uri>https://github.com/dotnet/xharness</Uri>

‎eng/Versions.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@
106106
<!-- NuGet dependencies -->
107107
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
108108
<!-- Installer dependencies -->
109-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24463.7</MicrosoftNETCoreAppRuntimewinx64Version>
109+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rtm.24473.2</MicrosoftNETCoreAppRuntimewinx64Version>
110110
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
111111
<!-- ILAsm dependencies -->
112-
<MicrosoftNETCoreILAsmVersion>9.0.0-rc.2.24463.7</MicrosoftNETCoreILAsmVersion>
112+
<MicrosoftNETCoreILAsmVersion>9.0.0-rtm.24473.2</MicrosoftNETCoreILAsmVersion>
113113
<!-- Libraries dependencies -->
114114
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
115115
<MicrosoftBclHashCodeVersion>1.1.1</MicrosoftBclHashCodeVersion>
@@ -121,19 +121,19 @@
121121
<SystemDrawingCommonVersion>8.0.0</SystemDrawingCommonVersion>
122122
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
123123
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
124-
<SystemReflectionMetadataVersion>9.0.0-rc.2.24463.7</SystemReflectionMetadataVersion>
125-
<SystemReflectionMetadataLoadContextVersion>9.0.0-rc.2.24463.7</SystemReflectionMetadataLoadContextVersion>
124+
<SystemReflectionMetadataVersion>9.0.0-rtm.24473.2</SystemReflectionMetadataVersion>
125+
<SystemReflectionMetadataLoadContextVersion>9.0.0-rtm.24473.2</SystemReflectionMetadataLoadContextVersion>
126126
<SystemSecurityAccessControlVersion>6.0.0</SystemSecurityAccessControlVersion>
127127
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
128128
<SystemSecurityCryptographyOpenSslVersion>5.0.0</SystemSecurityCryptographyOpenSslVersion>
129129
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
130130
<SystemSecurityPermissionsVersion>7.0.0</SystemSecurityPermissionsVersion>
131-
<SystemTextJsonVersion>9.0.0-rc.2.24463.7</SystemTextJsonVersion>
131+
<SystemTextJsonVersion>9.0.0-rtm.24473.2</SystemTextJsonVersion>
132132
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
133133
<SystemThreadingAccessControlVersion>7.0.0</SystemThreadingAccessControlVersion>
134134
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
135135
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
136-
<runtimenativeSystemIOPortsVersion>9.0.0-rc.2.24463.7</runtimenativeSystemIOPortsVersion>
136+
<runtimenativeSystemIOPortsVersion>9.0.0-rtm.24473.2</runtimenativeSystemIOPortsVersion>
137137
<!-- Keep toolset versions in sync with dotnet/msbuild and dotnet/sdk -->
138138
<SystemCollectionsImmutableToolsetVersion>8.0.0</SystemCollectionsImmutableToolsetVersion>
139139
<SystemTextJsonToolsetVersion>8.0.0</SystemTextJsonToolsetVersion>
@@ -214,7 +214,7 @@
214214
<!-- Mono Cecil -->
215215
<MicrosoftDotNetCecilVersion>0.11.5-alpha.24467.1</MicrosoftDotNetCecilVersion>
216216
<!-- ILCompiler -->
217-
<MicrosoftDotNetILCompilerVersion>9.0.0-rc.2.24463.7</MicrosoftDotNetILCompilerVersion>
217+
<MicrosoftDotNetILCompilerVersion>9.0.0-rtm.24473.2</MicrosoftDotNetILCompilerVersion>
218218
<!-- ICU -->
219219
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rc.2.24467.2</MicrosoftNETCoreRuntimeICUTransportVersion>
220220
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.24466.4</MicrosoftNETCoreRuntimeICUTransportVersion>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24466.2",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
16-
"Microsoft.NET.Sdk.IL": "9.0.0-rc.2.24463.7"
16+
"Microsoft.NET.Sdk.IL": "9.0.0-rtm.24473.2"
1717
}
1818
}

‎src/coreclr/debug/createdump/crashinfo.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ CrashInfo::GatherCrashInfo(DumpType dumpType)
199199
{
200200
return false;
201201
}
202-
// Add the special (fake) memory region for the special diagnostics info
203-
MemoryRegion special(PF_R, SpecialDiagInfoAddress, SpecialDiagInfoAddress + PAGE_SIZE);
202+
// Add the special (fake) memory region for the special diagnostics info. Use constructor that doesn't assert PAGE_SIZE alignment.
203+
MemoryRegion special(PF_R, SpecialDiagInfoAddress, SpecialDiagInfoAddress + SpecialDiagInfoSize, /* offset */ 0);
204204
m_memoryRegions.insert(special);
205205
#ifdef __APPLE__
206206
InitializeOtherMappings();

‎src/mono/browser/runtime/loader/assets.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,12 +375,12 @@ export function prepareAssets () {
375375
if (config.loadAllSatelliteResources && resources.satelliteResources) {
376376
for (const culture in resources.satelliteResources) {
377377
for (const name in resources.satelliteResources[culture]) {
378-
assetsToLoad.push({
378+
addAsset({
379379
name,
380380
hash: resources.satelliteResources[culture][name],
381381
behavior: "resource",
382382
culture
383-
});
383+
}, !resources.coreAssembly);
384384
}
385385
}
386386
}

‎src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,35 @@ public SatelliteLoadingTests(ITestOutputHelper output, SharedBuildPerTestClassFi
2424
{
2525
}
2626

27-
[Fact, TestCategory("no-fingerprinting")]
28-
public async Task LoadSatelliteAssembly()
27+
[Theory, TestCategory("no-fingerprinting")]
28+
[InlineData(false)]
29+
[InlineData(true)]
30+
public async Task LoadSatelliteAssembly(bool loadAllSatelliteResources)
2931
{
3032
CopyTestAsset("WasmBasicTestApp", "SatelliteLoadingTests", "App");
3133
BuildProject("Debug");
3234

33-
var result = await RunSdkStyleAppForBuild(new(Configuration: "Debug", TestScenario: "SatelliteAssembliesTest"));
35+
var result = await RunSdkStyleAppForBuild(new(
36+
Configuration: "Debug",
37+
TestScenario: "SatelliteAssembliesTest",
38+
BrowserQueryString: new Dictionary<string, string> { ["loadAllSatelliteResources"] = loadAllSatelliteResources.ToString().ToLowerInvariant() }
39+
));
40+
41+
var expectedOutput = new List<Action<string>>();
42+
if (!loadAllSatelliteResources)
43+
{
44+
// If we are loading all satellite, we don't have a way to test resources without satellite assemblies being loaded.
45+
// So there messages are should be present only when we are lazily loading satellites.
46+
expectedOutput.Add(m => Assert.Equal("default: hello", m));
47+
expectedOutput.Add(m => Assert.Equal("es-ES without satellite: hello", m));
48+
}
49+
50+
expectedOutput.Add(m => Assert.Equal("default: hello", m));
51+
expectedOutput.Add(m => Assert.Equal("es-ES with satellite: hola", m));
52+
3453
Assert.Collection(
3554
result.TestOutput,
36-
m => Assert.Equal("default: hello", m),
37-
m => Assert.Equal("es-ES without satellite: hello", m),
38-
m => Assert.Equal("default: hello", m),
39-
m => Assert.Equal("es-ES with satellite: hola", m)
55+
expectedOutput.ToArray()
4056
);
4157
}
4258

‎src/mono/wasm/testassets/WasmBasicTestApp/App/SatelliteAssembliesTest.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
public partial class SatelliteAssembliesTest
99
{
1010
[JSExport]
11-
public static async Task Run()
11+
public static async Task Run(bool loadSatelliteAssemblies)
1212
{
13-
ResourceLibrary.ResourceAccessor.Read(TestOutput.WriteLine, false);
14-
15-
await LoadSatelliteAssemblies(new[] { "es-ES" });
13+
if (loadSatelliteAssemblies)
14+
{
15+
ResourceLibrary.ResourceAccessor.Read(TestOutput.WriteLine, false);
16+
await LoadSatelliteAssemblies(new[] { "es-ES" });
17+
}
1618

1719
ResourceLibrary.ResourceAccessor.Read(TestOutput.WriteLine, true);
1820
}

‎src/mono/wasm/testassets/WasmBasicTestApp/App/wwwroot/main.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ dotnet
2727

2828
// Modify runtime start based on test case
2929
switch (testCase) {
30+
case "SatelliteAssembliesTest":
31+
if (params.get("loadAllSatelliteResources") === "true") {
32+
dotnet.withConfig({ loadAllSatelliteResources: true });
33+
}
34+
break;
3035
case "AppSettingsTest":
3136
dotnet.withApplicationEnvironment(params.get("applicationEnvironment"));
3237
break;
@@ -132,7 +137,7 @@ const assemblyExtension = Object.keys(config.resources.coreAssembly)[0].endsWith
132137
try {
133138
switch (testCase) {
134139
case "SatelliteAssembliesTest":
135-
await exports.SatelliteAssembliesTest.Run();
140+
await exports.SatelliteAssembliesTest.Run(params.get("loadAllSatelliteResources") !== "true");
136141
exit(0);
137142
break;
138143
case "LazyLoadingTest":

0 commit comments

Comments
 (0)