Update C# compiler and revert workaround

* Update C# compiler to pick up attribute fix * Revert "Work around dotnet/roslyn#60572" This reverts commit dc030a0.
dotnet · Apr 9, 2022 · 71294e8 · 71294e8
1 parent 285b825
commit 71294e8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -49,7 +49,7 @@
     <!--
       TODO: Remove pinned version once arcade supplies a 4.3 compiler.
     -->
-    <MicrosoftNetCompilersToolsetVersion>4.3.0-1.22206.2</MicrosoftNetCompilersToolsetVersion>
+    <MicrosoftNetCompilersToolsetVersion>4.3.0-1.22208.1</MicrosoftNetCompilersToolsetVersion>
     <!-- SDK dependencies -->
     <MicrosoftDotNetCompatibilityVersion>2.0.0-alpha.1.21525.11</MicrosoftDotNetCompatibilityVersion>
     <!-- Arcade dependencies -->

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildPublishTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildPublishTests.cs
@@ -21,8 +21,8 @@ public BuildPublishTests(ITestOutputHelper output, SharedBuildPerTestClassFixtur
         }
 
         [Theory]
-        [BuildAndRun(aot: false, host: RunHost.V8, config: "Release")]
-        [BuildAndRun(aot: false, host: RunHost.V8, config: "Debug")]
+        [BuildAndRun(host: RunHost.V8, aot: false, config: "Release")]
+        [BuildAndRun(host: RunHost.V8, aot: false, config: "Debug")]
         public void BuildThenPublishNoAOT(BuildArgs buildArgs, RunHost host, string id)
         {
             string projectName = $"build_publish_{buildArgs.Config}";
@@ -71,8 +71,8 @@ void Run() => RunAndTestWasmApp(
         }
 
         [Theory]
-        [BuildAndRun(aot: true, host: RunHost.V8, config: "Release")]
-        [BuildAndRun(aot: true, host: RunHost.V8, config: "Debug")]
+        [BuildAndRun(host: RunHost.V8, aot: true, config: "Release")]
+        [BuildAndRun(host: RunHost.V8, aot: true, config: "Debug")]
         public void BuildThenPublishWithAOT(BuildArgs buildArgs, RunHost host, string id)
         {
             string projectName = $"build_publish_{buildArgs.Config}";

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeBuildTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeBuildTests.cs
@@ -68,7 +68,7 @@ public void MonoAOTCross_WorksWithNoTrimming(BuildArgs buildArgs, string id)
         }
 
         [Theory]
-        [BuildAndRun(aot: true, host: RunHost.None)]
+        [BuildAndRun(host: RunHost.None, aot: true)]
         public void IntermediateBitcodeToObjectFilesAreNotLLVMIR(BuildArgs buildArgs, string id)
         {
             string printFileTypeTarget = @"

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs
@@ -18,7 +18,7 @@ public PInvokeTableGeneratorTests(ITestOutputHelper output, SharedBuildPerTestCl
         }
 
         [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
-        [BuildAndRun(aot: false, host: RunHost.V8)]
+        [BuildAndRun(host: RunHost.V8)]
         public void NativeLibraryWithVariadicFunctions(BuildArgs buildArgs, RunHost host, string id)
         {
             string code = @"
@@ -55,7 +55,7 @@ public static int Main(string[] args)
         }
 
         [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
-        [BuildAndRun(aot: false, host: RunHost.V8)]
+        [BuildAndRun(host: RunHost.V8)]
         public void DllImportWithFunctionPointersCompilesWithWarning(BuildArgs buildArgs, RunHost host, string id)
         {
             string code = @"
@@ -87,7 +87,7 @@ public static int Main()
         }
 
         [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
-        [BuildAndRun(aot: false, host: RunHost.V8)]
+        [BuildAndRun(host: RunHost.V8)]
         public void DllImportWithFunctionPointers_ForVariadicFunction_CompilesWithWarning(BuildArgs buildArgs, RunHost host, string id)
         {
             string code = @"

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/SatelliteAssembliesTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/SatelliteAssembliesTests.cs
@@ -112,7 +112,7 @@ public void ResourcesFromProjectReference(BuildArgs buildArgs,
 
 #pragma warning disable xUnit1026
         [Theory]
-        [BuildAndRun(aot: true, host: RunHost.None)]
+        [BuildAndRun(host: RunHost.None, aot: true)]
         public void CheckThatSatelliteAssembliesAreNotAOTed(BuildArgs buildArgs, string id)
         {
             string projectName = $"check_sat_asm_not_aot";