Merge branch 'main' into darc-main-a78401f7-71cf-4b70-b4fd-407118bf3454

dotnet · lewing · Oct 3, 2022 · Sep 20, 2022 · Sep 21, 2022 · Sep 22, 2022
commit 6299fc81fbe8a352a427690ed65ab75fa337b9cc
diff --git a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs
@@ -222,19 +222,24 @@ private void ConsoleBuildAndRun(string config, bool relinking, string extraNewAr
 
             (int exitCode, string output) = RunProcess(s_buildEnv.DotNet, _testOutput, args: $"run --no-build -c {config} x y z", workingDir: _projectDir);
             Assert.Equal(42, exitCode);
-            if (extraNewArgs.Contains("-f net7.0"))
-            {
-                // Workaround for https://github.com/dotnet/runtime/issues/76201
-                Assert.Contains("args[0] = dotnet", output);
-                Assert.Contains("args[1] = is", output);
-                Assert.Contains("args[2] = great!", output);
-            }
-            else
+
+            try
             {
                 Assert.Contains("args[0] = x", output);
                 Assert.Contains("args[1] = y", output);
                 Assert.Contains("args[2] = z", output);
             }
+            catch
+            {
+                if (!extraNewArgs.Contains("-f net7.0"))
+                    throw;
+
+                // Workaround for https://github.com/dotnet/runtime/issues/76429
+                // till a 7.0 sdk with the fix becomes available
+                Assert.Contains("args[0] = dotnet", output);
+                Assert.Contains("args[1] = is", output);
+                Assert.Contains("args[2] = great!", output);
+            }
         }
 
         public static TheoryData<bool, bool, string> TestDataForAppBundleDir()