diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index ebdcdc51aaef9..9413c0e0fbbba 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
- "version": "9.0.0-prerelease.24077.1",
+ "version": "9.0.0-prerelease.24112.1",
"commands": [
"xharness"
]
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 336051f191a4b..43564d362554b 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -85,6 +85,12 @@
true
+
+
+ $(SystemReflectionMetadataLoadContextVersion)
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b05cbe78e81c3..4cda6353d1288 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,8 +1,8 @@
-
+
https://github.com/dotnet/icu
- 694cd153a9083da273595fabb73818d4e8a49f40
+ 0664e5d5a59ae8ad8fe0cc1e82ed8a32baac43f7
https://github.com/dotnet/msquic
@@ -90,14 +90,14 @@
a045dd54a4c44723c215d992288160eb1401bb7f
-
+
https://github.com/dotnet/cecil
- b8c2293cd1cbd9d0fe6f32d7b5befbd526b5a175
+ 93dcb576e191a965008eae9b622527436653873f
-
+
https://github.com/dotnet/cecil
- b8c2293cd1cbd9d0fe6f32d7b5befbd526b5a175
+ 93dcb576e191a965008eae9b622527436653873f
@@ -206,57 +206,57 @@
https://github.com/dotnet/arcade
f7eb7794c703dc29a83b414b786e9a154f0ca042
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
https://github.com/dotnet/llvm-project
@@ -314,56 +314,55 @@
https://github.com/dotnet/llvm-project
cb7d881de3674394a5f98d167bfb58f9aff9768b
-
+
https://github.com/dotnet/runtime
- 205ef031e0fe5152dede0bd9f99d0f6f9e7f1e45
+ 9699f39112b2aea89a05a74199baf9049db85537
-
+
https://github.com/dotnet/runtime
- 205ef031e0fe5152dede0bd9f99d0f6f9e7f1e45
+ 9699f39112b2aea89a05a74199baf9049db85537
-
+
https://github.com/dotnet/runtime
- 205ef031e0fe5152dede0bd9f99d0f6f9e7f1e45
+ 9699f39112b2aea89a05a74199baf9049db85537
-
+
https://github.com/dotnet/runtime
- 205ef031e0fe5152dede0bd9f99d0f6f9e7f1e45
+ 9699f39112b2aea89a05a74199baf9049db85537
-
+
https://github.com/dotnet/runtime
- 205ef031e0fe5152dede0bd9f99d0f6f9e7f1e45
+ 9699f39112b2aea89a05a74199baf9049db85537
-
+
https://github.com/dotnet/runtime
- 205ef031e0fe5152dede0bd9f99d0f6f9e7f1e45
+ 9699f39112b2aea89a05a74199baf9049db85537
-
+
https://github.com/dotnet/runtime
- 4dffd80c4d77c27e772a0be26e8036af77fbb26e
-
+ 9699f39112b2aea89a05a74199baf9049db85537
-
+
https://github.com/dotnet/runtime
- 205ef031e0fe5152dede0bd9f99d0f6f9e7f1e45
+ 9699f39112b2aea89a05a74199baf9049db85537
-
+
https://github.com/dotnet/runtime
- 205ef031e0fe5152dede0bd9f99d0f6f9e7f1e45
+ 9699f39112b2aea89a05a74199baf9049db85537
-
+
https://github.com/dotnet/xharness
- f49b5c0db06528a9580686a5b63b0e5b4aba566b
+ 2f3f51a1adec18475563c8a49fd9b668ae9f2f31
-
+
https://github.com/dotnet/xharness
- f49b5c0db06528a9580686a5b63b0e5b4aba566b
+ 2f3f51a1adec18475563c8a49fd9b668ae9f2f31
-
+
https://github.com/dotnet/xharness
- f49b5c0db06528a9580686a5b63b0e5b4aba566b
+ 2f3f51a1adec18475563c8a49fd9b668ae9f2f31
https://github.com/dotnet/arcade
@@ -385,13 +384,13 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
db9f1c2362565f3ef41c8e8feb5ed49ab11a6459
-
+
https://github.com/dotnet/hotreload-utils
- fe2c1fb118054c09934acc75fde0e7165f5d385f
+ c3893319be301c7acdd167c276a5178c1004f10f
-
+
https://github.com/dotnet/runtime-assets
- a321e366dc8783b4b84127eb50d7feeda6702c0f
+ b5ac2d9031d4b2dc40683b31de86b05a20b670af
https://github.com/dotnet/roslyn
@@ -419,14 +418,14 @@
2fe96bca1092f880e91eea6eb17ea3487d89309a
-
+
https://github.com/dotnet/sdk
- de4f12b8ab6692b01776d362f4fa609fd3f1154a
+ 0962c1f89f5daf924a9fe876c80e80b0bde63b0d
-
+
https://github.com/dotnet/sdk
- de4f12b8ab6692b01776d362f4fa609fd3f1154a
+ 0962c1f89f5daf924a9fe876c80e80b0bde63b0d
diff --git a/eng/Versions.props b/eng/Versions.props
index cd7efd9da9a19..ab20643603c6a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -81,7 +81,7 @@
0.2.0
- 9.0.100-alpha.1.24072.3
+ 9.0.100-preview.2.24112.1
9.0.0-beta.24106.2
9.0.0-beta.24106.2
@@ -104,10 +104,10 @@
6.0.0-preview.1.102
- 9.0.0-alpha.1.24072.1
+ 9.0.0-preview.2.24111.9
6.0.0
- 9.0.0-alpha.1.24072.1
+ 9.0.0-preview.2.24111.9
16.0.5-alpha.1.24105.1
16.0.5-alpha.1.24105.1
@@ -123,42 +123,43 @@
5.0.0
1.2.0-beta.507
4.5.1
- 8.0.0
5.0.0
4.8.6
8.0.0
5.0.0
4.5.5
- 9.0.0-alpha.1.24072.1
-
- 8.0.0
- 8.0.0
+ 9.0.0-preview.2.24111.9
+ 9.0.0-preview.2.24111.9
6.0.0
5.0.0
5.0.0
5.0.0
7.0.0
- 9.0.0-alpha.1.24072.1
+ 9.0.0-preview.2.24111.9
6.0.0
7.0.0
4.5.4
4.5.0
- 9.0.0-alpha.1.24072.1
+ 9.0.0-preview.2.24111.9
+
+ 8.0.0
+ 8.0.0
+ 8.0.0
- 9.0.0-beta.24072.1
- 9.0.0-beta.24072.1
- 9.0.0-beta.24072.1
- 9.0.0-beta.24072.1
- 9.0.0-beta.24072.1
- 9.0.0-beta.24072.1
- 9.0.0-beta.24072.1
- 9.0.0-beta.24072.1
- 9.0.0-beta.24072.1
- 9.0.0-beta.24072.1
- 9.0.0-beta.24072.1
- 9.0.0-beta.24072.1
- 9.0.0-beta.24072.1
- 9.0.0-beta.24072.1
+ 9.0.0-beta.24108.2
+ 9.0.0-beta.24108.2
+ 9.0.0-beta.24108.2
+ 9.0.0-beta.24108.2
+ 9.0.0-beta.24108.2
+ 9.0.0-beta.24108.2
+ 9.0.0-beta.24108.2
+ 9.0.0-beta.24108.2
+ 9.0.0-beta.24108.2
+ 9.0.0-beta.24108.2
+ 9.0.0-beta.24108.2
+ 9.0.0-beta.24108.2
+ 9.0.0-beta.24108.2
+ 9.0.0-beta.24108.2
1.0.0-prerelease.24104.2
1.0.0-prerelease.24104.2
@@ -186,10 +187,10 @@
1.4.0
17.4.0-preview-20220707-01
- 9.0.0-prerelease.24077.1
- 9.0.0-prerelease.24077.1
- 9.0.0-prerelease.24077.1
- 9.0.0-alpha.0.24072.1
+ 9.0.0-prerelease.24112.1
+ 9.0.0-prerelease.24112.1
+ 9.0.0-prerelease.24112.1
+ 9.0.0-alpha.0.24105.1
3.12.0
4.5.0
6.0.0
@@ -215,11 +216,11 @@
8.0.0-preview-20230918.1
- 0.11.4-alpha.24065.1
+ 0.11.4-alpha.24105.1
- 9.0.0-alpha.1.24072.1
+ 9.0.0-preview.2.24111.9
- 9.0.0-preview.2.24072.3
+ 9.0.0-preview.2.24105.1
2.2.3
9.0.0-alpha.1.24067.1
diff --git a/eng/resolveContract.targets b/eng/resolveContract.targets
index b90fa5de28a7c..bd6fc7de7fc5c 100644
--- a/eng/resolveContract.targets
+++ b/eng/resolveContract.targets
@@ -51,6 +51,7 @@
ResolvedMatchingContract
true
+ true
true
diff --git a/global.json b/global.json
index f7ee8d365eb8b..a6fc52f27fa09 100644
--- a/global.json
+++ b/global.json
@@ -13,6 +13,6 @@
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24106.2",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
- "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.24072.1"
+ "Microsoft.NET.Sdk.IL": "9.0.0-preview.2.24111.9"
}
}
diff --git a/src/coreclr/tools/aot/ILCompiler.Trimming.Tests/ILCompiler.Trimming.Tests.csproj b/src/coreclr/tools/aot/ILCompiler.Trimming.Tests/ILCompiler.Trimming.Tests.csproj
index 508575ebce3b2..139818eff2c58 100644
--- a/src/coreclr/tools/aot/ILCompiler.Trimming.Tests/ILCompiler.Trimming.Tests.csproj
+++ b/src/coreclr/tools/aot/ILCompiler.Trimming.Tests/ILCompiler.Trimming.Tests.csproj
@@ -19,7 +19,6 @@
-
diff --git a/src/libraries/Common/tests/WasmTestRunner/WasmTestRunner.cs b/src/libraries/Common/tests/WasmTestRunner/WasmTestRunner.cs
index f89d3a3adf55a..326cd7b10e918 100644
--- a/src/libraries/Common/tests/WasmTestRunner/WasmTestRunner.cs
+++ b/src/libraries/Common/tests/WasmTestRunner/WasmTestRunner.cs
@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
+using Microsoft.DotNet.XHarness.TestRunners.Common;
using Microsoft.DotNet.XHarness.TestRunners.Xunit;
@@ -25,6 +26,7 @@ public static async Task Main(string[] args)
var includedMethods = new List();
var backgroundExec = false;
var untilFailed = false;
+ var minimumLogLevel = MinimumLogLevel.Info;
for (int i = 1; i < args.Length; i++)
{
@@ -57,6 +59,10 @@ public static async Task Main(string[] args)
case "-untilFailed":
untilFailed = true;
break;
+ case "-verbosity":
+ minimumLogLevel = Enum.Parse(args[i + 1]);
+ i++;
+ break;
default:
throw new ArgumentException($"Invalid argument '{option}'.");
}
@@ -69,7 +75,8 @@ public static async Task Main(string[] args)
IncludedTraits = includedTraits,
IncludedNamespaces = includedNamespaces,
IncludedClasses = includedClasses,
- IncludedMethods = includedMethods
+ IncludedMethods = includedMethods,
+ MinimumLogLevel = minimumLogLevel
};
if (OperatingSystem.IsBrowser())
diff --git a/src/mono/wasm/Wasm.Build.Tests/MainWithArgsTests.cs b/src/mono/wasm/Wasm.Build.Tests/MainWithArgsTests.cs
index eb9829438f75d..fc6099fb72798 100644
--- a/src/mono/wasm/Wasm.Build.Tests/MainWithArgsTests.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/MainWithArgsTests.cs
@@ -39,8 +39,8 @@ public static async System.Threading.Tasks.Task Main(string[] args)
buildArgs, args, host, id);
[Theory]
- [MemberData(nameof(MainWithArgsTestData), parameters: new object[] { /*aot*/ false, RunHost.All })]
- [MemberData(nameof(MainWithArgsTestData), parameters: new object[] { /*aot*/ true, RunHost.All })]
+ [MemberData(nameof(MainWithArgsTestData), parameters: new object[] { /*aot*/ false, RunHost.NodeJS })]
+ //[MemberData(nameof(MainWithArgsTestData), parameters: new object[] { /*aot*/ true, RunHost.All })]
public void TopLevelWithArgs(BuildArgs buildArgs, string[] args, RunHost host, string id)
=> TestMainWithArgs("top_level_args",
@"##CODE## return await System.Threading.Tasks.Task.FromResult(42 + count);",
@@ -89,12 +89,24 @@ void TestMainWithArgs(string projectNamePrefix,
InitProject: () => File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), programText),
DotnetWasmFromRuntimePack: dotnetWasmFromRuntimePack));
- RunAndTestWasmApp(buildArgs, buildDir: _projectDir, expectedExitCode: 42 + args.Length, args: string.Join(' ', args),
+ // Because we get extra "-verbosity", "Debug" from XHarness
+ int argsCount = args.Length;
+ bool isBrowser = host == RunHost.Chrome || host == RunHost.Firefox || host == RunHost.Safari;
+ if (isBrowser)
+ argsCount += 2;
+
+ RunAndTestWasmApp(buildArgs, buildDir: _projectDir, expectedExitCode: 42 + argsCount, args: string.Join(' ', args),
test: output =>
{
- Assert.Contains($"args#: {args.Length}", output);
+ Assert.Contains($"args#: {argsCount}", output);
foreach (var arg in args)
Assert.Contains($"arg: {arg}", output);
+
+ if (isBrowser)
+ {
+ Assert.Contains($"arg: -verbosity", output);
+ Assert.Contains($"arg: Debug", output);
+ }
}, host: host, id: id);
}
}
diff --git a/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs b/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs
index f553f10ddeb36..1d7a9740eba9e 100644
--- a/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs
@@ -32,7 +32,7 @@ public class Test
public static int Main(string[] args)
{
Console.WriteLine($""Main running"");
- if (args.Length > 0)
+ if (args.Length > 2)
{
// We don't want to run this, because we can't call variadic functions
Console.WriteLine($""sum_three: {sum_three(7, 14, 21)}"");
diff --git a/src/tasks/Microsoft.NET.WebAssembly.Webcil/Microsoft.NET.WebAssembly.Webcil.csproj b/src/tasks/Microsoft.NET.WebAssembly.Webcil/Microsoft.NET.WebAssembly.Webcil.csproj
index b5131f4d47b86..846dbc9e042aa 100644
--- a/src/tasks/Microsoft.NET.WebAssembly.Webcil/Microsoft.NET.WebAssembly.Webcil.csproj
+++ b/src/tasks/Microsoft.NET.WebAssembly.Webcil/Microsoft.NET.WebAssembly.Webcil.csproj
@@ -14,10 +14,10 @@
false
-
+
-
+
diff --git a/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj b/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj
index 28c68c0150d7c..3c652477cad9e 100644
--- a/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj
+++ b/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj
@@ -5,19 +5,18 @@
enable
$(NoWarn),CA1050,CA1850
-
+
-
-
+
-
+
-
+
diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
index 32fad42f32b95..34a689f680da4 100644
--- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
@@ -22,15 +22,27 @@
+
+
+
+
+
+
+
+
+
-
+
+
-
+
+
+
-
-
+