From ae21b90be0e67669c2bbd03faec87a2b8f8efa5f Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Fri, 17 Sep 2021 16:25:44 -0400
Subject: [PATCH 01/14] [wasm] Change optimization flag defaults for Debug
 config

`WasmNativeStrip` -> `false`
Compile, and link optimization flags for `emcc` to `-O1`
---
 src/mono/wasm/build/WasmApp.Native.targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets
index 1c282834433a6d..3bb2c74ff0ba32 100644
--- a/src/mono/wasm/build/WasmApp.Native.targets
+++ b/src/mono/wasm/build/WasmApp.Native.targets
@@ -143,6 +143,7 @@
     <PropertyGroup>
       <_MonoAotCrossCompilerPath>@(MonoAotCrossCompiler->WithMetadataValue('RuntimeIdentifier','browser-wasm'))</_MonoAotCrossCompilerPath>
       <_EmccDefaultFlagsRsp>$([MSBuild]::NormalizePath($(_WasmRuntimePackSrcDir), 'emcc-default.rsp'))</_EmccDefaultFlagsRsp>
+      <WasmNativeStrip Condition="'$(WasmNativeStrip)' == '' and '$(Configuration)' == 'Debug'">false</WasmNativeStrip>
       <WasmNativeStrip Condition="'$(WasmNativeStrip)' == ''">true</WasmNativeStrip>
       <WasmNativeDebugSymbols Condition="'$(WasmNativeDebugSymbols)' == ''">true</WasmNativeDebugSymbols>
       <WasmLinkIcalls Condition="'$(WasmLinkIcalls)' == ''">$(WasmBuildNative)</WasmLinkIcalls>
@@ -156,6 +157,7 @@
 
       <_EmccAssertionLevelDefault>0</_EmccAssertionLevelDefault>
       <_EmccOptimizationFlagDefault Condition="'$(_WasmDevel)' == 'true'">-O0 -s ASSERTIONS=$(_EmccAssertionLevelDefault)</_EmccOptimizationFlagDefault>
+      <_EmccOptimizationFlagDefault Condition="'$(_EmccOptimizationFlagDefault)' == '' and '$(Configuration)' == 'Debug'">-O1</_EmccOptimizationFlagDefault>
       <_EmccOptimizationFlagDefault Condition="'$(_EmccOptimizationFlagDefault)' == '' and '$(OS)' != 'Windows_NT' and '$(Configuration)' == 'Debug'">-Os</_EmccOptimizationFlagDefault>
       <_EmccOptimizationFlagDefault Condition="'$(_EmccOptimizationFlagDefault)' == '' and '$(Configuration)' != 'Debug'">-Oz</_EmccOptimizationFlagDefault>
       <_EmccOptimizationFlagDefault Condition="'$(_EmccOptimizationFlagDefault)' == ''">-Oz</_EmccOptimizationFlagDefault>

From 7b75d8557bcc8eb323e3095723a399b125350bcc Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Mon, 20 Sep 2021 22:23:48 -0400
Subject: [PATCH 02/14] [wasm] EmccCompile: Fix incremental build, in case of
 only partial

.. rebuilds. Specifically, when a rebuild causes only the *linking* part
to be run again. In that case, we were correctly skipping over compiling
native files, but didn't add them to `@(FileWrites)`, which caused
msbuild's incremental clean logic to treat them as "orphaned" files,
and delete them!
---
 src/mono/wasm/build/WasmApp.Native.targets    |  6 +-
 src/tasks/WasmAppBuilder/EmccCompile.cs       | 15 +++--
 .../BlazorWasmBuildPublishTests.cs            |  1 -
 .../NativeRebuildTestsBase.cs                 | 13 +++++
 .../NoopNativeRebuildTest.cs                  | 56 +++++++++++++++++++
 5 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets
index 3bb2c74ff0ba32..0159323e35761c 100644
--- a/src/mono/wasm/build/WasmApp.Native.targets
+++ b/src/mono/wasm/build/WasmApp.Native.targets
@@ -298,7 +298,8 @@
           Inputs="@(_BitcodeFile);$(_EmccDefaultFlagsRsp);$(_EmccCompileBitcodeRsp)"
           Outputs="@(_BitcodeFile->'%(ObjectFile)')"
           Condition="'$(_WasmShouldAOT)' == 'true' and @(_BitcodeFile->Count()) > 0"
-          DependsOnTargets="_WasmWriteRspForCompilingBitcode">
+          DependsOnTargets="_WasmWriteRspForCompilingBitcode"
+          Returns="@(FileWrites)">
 
     <ItemGroup>
       <_BitCodeFile Dependencies="%(_BitCodeFile.Dependencies);$(_EmccDefaultFlagsRsp);$(_EmccCompileBitcodeRsp)" />
@@ -364,7 +365,8 @@
   <Target Name="_WasmLinkDotNet"
           Inputs="@(_WasmLinkDependencies);$(_EmccDefaultFlagsRsp);$(_EmccLinkRsp)"
           Outputs="$(_WasmIntermediateOutputPath)dotnet.js;$(_WasmIntermediateOutputPath)dotnet.wasm"
-          DependsOnTargets="_WasmSelectRuntimeComponentsForLinking;_WasmCompileAssemblyBitCodeFilesForAOT;_WasmWriteRspFilesForLinking">
+          DependsOnTargets="_WasmSelectRuntimeComponentsForLinking;_WasmCompileAssemblyBitCodeFilesForAOT;_WasmWriteRspFilesForLinking"
+          Returns="@(FileWrites)" >
 
     <Message Text="Linking with emcc. This may take a while ..." Importance="High" />
     <Message Text="Running emcc with @(_EmccLinkStepArgs->'%(Identity)', ' ')" Importance="Low" />
diff --git a/src/tasks/WasmAppBuilder/EmccCompile.cs b/src/tasks/WasmAppBuilder/EmccCompile.cs
index a5d6af6c3b473a..b0bc0ff80050b3 100644
--- a/src/tasks/WasmAppBuilder/EmccCompile.cs
+++ b/src/tasks/WasmAppBuilder/EmccCompile.cs
@@ -95,6 +95,7 @@ private bool ExecuteActual()
                     if (!ShouldCompile(srcFile, objFile, depFiles, out string reason))
                     {
                         Log.LogMessage(MessageImportance.Low, $"Skipping {srcFile} because {reason}.");
+                        outputItems.Add(CreateOutputItemFor(srcFile, objFile));
                     }
                     else
                     {
@@ -107,7 +108,8 @@ private bool ExecuteActual()
                 if (_numCompiled == _totalFiles)
                 {
                     // nothing to do!
-                    return true;
+                    OutputFiles = outputItems.ToArray();
+                    return !Log.HasLoggedErrors;
                 }
 
                 if (_numCompiled > 0)
@@ -200,9 +202,7 @@ bool ProcessSourceFile(string srcFile, string objFile)
                     else
                         Log.LogMessage(MessageImportance.Low, $"Copied {tmpObjFile} to {objFile}");
 
-                    ITaskItem newItem = new TaskItem(objFile);
-                    newItem.SetMetadata("SourceFile", srcFile);
-                    outputItems.Add(newItem);
+                    outputItems.Add(CreateOutputItemFor(srcFile, objFile));
 
                     int count = Interlocked.Increment(ref _numCompiled);
                     Log.LogMessage(MessageImportance.High, $"[{count}/{_totalFiles}] {Path.GetFileName(srcFile)} -> {Path.GetFileName(objFile)} [took {elapsedSecs:F}s]");
@@ -219,6 +219,13 @@ bool ProcessSourceFile(string srcFile, string objFile)
                     File.Delete(tmpObjFile);
                 }
             }
+
+            ITaskItem CreateOutputItemFor(string srcFile, string objFile)
+            {
+                ITaskItem newItem = new TaskItem(objFile);
+                newItem.SetMetadata("SourceFile", srcFile);
+                return newItem;
+            }
         }
 
         private bool ShouldCompile(string srcFile, string objFile, string[] depFiles, out string reason)
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs
index 687429a3fca482..66b5c5b2782766 100644
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs
@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.IO;
 using System.Linq;
 using Xunit;
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NativeRebuildTestsBase.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NativeRebuildTestsBase.cs
index 9047fd062a82e4..cd0d3ac4396349 100644
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NativeRebuildTestsBase.cs
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NativeRebuildTestsBase.cs
@@ -77,6 +77,7 @@ protected string Rebuild(bool nativeRelink, bool invariant, BuildArgs buildArgs,
             buildArgs = newBuildArgs;
 
             _testOutput.WriteLine($"{Environment.NewLine}Rebuilding with no changes ..{Environment.NewLine}");
+            Console.WriteLine($"{Environment.NewLine}Rebuilding with no changes ..{Environment.NewLine}");
             (_, string output) = BuildProject(buildArgs,
                                             id: id,
                                             dotnetWasmFromRuntimePack: false,
@@ -137,6 +138,18 @@ internal void CompareStat(IDictionary<string, FileStat> oldStat, IDictionary<str
                 throw new XunitException($"CompareStat failed:{Environment.NewLine}{msg}");
         }
 
+        internal IDictionary<string, (string fullPath, bool unchanged)> GetFilesTable(bool unchanged, params string[] baseDirs)
+        {
+            var dict = new Dictionary<string, (string fullPath, bool unchanged)>();
+            foreach (var baseDir in baseDirs)
+            {
+                foreach (var file in Directory.EnumerateFiles(baseDir, "*", new EnumerationOptions { RecurseSubdirectories = true }))
+                    dict[Path.GetFileName(file)] = (file, unchanged);
+            }
+
+            return dict;
+        }
+
         internal IDictionary<string, (string fullPath, bool unchanged)> GetFilesTable(BuildArgs buildArgs, BuildPaths paths, bool unchanged)
         {
             List<string> files = new()
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs
index 96f6d41fa10025..3131dec390ce05 100644
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.IO;
 using System.Linq;
 using Wasm.Build.Tests;
 using Xunit;
@@ -33,5 +34,60 @@ public void NoOpRebuildForNativeBuilds(BuildArgs buildArgs, bool nativeRelink, b
             CompareStat(originalStat, newStat, pathsDict.Values);
             RunAndTestWasmApp(buildArgs, buildDir: _projectDir, expectedExitCode: 42, host: host, id: id);
         }
+
+        [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
+        [InlineData("Debug")]
+        [InlineData("Release")]
+        public void BlazorNoopRebuild(string config)
+        {
+            string id = $"blz_rebuild_{config}";
+            string projectFile = CreateBlazorWasmTemplateProject(id);
+            AddItemsPropertiesToProject(projectFile, extraProperties: "<WasmBuildNative>true</WasmBuildNative>");
+
+            string objDir = Path.Combine(_projectDir!, "obj", config, "net6.0", "wasm");
+
+            BlazorBuild(id, config, NativeFilesType.Relinked);
+            File.Move(Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-build.binlog"),
+                        Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-build-first.binlog"));
+
+            var pathsDict = GetFilesTable(true, objDir);
+            pathsDict.Remove("runtime-icall-table.h");
+            var originalStat = StatFiles(pathsDict.Select(kvp => kvp.Value.fullPath));
+
+            // build again
+            BlazorBuild(id, config, NativeFilesType.Relinked);
+            var newStat = StatFiles(pathsDict.Select(kvp => kvp.Value.fullPath));
+
+            CompareStat(originalStat, newStat, pathsDict.Values);
+        }
+
+
+        [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
+        [InlineData("Debug")]
+        [InlineData("Release")]
+        public void BlazorOnlyLinkRebuild(string config)
+        {
+            string id = $"blz_relink_{config}";
+            string projectFile = CreateBlazorWasmTemplateProject(id);
+            AddItemsPropertiesToProject(projectFile, extraProperties: "<WasmBuildNative>true</WasmBuildNative>");
+
+            string objDir = Path.Combine(_projectDir!, "obj", config, "net6.0", "wasm");
+
+            BlazorBuild(id, config, NativeFilesType.Relinked);
+            File.Move(Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-build.binlog"),
+                        Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-build-first.binlog"));
+
+            var pathsDict = GetFilesTable(true, objDir);
+            pathsDict.Remove("runtime-icall-table.h");
+            pathsDict.UpdateTo(unchanged: false, "dotnet.wasm", "dotnet.js", "emcc-link.rsp");
+
+            var originalStat = StatFiles(pathsDict.Select(kvp => kvp.Value.fullPath));
+
+            // build again
+            BlazorBuild(id, config, NativeFilesType.Relinked, "-p:EmccLinkOptimizationFlag=-O1");
+            var newStat = StatFiles(pathsDict.Select(kvp => kvp.Value.fullPath));
+
+            CompareStat(originalStat, newStat, pathsDict.Values);
+        }
     }
 }

From 32f95047a122db0501371643bcef9616eda5fff3 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Wed, 22 Sep 2021 13:16:41 -0400
Subject: [PATCH 03/14] Bump sdk for workload testing to 6.0.100-rc.2.21472.15

.. and remove the Blazor sdk targets hack used for testing, since the
updated SDK has the fixes.
---
 eng/Versions.props                      |   2 +-
 src/libraries/workloads-testing.targets |   2 -
 src/mono/wasm/BlazorOverwrite.targets   | 741 ------------------------
 3 files changed, 1 insertion(+), 744 deletions(-)
 delete mode 100644 src/mono/wasm/BlazorOverwrite.targets

diff --git a/eng/Versions.props b/eng/Versions.props
index 55b34e750e955b..142ba9fedc4268 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -165,7 +165,7 @@
     <SQLitePCLRawbundle_greenVersion>2.0.4</SQLitePCLRawbundle_greenVersion>
     <MoqVersion>4.12.0</MoqVersion>
     <FsCheckVersion>2.14.3</FsCheckVersion>
-    <SdkVersionForWorkloadTesting>6.0.100-rc.2.21463.12</SdkVersionForWorkloadTesting>
+    <SdkVersionForWorkloadTesting>6.0.100-rc.2.21472.15</SdkVersionForWorkloadTesting>
     <!-- Docs -->
     <MicrosoftPrivateIntellisenseVersion>6.0.0-preview-20210916.1</MicrosoftPrivateIntellisenseVersion>
     <!-- ILLink -->
diff --git a/src/libraries/workloads-testing.targets b/src/libraries/workloads-testing.targets
index d3dc57267a608a..6a8fa5055bbbb3 100644
--- a/src/libraries/workloads-testing.targets
+++ b/src/libraries/workloads-testing.targets
@@ -16,7 +16,6 @@
     </ItemGroup>
 
     <Copy SourceFiles="@(_SourceFiles)" DestinationFolder="$(SdkWithWorkloadForTestingPath)\%(_SourceFiles.RecursiveDir)" />
-    <Copy SourceFiles="$(MonoProjectRoot)\wasm\BlazorOverwrite.targets" DestinationFiles="$(SdkWithWorkloadForTestingPath)\sdk\$(SdkVersionForWorkloadTesting)\Sdks\Microsoft.NET.Sdk.BlazorWebAssembly\targets\Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets" />
 
     <WriteLinesToFile File="$(SdkWithWorkloadStampPath)" Lines="" Overwrite="true" />
   </Target>
@@ -41,7 +40,6 @@
     <Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
           Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallScriptPath) -InstallDir $(SdkWithNoWorkloadForTestingPath) -Version $(SdkVersionForWorkloadTesting)"' />
 
-    <Copy SourceFiles="$(MonoProjectRoot)\wasm\BlazorOverwrite.targets" DestinationFiles="$(SdkWithNoWorkloadForTestingPath)\sdk\$(SdkVersionForWorkloadTesting)\Sdks\Microsoft.NET.Sdk.BlazorWebAssembly\targets\Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets" />
     <WriteLinesToFile File="$(SdkWithNoWorkloadStampPath)" Lines="" Overwrite="true" />
   </Target>
 
diff --git a/src/mono/wasm/BlazorOverwrite.targets b/src/mono/wasm/BlazorOverwrite.targets
deleted file mode 100644
index a276d385723725..00000000000000
--- a/src/mono/wasm/BlazorOverwrite.targets
+++ /dev/null
@@ -1,741 +0,0 @@
-<!--
-***********************************************************************************************
-Microsoft.NET.Sdk.BlazorWebAssembly.targets
-
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-          created a backup copy.  Incorrect changes to this file will make it
-          impossible to load or build your projects from the command-line or the IDE.
-
-Copyright (c) .NET Foundation. All rights reserved.
-***********************************************************************************************
--->
-<Project ToolsVersion="14.0">
-
-  <PropertyGroup>
-    <EnableDefaultContentItems Condition=" '$(EnableDefaultContentItems)' == '' ">true</EnableDefaultContentItems>
-
-    <!-- Trimmer defaults that depend on user-definable settings.
-        This must be configured before it's initialized in the .NET SDK targets (which are imported by the Razor SDK). -->
-    <SuppressTrimAnalysisWarnings Condition="'$(SuppressTrimAnalysisWarnings)' == '' And '$(TrimmerDefaultAction)' != 'link'">true</SuppressTrimAnalysisWarnings>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- Paths to tools, tasks, and extensions are calculated relative to the BlazorWebAssemblySdkDirectoryRoot. This can be modified to test a local build. -->
-    <BlazorWebAssemblySdkDirectoryRoot Condition="'$(BlazorWebAssemblySdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\</BlazorWebAssemblySdkDirectoryRoot>
-    <_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net6.0</_BlazorWebAssemblySdkTasksTFM>
-    <_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' != 'Core'">net472</_BlazorWebAssemblySdkTasksTFM>
-    <_BlazorWebAssemblySdkTasksAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\$(_BlazorWebAssemblySdkTasksTFM)\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll</_BlazorWebAssemblySdkTasksAssembly>
-    <_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net6.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll</_BlazorWebAssemblySdkToolAssembly>
-  </PropertyGroup>
-
-  <UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.GenerateBlazorWebAssemblyBootJson" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
-  <UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.BlazorWriteSatelliteAssemblyFile" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
-  <UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.BlazorReadSatelliteAssemblyFile" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
-  <UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.BrotliCompress" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
-  <UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.GzipCompress" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
-  <UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.CreateBlazorTrimmerRootDescriptorFile" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
-  <UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.ComputeBlazorFilesToCompress" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
-  <UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.ComputeBlazorBuildAssets" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
-  <UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.ComputeBlazorPublishAssets" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
-
-  <PropertyGroup>
-    <SelfContained>true</SelfContained>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-
-    <!-- Runtime feature defaults to trim unnecessary code -->
-    <InvariantGlobalization Condition="'$(InvariantGlobalization)' == ''">false</InvariantGlobalization>
-    <EventSourceSupport Condition="'$(EventSourceSupport)' == ''">false</EventSourceSupport>
-    <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
-    <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
-    <HttpActivityPropagationSupport Condition="'$(HttpActivityPropagationSupport)' == ''">false</HttpActivityPropagationSupport>
-    <NullabilityInfoContextSupport Condition="'$(NullabilityInfoContextSupport)' == ''">false</NullabilityInfoContextSupport>
-    <_AggressiveAttributeTrimming Condition="'$(_AggressiveAttributeTrimming)' == ''">true</_AggressiveAttributeTrimming>
-    <DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(Configuration)' != 'Debug'">false</DebuggerSupport>
-    <BlazorCacheBootResources Condition="'$(BlazorCacheBootResources)' == ''">true</BlazorCacheBootResources>
-
-    <!-- Turn off parts of the build that do not apply to WASM projects -->
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-    <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
-    <PreserveCompilationContext>false</PreserveCompilationContext>
-    <PreserveCompilationReferences>false</PreserveCompilationReferences>
-    <IsWebConfigTransformDisabled>true</IsWebConfigTransformDisabled>
-
-    <!-- Don't generate a NETSDK1151 error if a non self-contained Exe references a Blazor Exe -->
-    <ShouldBeValidatedAsExecutableReference>false</ShouldBeValidatedAsExecutableReference>
-
-    <_TargetingNET60OrLater Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '6.0'))">true</_TargetingNET60OrLater>
-
-    <!-- JS Modules -->
-    <!-- We disable the manifest generation because we are going to inline the modules in the blazor.boot.json manifest -->
-    <GenerateJSModuleManifest>false</GenerateJSModuleManifest>
-
-    <DisableAutoWasmBuildApp>true</DisableAutoWasmBuildApp>
-    <DisableAutoWasmPublishApp>true</DisableAutoWasmPublishApp>
-    <EnableDefaultWasmAssembliesToBundle>false</EnableDefaultWasmAssembliesToBundle>
-    <WasmNestedPublishAppDependsOn>ComputeFilesToPublish;_GatherWasmFilesToPublish;$(WasmNestedPublishAppDependsOn)</WasmNestedPublishAppDependsOn>
-    <_ScrambleDotnetJsFileNameAfterThisTarget Condition="'$(UsingBrowserRuntimeWorkload)' != 'true'">ResolveRuntimePackAssets</_ScrambleDotnetJsFileNameAfterThisTarget>
-    <_ScrambleDotnetJsFileNameAfterThisTarget Condition="'$(UsingBrowserRuntimeWorkload)' == 'true'">WasmBuildApp</_ScrambleDotnetJsFileNameAfterThisTarget>
-
-    <!-- Workaround https://github.com/dotnet/sdk/issues/20923 where we end up with two publish dirs - 'Publish', and 'publish' -->
-    <PublishDirName Condition="'$(PublishDirName)' == 'publish'">Publish</PublishDirName>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- Configuration for the platform compatibility analyzer. See https://github.com/dotnet/designs/blob/main/accepted/2020/platform-exclusion/platform-exclusion.md#build-configuration-for-platforms -->
-    <SupportedPlatform Remove="@(SupportedPlatform)" />
-    <SupportedPlatform Include="browser" />
-  </ItemGroup>
-
-  <!-- Wire-up static web assets -->
-  <PropertyGroup>
-    <ResolveStaticWebAssetsInputsDependsOn>
-      $(ResolveStaticWebAssetsInputsDependsOn);
-      _AddBlazorWasmStaticWebAssets;
-    </ResolveStaticWebAssetsInputsDependsOn>
-
-    <StaticWebAssetsPrepareForRunDependsOn>
-      _GenerateBuildBlazorBootJson;
-      $(StaticWebAssetsPrepareForRunDependsOn)
-    </StaticWebAssetsPrepareForRunDependsOn>
-
-    <ResolvePublishStaticWebAssetsDependsOn>
-      $(ResolvePublishStaticWebAssetsDependsOn);
-      ProcessPublishFilesForBlazor;
-      ComputeBlazorExtensions;
-      _AddPublishBlazorBootJsonToStaticWebAssets;
-    </ResolvePublishStaticWebAssetsDependsOn>
-
-    <GenerateStaticWebAssetsPublishManifestDependsOn>
-      $(GenerateStaticWebAssetsPublishManifestDependsOn);
-      GeneratePublishBlazorBootJson;
-    </GenerateStaticWebAssetsPublishManifestDependsOn>
-
-  </PropertyGroup>
-
-  <Import Project="Microsoft.NET.Sdk.BlazorWebAssembly.ServiceWorkerAssetsManifest.targets" Condition="'$(ServiceWorkerAssetsManifest)' != ''" />
-
-  <Target Name="_ScrambleDotnetJsFileNameForPublish">
-    <!--
-      We want the dotnet.js file output to have a version to better work with caching. We'll append the runtime version to the file name as soon as file has been discovered.
-    -->
-    <PropertyGroup>
-      <_DotNetJsVersion>$(BundledNETCoreAppPackageVersion)</_DotNetJsVersion>
-      <_DotNetJsVersion Condition="'$(RuntimeFrameworkVersion)' != ''">$(RuntimeFrameworkVersion)</_DotNetJsVersion>
-      <_BlazorDotnetJsFileName>dotnet.$(_DotNetJsVersion).js</_BlazorDotnetJsFileName>
-    </PropertyGroup>
-
-    <ItemGroup Condition="@(WasmNativeAsset->Count()) != 0">
-      <_DotNetJsItem Remove="@(_DotNetJsItem)" />
-      <_DotNetJsItem Include="@(WasmNativeAsset)" Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.js'">
-        <RelativePath>_framework/$(_BlazorDotnetJsFileName)</RelativePath>
-        <AssetType>native</AssetType>
-        <CopyLocal>true</CopyLocal>
-      </_DotNetJsItem>
-    </ItemGroup>
-
-    <ItemGroup>
-      <_DotnetJsStaticWebAssetCandidate Remove="@(_DotnetJsStaticWebAssetCandidate)" />
-      <_DotnetJsCopyCandidates Remove="@(_DotnetJsCopyCandidates)" />
-    </ItemGroup>
-
-    <DefineStaticWebAssets Condition="'@(_DotNetJsItem->Count())' != '0'"
-      CandidateAssets="@(_DotNetJsItem)"
-      SourceId="$(PackageId)"
-      SourceType="Computed"
-      AssetKind="Build"
-      AssetRole="Primary"
-      AssetTraitName="BlazorWebAssemblyResource"
-      AssetTraitValue="native"
-      CopyToOutputDirectory="PreserveNewest"
-      CopyToPublishDirectory="Never"
-      ContentRoot="$(IntermediateOutputPath)\blazor"
-      BasePath="$(StaticWebAssetBasePath)"
-    >
-      <Output TaskParameter="Assets" ItemName="_DotnetJsStaticWebAssetCandidate" />
-      <Output TaskParameter="CopyCandidates" ItemName="_DotnetJsCopyCandidates" />
-    </DefineStaticWebAssets>
-
-    <Copy
-      SourceFiles="@(_DotnetJsCopyCandidates)"
-      DestinationFiles="@(_DotnetJsCopyCandidates->'%(TargetPath)')"
-      SkipUnchangedFiles="true"
-      OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)" />
-
-    <ItemGroup Condition="'@(_DotNetJsItem->Count())' != '0'">
-      <ReferenceCopyLocalPaths Remove="@(_DotNetJsItem)" />
-      <_DotnetJsStaticWebAsset Include="@(_DotnetJsStaticWebAssetCandidate->'%(ContentRoot)_framework\dotnet.js')" />
-      <_BlazorStaticWebAsset Include="@(_DotnetJsStaticWebAsset)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_ScrambleDotnetJsFileName" AfterTargets="$(_ScrambleDotnetJsFileNameAfterThisTarget)">
-    <!--
-      We want the dotnet.js file output to have a version to better work with caching. We'll append the runtime version to the file name as soon as file has been discovered.
-    -->
-    <PropertyGroup>
-      <_DotNetJsVersion>$(BundledNETCoreAppPackageVersion)</_DotNetJsVersion>
-      <_DotNetJsVersion Condition="'$(RuntimeFrameworkVersion)' != ''">$(RuntimeFrameworkVersion)</_DotNetJsVersion>
-      <_BlazorDotnetJsFileName>dotnet.$(_DotNetJsVersion).js</_BlazorDotnetJsFileName>
-    </PropertyGroup>
-
-    <ItemGroup Condition="@(WasmNativeAsset->Count()) == 0">
-      <_DotNetJsItem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.DestinationSubPath)' == 'dotnet.js' AND '%(ReferenceCopyLocalPaths.AssetType)' == 'native'">
-        <RelativePath>_framework/$(_BlazorDotnetJsFileName)</RelativePath>
-      </_DotNetJsItem>
-    </ItemGroup>
-
-    <ItemGroup Condition="@(WasmNativeAsset->Count()) != 0">
-      <_DotNetJsItem Remove="@(_DotNetJsItem)" />
-      <_DotNetJsItem Include="@(WasmNativeAsset)" Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.js'">
-        <RelativePath>_framework/$(_BlazorDotnetJsFileName)</RelativePath>
-        <AssetType>native</AssetType>
-        <CopyLocal>true</CopyLocal>
-      </_DotNetJsItem>
-    </ItemGroup>
-
-    <DefineStaticWebAssets Condition="'@(_DotNetJsItem->Count())' != '0'"
-      CandidateAssets="@(_DotNetJsItem)"
-      SourceId="$(PackageId)"
-      SourceType="Computed"
-      AssetKind="Build"
-      AssetRole="Primary"
-      AssetTraitName="BlazorWebAssemblyResource"
-      AssetTraitValue="native"
-      CopyToOutputDirectory="PreserveNewest"
-      CopyToPublishDirectory="Never"
-      ContentRoot="$(IntermediateOutputPath)\blazor"
-      BasePath="$(StaticWebAssetBasePath)"
-    >
-      <Output TaskParameter="Assets" ItemName="_DotnetJsStaticWebAssetCandidate" />
-      <Output TaskParameter="CopyCandidates" ItemName="_DotnetJsCopyCandidates" />
-    </DefineStaticWebAssets>
-
-    <Copy
-      SourceFiles="@(_DotnetJsCopyCandidates)"
-      DestinationFiles="@(_DotnetJsCopyCandidates->'%(TargetPath)')"
-      SkipUnchangedFiles="true"
-      OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)" />
-
-    <ItemGroup Condition="'@(_DotNetJsItem->Count())' != '0'">
-      <ReferenceCopyLocalPaths Remove="@(_DotNetJsItem)" />
-      <_DotnetJsStaticWebAsset Include="@(_DotnetJsStaticWebAssetCandidate->'%(ContentRoot)_framework\dotnet.js')" />
-      <_BlazorStaticWebAsset Include="@(_DotnetJsStaticWebAsset)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_BlazorWasmNativeForBuild" DependsOnTargets="_GatherWasmFilesToBuild;WasmBuildApp" Condition="'$(UsingBrowserRuntimeWorkload)' == 'true'" />
-
-  <Target Name="_GatherWasmFilesToBuild">
-    <ItemGroup>
-      <WasmAssembliesToBundle Remove="@(WasmAssembliesToBundle)" />
-      <WasmAssembliesToBundle Include="@(ReferenceCopyLocalPaths);@(MainAssembly)" Condition="'%(ReferenceCopyLocalPaths.Extension)' == '.dll'" />
-      <WasmAssembliesToBundle Condition="'%(WasmAssembliesToBundle.FileName)' == 'Microsoft.JSInterop.WebAssembly'" AOT_InternalForceToInterpret="true" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_ResolveBlazorWasmConfiguration">
-    <PropertyGroup>
-      <_BlazorEnableTimeZoneSupport>$(BlazorEnableTimeZoneSupport)</_BlazorEnableTimeZoneSupport>
-      <_BlazorEnableTimeZoneSupport Condition="'$(_BlazorEnableTimeZoneSupport)' == ''">true</_BlazorEnableTimeZoneSupport>
-      <_BlazorInvariantGlobalization>$(InvariantGlobalization)</_BlazorInvariantGlobalization>
-      <_BlazorInvariantGlobalization Condition="'$(_BlazorInvariantGlobalization)' == ''">true</_BlazorInvariantGlobalization>
-      <_BlazorCopyOutputSymbolsToOutputDirectory>$(CopyOutputSymbolsToOutputDirectory)</_BlazorCopyOutputSymbolsToOutputDirectory>
-      <_BlazorCopyOutputSymbolsToOutputDirectory Condition="'$(_BlazorCopyOutputSymbolsToOutputDirectory)'==''">true</_BlazorCopyOutputSymbolsToOutputDirectory>
-      <_BlazorWebAssemblyLoadAllGlobalizationData>$(BlazorWebAssemblyLoadAllGlobalizationData)</_BlazorWebAssemblyLoadAllGlobalizationData>
-      <_BlazorWebAssemblyLoadAllGlobalizationData Condition="'$(_BlazorWebAssemblyLoadAllGlobalizationData)' == ''">false</_BlazorWebAssemblyLoadAllGlobalizationData>
-
-      <!-- Workaround for https://github.com/dotnet/sdk/issues/12114-->
-      <PublishDir Condition="'$(AppendRuntimeIdentifierToOutputPath)' != 'true' AND '$(PublishDir)' == '$(OutputPath)$(RuntimeIdentifier)\$(PublishDirName)\'">$(OutputPath)$(PublishDirName)\</PublishDir>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="_ResolveBlazorWasmOutputs" DependsOnTargets="ResolveReferences;PrepareResourceNames;ComputeIntermediateSatelliteAssemblies;_ResolveBlazorWasmConfiguration;_BlazorWasmNativeForBuild" BeforeTargets="_RazorPrepareForRun">
-    <ItemGroup>
-      <_BlazorJSFile Include="$(BlazorWebAssemblyJSPath)" />
-      <_BlazorJSFile Include="$(BlazorWebAssemblyJSMapPath)" Condition="Exists('$(BlazorWebAssemblyJSMapPath)')" />
-      <_BlazorJsFile>
-        <RelativePath>_framework/%(Filename)%(Extension)</RelativePath>
-      </_BlazorJsFile>
-
-      <!-- A missing blazor.webassembly.js is our packaging error. Produce an error so it's discovered early. -->
-      <Error
-        Text="Unable to find BlazorWebAssembly JS files. This usually indicates a packaging error."
-        Code="RAZORSDK1007"
-        Condition="'@(_BlazorJSFile->Count())' == '0'" />
-
-      <_BlazorConfigFileCandidates Include="@(StaticWebAsset)" Condition="'%(SourceType)' == 'Discovered'" />
-
-      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)"
-                               Condition="@(WasmNativeAsset->Count()) > 0 and '%(FileName)' == 'dotnet' and ('%(Extension)' == '.wasm' or '%(Extension)' == '.js')" />
-    </ItemGroup>
-
-    <ComputeBlazorBuildAssets
-      Candidates="@(ReferenceCopyLocalPaths);@(WasmNativeAsset)"
-      ProjectAssembly="@(IntermediateAssembly)"
-      ProjectDebugSymbols="@(_DebugSymbolsIntermediatePath)"
-      SatelliteAssemblies="@(ReferenceSatellitePaths)"
-      ProjectSatelliteAssemblies="@(IntermediateSatelliteAssembliesWithTargetPath)"
-      TimeZoneSupport="$(_BlazorEnableTimeZoneSupport)"
-      InvariantGlobalization="$(_BlazorInvariantGlobalization)"
-      CopySymbols="$(_BlazorCopyOutputSymbolsToOutputDirectory)"
-      OutputPath="$(OutputPath)"
-    >
-      <Output TaskParameter="AssetCandidates" ItemName="_BuildAssetsCandidates" />
-      <Output TaskParameter="FilesToRemove" ItemName="_BlazorBuildFilesToRemove" />
-    </ComputeBlazorBuildAssets>
-
-    <DefineStaticWebAssets
-      CandidateAssets="@(_BuildAssetsCandidates)"
-      SourceId="$(PackageId)"
-      SourceType="Computed"
-      AssetKind="Build"
-      AssetRole="Primary"
-      CopyToOutputDirectory="PreserveNewest"
-      CopyToPublishDirectory="Never"
-      ContentRoot="$(OutputPath)wwwroot"
-      BasePath="$(StaticWebAssetBasePath)"
-    >
-      <Output TaskParameter="Assets" ItemName="_BlazorStaticWebAsset" />
-    </DefineStaticWebAssets>
-
-    <DefineStaticWebAssets
-      CandidateAssets="@(_BlazorJSFile)"
-      SourceId="$(PackageId)"
-      SourceType="Computed"
-      AssetKind="All"
-      AssetRole="Primary"
-      AssetTraitName="BlazorWebAssemblyResource"
-      AssetTraitValue="boot"
-      CopyToOutputDirectory="PreserveNewest"
-      CopyToPublishDirectory="PreserveNewest"
-      ContentRoot="$(OutputPath)wwwroot"
-      BasePath="$(StaticWebAssetBasePath)"
-    >
-      <Output TaskParameter="Assets" ItemName="_BlazorStaticWebAsset" />
-    </DefineStaticWebAssets>
-
-    <DefineStaticWebAssets
-      CandidateAssets="@(_BlazorConfigFileCandidates)"
-      AssetTraitName="BlazorWebAssemblyResource"
-      AssetTraitValue="settings"
-      RelativePathFilter="appsettings*.json"
-    >
-      <Output TaskParameter="Assets" ItemName="_BlazorJsConfigStaticWebAsset" />
-    </DefineStaticWebAssets>
-
-    <ItemGroup>
-      <!-- Update the config blazor static web asset since we've given it a trait -->
-      <StaticWebAsset Remove="@(_BlazorJsConfigStaticWebAsset)" />
-      <StaticWebAsset Include="@(_BlazorJsConfigStaticWebAsset)" />
-
-      <ReferenceCopyLocalPaths Remove="@(_BlazorBuildFilesToRemove)" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <_BlazorBuildGZipCompressDirectory>$(IntermediateOutputPath)build-gz\</_BlazorBuildGZipCompressDirectory>
-    </PropertyGroup>
-
-    <!--
-      Compress referenced binaries using GZip during build. This skips files such as the project's assemblies
-      that change from build to build. Runtime assets contribute to the bulk of the download size. Compressing it
-      has the most benefit while avoiding any ongoing costs to the dev inner loop.
-    -->
-
-    <ComputeBlazorFilesToCompress Assets="@(_BlazorStaticWebAsset)">
-      <Output TaskParameter="AssetsToCompress" ItemName="_GzipFileToCompressForBuild" />
-    </ComputeBlazorFilesToCompress>
-
-    <GZipCompress
-      FilesToCompress="@(_GzipFileToCompressForBuild)"
-      OutputDirectory="$(_BlazorBuildGZipCompressDirectory)">
-
-      <Output TaskParameter="CompressedFiles" ItemName="_BlazorBuildGZipCompressedFile" />
-      <Output TaskParameter="CompressedFiles" ItemName="FileWrites" />
-    </GZipCompress>
-
-    <ItemGroup>
-      <_BlazorBuildGZipCompressedFile>
-        <OriginalItemSpec>%(RelatedAsset)</OriginalItemSpec>
-      </_BlazorBuildGZipCompressedFile>
-
-      <_BlazorGzipStaticWebAsset Include="@(_BlazorBuildGZipCompressedFile->'%(FullPath)')" />
-      </ItemGroup>
-
-    <PropertyGroup>
-      <_BlazorBuildBootJsonPath>$(IntermediateOutputPath)blazor.boot.json</_BlazorBuildBootJsonPath>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <_BuildBlazorBootJson
-        Include="$(_BlazorBuildBootJsonPath)"
-        RelativePath="_framework/blazor.boot.json" />
-    </ItemGroup>
-
-    <DefineStaticWebAssets
-      CandidateAssets="@(_BuildBlazorBootJson)"
-      SourceId="$(PackageId)"
-      SourceType="Computed"
-      AssetKind="Build"
-      AssetRole="Primary"
-      AssetTraitName="BlazorWebAssemblyResource"
-      AssetTraitValue="manifest"
-      CopyToOutputDirectory="PreserveNewest"
-      CopyToPublishDirectory="Never"
-      ContentRoot="$(OutDir)wwwroot"
-      BasePath="$(StaticWebAssetBasePath)"
-    >
-      <Output TaskParameter="Assets" ItemName="_BuildBlazorBootJsonStaticWebAsset" />
-  </DefineStaticWebAssets>
-
-  </Target>
-
-  <Target Name="_AddBlazorWasmStaticWebAssets" DependsOnTargets="_ResolveBlazorWasmOutputs">
-    <ItemGroup>
-      <StaticWebAsset Include="@(_BlazorStaticWebAsset)" />
-      <StaticWebAsset Include="@(_BlazorGzipStaticWebAsset)" />
-      <StaticWebAsset Include="@(_BuildBlazorBootJsonStaticWebAsset)" />
-    </ItemGroup>
-
-  </Target>
-
-  <Target Name="_GenerateBuildBlazorBootJson" DependsOnTargets="ResolveStaticWebAssetsInputs">
-    <PropertyGroup>
-      <_BlazorBuildBootJsonPath>$(IntermediateOutputPath)blazor.boot.json</_BlazorBuildBootJsonPath>
-      <_BlazorWebAssemblyLoadAllGlobalizationData Condition="'$(BlazorWebAssemblyLoadAllGlobalizationData)' == ''">false</_BlazorWebAssemblyLoadAllGlobalizationData>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <_BlazorJsModuleCandidatesForBuild
-        Include="@(StaticWebAsset)"
-        Condition="'%(StaticWebAsset.AssetTraitName)' == 'JSModule' and '%(StaticWebAsset.AssetTraitValue)' == 'JSLibraryModule' and '%(AssetKind)' != 'Publish'" />
-    </ItemGroup>
-
-    <GetFileHash Files="@(_BlazorStaticWebAsset->'%(OriginalItemSpec)')" Algorithm="SHA256" HashEncoding="base64">
-      <Output TaskParameter="Items" ItemName="_BlazorOutputWithHash" />
-    </GetFileHash>
-
-    <ComputeStaticWebAssetsTargetPaths
-      Assets="@(_BlazorJsModuleCandidatesForBuild)"
-      PathPrefix=""
-      UseAlternatePathDirectorySeparator="true"
-    >
-      <Output TaskParameter="AssetsWithTargetPath" ItemName="_BlazorJsModuleCandidatesForBuildWithTargetPath" />
-    </ComputeStaticWebAssetsTargetPaths>
-
-    <GetFileHash Files="@(_BlazorJsModuleCandidatesForBuildWithTargetPath)" Algorithm="SHA256" HashEncoding="base64">
-      <Output TaskParameter="Items" ItemName="_BlazorOutputWithHash" />
-    </GetFileHash>
-
-
-    <GenerateBlazorWebAssemblyBootJson
-      AssemblyPath="@(IntermediateAssembly)"
-      Resources="@(_BlazorOutputWithHash)"
-      DebugBuild="true"
-      LinkerEnabled="false"
-      CacheBootResources="$(BlazorCacheBootResources)"
-      OutputPath="$(_BlazorBuildBootJsonPath)"
-      ConfigurationFiles="@(_BlazorJsConfigStaticWebAsset)"
-      LazyLoadedAssemblies="@(BlazorWebAssemblyLazyLoad)"
-      InvariantGlobalization="$(InvariantGlobalization)"
-      LoadAllICUData="$(_BlazorWebAssemblyLoadAllGlobalizationData)" />
-
-    <ItemGroup>
-      <FileWrites Include="$(_BlazorBuildBootJsonPath)" />
-    </ItemGroup>
-
-  </Target>
-
-  <!-- Just print a message here, static web assets takes care of all the copying -->
-  <Target Name="_BlazorCopyFilesToOutputDirectory" AfterTargets="CopyFilesToOutputDirectory">
-    <Message Importance="High" Text="$(MSBuildProjectName) (Blazor output) -&gt; $(TargetDir)wwwroot" Condition="'$(CopyBuildOutputToOutputDirectory)' == 'true' and '$(SkipCopyBuildProduct)'!='true'" />
-  </Target>
-
-  <!-- Publish starts here -->
-
-  <!-- Make sure that ResolveAssemblyReferences runs early enough to ensure satellite assemblies are populated in the ResolvedFilesToPublish -->
-  <Target Name="_BlazorPrepareForPublish"
-    DependsOnTargets="PrepareResourceNames;ComputeIntermediateSatelliteAssemblies;ResolveAssemblyReferences"
-    BeforeTargets="PrepareForPublish" />
-
-  <!--
-    This target configures special trimming for Microsoft.Extensions.* and Microsoft.AspNetCore.* assemblies.
-    We only need this for net5.0 projects since trimmablity is declared using assembly attributes in net6.0 and later.
-  -->
-  <Target Name="_BlazorWasmPrepareForLink" BeforeTargets="PrepareForILLink" Condition="'$(_TargetingNET60OrLater)' != 'true'">
-    <PropertyGroup>
-      <_BlazorTypeGranularTrimmerDescriptorFile>$(IntermediateOutputPath)typegranularity.trimmerdescriptor.xml</_BlazorTypeGranularTrimmerDescriptorFile>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <_BlazorTypeGranularAssembly
-          Include="@(ManagedAssemblyToLink)"
-          Condition="'%(Extension)' == '.dll' AND $([System.String]::Copy('%(Filename)').StartsWith('Microsoft.AspNetCore.'))">
-        <Required>false</Required>
-        <Preserve>all</Preserve>
-      </_BlazorTypeGranularAssembly>
-
-      <ManagedAssemblyToLink
-        IsTrimmable="true"
-        Condition="'%(Extension)' == '.dll' AND ($([System.String]::Copy('%(Filename)').StartsWith('Microsoft.AspNetCore.')) or $([System.String]::Copy('%(Filename)').StartsWith('Microsoft.Extensions.')))" />
-    </ItemGroup>
-
-    <CreateBlazorTrimmerRootDescriptorFile
-      Assemblies="@(_BlazorTypeGranularAssembly)"
-      TrimmerFile="$(_BlazorTypeGranularTrimmerDescriptorFile)" />
-
-    <ItemGroup>
-      <TrimmerRootDescriptor Include="$(_BlazorTypeGranularTrimmerDescriptorFile)" />
-
-      <FileWrites Include="$(_BlazorTypeGranularTrimmerDescriptorFile)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="ProcessPublishFilesForBlazor" DependsOnTargets="_ResolveBlazorWasmConfiguration;LoadStaticWebAssetsBuildManifest" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
-    <PropertyGroup>
-      <_BlazorAotEnabled>$(UsingBrowserRuntimeWorkload)</_BlazorAotEnabled>
-      <_BlazorAotEnabled Condition="'$(_BlazorAotEnabled)' == ''">false</_BlazorAotEnabled>
-      <_BlazorLinkerEnabled>$(PublishTrimmed)</_BlazorLinkerEnabled>
-      <_BlazorLinkerEnabled Condition="'$(_BlazorLinkerEnabled)' == ''">true</_BlazorLinkerEnabled>
-    </PropertyGroup>
-
-    <!-- The list of static web assets already contains all the assets from the build. We want to correct certain assets that might
-         have changed as part of the publish process. We are going to do so as follows:
-         * We will update Blazor runtime asset dlls if we are running PublishTrimmed
-         * We will update Blazor native runtime resources if we are using Aot
-         Other than that, we'll filter the unwanted assets from the list of resolved files to publish in the same way we did during the build.
-    -->
-
-    <ItemGroup>
-      <_BlazorPublishPrefilteredAssets
-        Include="@(StaticWebAsset)"
-        Condition="'%(StaticWebAsset.AssetTraitName)' == 'BlazorWebAssemblyResource' or '%(StaticWebAsset.AssetTraitName)' == 'Culture' or '%(AssetRole)' == 'Alternative'" />
-    </ItemGroup>
-
-    <ComputeBlazorPublishAssets
-      ResolvedFilesToPublish="@(ResolvedFileToPublish)"
-      TimeZoneSupport="$(_BlazorEnableTimeZoneSupport)"
-      PublishPath="$(PublishDir)"
-      WasmAotAssets="@(WasmNativeAsset)"
-      InvariantGlobalization="$(_BlazorInvariantGlobalization)"
-      CopySymbols="$(CopyOutputSymbolsToPublishDirectory)"
-      ExistingAssets="@(_BlazorPublishPrefilteredAssets)"
-    >
-      <Output TaskParameter="NewCandidates" ItemName="_NewBlazorPublishStaticWebAssets" />
-      <Output TaskParameter="FilesToRemove" ItemName="_PublishResolvedFilesToRemove" />
-    </ComputeBlazorPublishAssets>
-
-    <ItemGroup>
-      <ResolvedFileToPublish Remove="@(_PublishResolvedFilesToRemove)" />
-      <StaticWebAsset Include="@(_NewBlazorPublishStaticWebAssets)" />
-      <PublishBlazorBootStaticWebAsset 
-        Include="@(StaticWebAsset)"
-        Condition="'%(AssetKind)' != 'Build' and 
-                    (('%(StaticWebAsset.AssetTraitName)' == 'BlazorWebAssemblyResource' and '%(StaticWebAsset.AssetTraitValue)' != 'manifest' and '%(StaticWebAsset.AssetTraitValue)' != 'boot') or
-                    '%(StaticWebAsset.AssetTraitName)' == 'Culture')" />
-    </ItemGroup>
-  </Target>
-
-  <Target 
-    Name="ComputeBlazorExtensions"
-    AfterTargets="ProcessPublishFilesForBlazor"
-    DependsOnTargets="$(ComputeBlazorExtensionsDependsOn)" >
-    <ItemGroup>
-      <_BlazorExtensionsCandidate Include="@(BlazorPublishExtension->'%(FullPath)')">
-        <SourceId>$(PackageId)</SourceId>
-        <SourceType>Computed</SourceType>
-        <ContentRoot>$(PublishDir)wwwroot</ContentRoot>
-        <BasePath>$(StaticWebAssetBasePath)</BasePath>
-        <RelativePath>%(BlazorPublishExtension.RelativePath)</RelativePath>
-        <AssetKind>Publish</AssetKind>
-        <AssetMode>All</AssetMode>
-        <AssetRole>Primary</AssetRole>
-        <AssetTraitName>BlazorWebAssemblyResource</AssetTraitName>
-        <AssetTraitValue>extension:%(BlazorPublishExtension.ExtensionName)</AssetTraitValue>
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-        <OriginalItemSpec>%(BlazorPublishExtension.Identity)</OriginalItemSpec>
-      </_BlazorExtensionsCandidate>
-    </ItemGroup>
-
-    <DefineStaticWebAssets CandidateAssets="@(_BlazorExtensionsCandidate)">
-      <Output TaskParameter="Assets" ItemName="StaticWebAsset" />
-      <Output TaskParameter="Assets" ItemName="_BlazorExtensionsCandidatesForPublish" />
-    </DefineStaticWebAssets>
-
-  </Target>
-
-  <Target Name="_AddBlazorWebConfigFile" AfterTargets="ILLink">
-    <ItemGroup Condition="'@(ResolvedFileToPublish->AnyHaveMetadataValue('RelativePath', 'web.config'))' != 'true'">
-      <ResolvedFileToPublish
-         Include="$(MSBuildThisFileDirectory)BlazorWasm.web.config"
-         ExcludeFromSingleFile="true"
-         CopyToPublishDirectory="PreserveNewest"
-         RelativePath="web.config" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_AddPublishBlazorBootJsonToStaticWebAssets">
-    <ItemGroup>
-      <_PublishBlazorBootJson
-        Include="$(IntermediateOutputPath)blazor.publish.boot.json"
-        RelativePath="_framework/blazor.boot.json" />
-    </ItemGroup>
-
-    <DefineStaticWebAssets
-      CandidateAssets="@(_PublishBlazorBootJson)"
-      SourceId="$(PackageId)"
-      SourceType="Computed"
-      AssetKind="Publish"
-      AssetRole="Primary"
-      AssetTraitName="BlazorWebAssemblyResource"
-      AssetTraitValue="manifest"
-      CopyToOutputDirectory="Never"
-      CopyToPublishDirectory="PreserveNewest"
-      ContentRoot="$(PublishDir)wwwroot"
-      BasePath="$(StaticWebAssetBasePath)"
-    >
-      <Output TaskParameter="Assets" ItemName="StaticWebAsset" />
-    </DefineStaticWebAssets>
-  </Target>
-
-  <Target Name="GeneratePublishBlazorBootJson">
-
-    <ItemGroup>
-      <_BlazorPublishAsset
-        Include="@(StaticWebAsset)"
-        Condition="'%(AssetKind)' != 'Build' and '%(StaticWebAsset.AssetTraitValue)' != 'manifest' and ('%(StaticWebAsset.AssetTraitName)' == 'BlazorWebAssemblyResource' or '%(StaticWebAsset.AssetTraitName)' == 'Culture') and '%(StaticWebAsset.AssetTraitValue)' != 'boot'" />
-
-      <_BlazorPublishConfigFile
-        Include="@(StaticWebAsset)"
-        Condition="'%(StaticWebAsset.AssetTraitName)' == 'BlazorWebAssemblyResource' and '%(StaticWebAsset.AssetTraitValue)' == 'settings'"/>
-
-      <_BlazorJsModuleCandidatesForPublish
-        Include="@(StaticWebAsset)"
-        Condition="'%(StaticWebAsset.AssetTraitName)' == 'JSModule' and '%(StaticWebAsset.AssetTraitValue)' == 'JSLibraryModule' and '%(AssetKind)' != 'Build'" />
-
-      <!-- We remove the extensions since they are added to the list of static web assets but we need to compute the target path for them -->
-      <_BlazorPublishAsset Remove="@(_BlazorExtensionsCandidatesForPublish)" />
-
-    </ItemGroup>
-
-    <ComputeStaticWebAssetsTargetPaths
-      Assets="@(_BlazorJsModuleCandidatesForPublish);@(_BlazorExtensionsCandidatesForPublish)"
-      PathPrefix=""
-      UseAlternatePathDirectorySeparator="true"
-    >
-      <Output TaskParameter="AssetsWithTargetPath" ItemName="_BlazorCandidatesForPublishWithTargetPath" />
-    </ComputeStaticWebAssetsTargetPaths>
-
-    <GetFileHash Files="@(_BlazorPublishAsset);@(_BlazorCandidatesForPublishWithTargetPath)" Algorithm="SHA256" HashEncoding="base64">
-      <Output TaskParameter="Items" ItemName="_BlazorPublishBootResourceWithHash" />
-    </GetFileHash>
-
-    <GenerateBlazorWebAssemblyBootJson
-      AssemblyPath="@(IntermediateAssembly)"
-      Resources="@(_BlazorPublishBootResourceWithHash)"
-      DebugBuild="false"
-      LinkerEnabled="$(PublishTrimmed)"
-      CacheBootResources="$(BlazorCacheBootResources)"
-      OutputPath="$(IntermediateOutputPath)blazor.publish.boot.json"
-      ConfigurationFiles="@(_BlazorPublishConfigFile)"
-      LazyLoadedAssemblies="@(BlazorWebAssemblyLazyLoad)"
-      InvariantGlobalization="$(InvariantGlobalization)"
-      LoadAllICUData="$(_BlazorWebAssemblyLoadAllGlobalizationData)" />
-
-    <ItemGroup>
-      <FileWrites Include="$(IntermediateOutputPath)blazor.publish.boot.json" />
-    </ItemGroup>
-
-  </Target>
-
-  <Target Name="_BlazorWasmNative"
-      DependsOnTargets="_EnsureWasmRuntimeWorkload;WasmTriggerPublishApp;_ScrambleDotnetJsFileNameForPublish"
-      BeforeTargets="ProcessPublishFilesForBlazor"
-      Condition="'$(UsingBrowserRuntimeWorkload)' == 'true'" />
-
-  <Target Name="_EnsureWasmRuntimeWorkload" Condition="'$(UsingBlazorAOTWorkloadManifest)' != 'true'">
-    <Error
-      Text="Publishing with AOT enabled requires the .NET WebAssembly AOT workload to be installed. To learn more, visit https://aka.ms/AAb4uzl."
-      Code="BLAZORSDK1002" />
-  </Target>
-
-  <Target Name="_GatherWasmFilesToPublish">
-    <ItemGroup>
-      <WasmAssembliesToBundle Remove="@(WasmAssembliesToBundle)" />
-      <WasmAssembliesToBundle Include="%(ResolvedFileToPublish.FullPath)" Exclude="@(_Exclude)" Condition="%(Extension) == '.dll'" />
-      <WasmAssembliesToBundle Condition="'%(WasmAssembliesToBundle.FileName)' == 'Microsoft.JSInterop.WebAssembly'" AOT_InternalForceToInterpret="true" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_BlazorCompressPublishFiles" AfterTargets="GeneratePublishBlazorBootJson" Condition="'$(BlazorEnableCompression)' != 'false'">
-    <PropertyGroup>
-      <_CompressedFileOutputPath>$(IntermediateOutputPath)compress\</_CompressedFileOutputPath>
-      <_BlazorWebAssemblyBrotliIncremental>true</_BlazorWebAssemblyBrotliIncremental>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(DOTNET_HOST_PATH)' == ''">
-      <_DotNetHostDirectory>$(NetCoreRoot)</_DotNetHostDirectory>
-      <_DotNetHostFileName>dotnet</_DotNetHostFileName>
-      <_DotNetHostFileName Condition="'$(OS)' == 'Windows_NT'">dotnet.exe</_DotNetHostFileName>
-    </PropertyGroup>
-
-    <Message Text="Compressing Blazor WebAssembly publish artifacts. This may take a while..." Importance="High" />
-
-    <MakeDir Directories="$(_CompressedFileOutputPath)" Condition="!Exists('$(_CompressedFileOutputPath)')" />
-
-    <ItemGroup>
-      <_GzipFileToCompressForPublish Include="@(StaticWebAsset)"
-        Condition="'%(AssetKind)' != 'Build' and ('%(StaticWebAsset.AssetTraitName)' == 'BlazorWebAssemblyResource' or '%(StaticWebAsset.AssetTraitName)' == 'Culture')" >
-        <RelatedAsset>%(Identity)</RelatedAsset>
-        <AssetRole>Alternative</AssetRole>
-        <AssetTraitName>Content-Encoding</AssetTraitName>
-        <AssetTraitValue>gzip</AssetTraitValue>
-      </_GzipFileToCompressForPublish>
-
-      <_BrotliFileToCompressForPublish Include="@(_GzipFileToCompressForPublish)" Condition="'%(AssetKind)' != 'Build'">
-        <AssetTraitValue>br</AssetTraitValue>
-      </_BrotliFileToCompressForPublish>
-
-      <!-- We compressed a bunch of assets that were not modified since the build process. We can reuse those and avoid the extra compression we just
-           need to check that they are still relevant (we have updated existing assets to account for linking) -->
-      <_AlreadyGzipCompressedAssets
-        Include="@(StaticWebAsset)"
-        Condition="'%(AssetKind)' != 'Build' and ('%(StaticWebAsset.AssetTraitName)' == 'Content-Encoding' and '%(StaticWebAsset.AssetTraitValue)' == 'gzip')" />
-      <_GzipFileToCompressForPublish Remove="@(_AlreadyGzipCompressedAssets->'%(RelatedAsset)')" />
-    </ItemGroup>
-
-    <GZipCompress
-      FilesToCompress="@(_GzipFileToCompressForPublish)"
-      OutputDirectory="$(_CompressedFileOutputPath)">
-
-      <Output TaskParameter="CompressedFiles" ItemName="_BlazorPublishGZipCompressedFile" />
-      <Output TaskParameter="CompressedFiles" ItemName="FileWrites" />
-    </GZipCompress>
-
-    <BrotliCompress
-      OutputDirectory="$(_CompressedFileOutputPath)"
-      FilesToCompress="@(_BrotliFileToCompressForPublish)"
-      CompressionLevel="$(_BlazorBrotliCompressionLevel)"
-      SkipIfOutputIsNewer="$(_BlazorWebAssemblyBrotliIncremental)"
-      ToolAssembly="$(_BlazorWebAssemblySdkToolAssembly)"
-      ToolExe="$(_DotNetHostFileName)"
-      ToolPath="$(_DotNetHostDirectory)">
-
-      <Output TaskParameter="CompressedFiles" ItemName="_BlazorPublishBrotliCompressedFile" />
-      <Output TaskParameter="CompressedFiles" ItemName="FileWrites" />
-    </BrotliCompress>
-
-    <ItemGroup>
-      <_BlazorPublishGZipCompressedFile>
-        <OriginalItemSpec>%(RelatedAsset)</OriginalItemSpec>
-      </_BlazorPublishGZipCompressedFile>
-      <_BlazorPublishBrotliCompressedFile>
-        <OriginalItemSpec>%(RelatedAsset)</OriginalItemSpec>
-      </_BlazorPublishBrotliCompressedFile>
-
-      <StaticWebAsset Include="@(_BlazorPublishGZipCompressedFile->'%(FullPath)')" />
-      <StaticWebAsset Include="@(_BlazorPublishBrotliCompressedFile->'%(FullPath)')" />
-    </ItemGroup>
-  </Target>
-
-</Project>

From 2984d86fddfad6c470719f9e02ead0c104c57678 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Wed, 22 Sep 2021 19:06:23 +0000
Subject: [PATCH 04/14] Apply suggestions from code review

Co-authored-by: Larry Ewing <lewing@microsoft.com>
---
 src/mono/wasm/build/WasmApp.Native.targets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets
index 0159323e35761c..ac25a589d0d261 100644
--- a/src/mono/wasm/build/WasmApp.Native.targets
+++ b/src/mono/wasm/build/WasmApp.Native.targets
@@ -158,8 +158,6 @@
       <_EmccAssertionLevelDefault>0</_EmccAssertionLevelDefault>
       <_EmccOptimizationFlagDefault Condition="'$(_WasmDevel)' == 'true'">-O0 -s ASSERTIONS=$(_EmccAssertionLevelDefault)</_EmccOptimizationFlagDefault>
       <_EmccOptimizationFlagDefault Condition="'$(_EmccOptimizationFlagDefault)' == '' and '$(Configuration)' == 'Debug'">-O1</_EmccOptimizationFlagDefault>
-      <_EmccOptimizationFlagDefault Condition="'$(_EmccOptimizationFlagDefault)' == '' and '$(OS)' != 'Windows_NT' and '$(Configuration)' == 'Debug'">-Os</_EmccOptimizationFlagDefault>
-      <_EmccOptimizationFlagDefault Condition="'$(_EmccOptimizationFlagDefault)' == '' and '$(Configuration)' != 'Debug'">-Oz</_EmccOptimizationFlagDefault>
       <_EmccOptimizationFlagDefault Condition="'$(_EmccOptimizationFlagDefault)' == ''">-Oz</_EmccOptimizationFlagDefault>
 
       <EmccCompileOptimizationFlag Condition="'$(EmccCompileOptimizationFlag)' == ''">$(_EmccOptimizationFlagDefault)</EmccCompileOptimizationFlag>

From 67cda93c70459ef671c86d8287e54b686eec89fc Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Wed, 22 Sep 2021 18:14:07 -0400
Subject: [PATCH 05/14] Don't set optimization defaults for Debug config, when
 publishing

---
 src/mono/wasm/build/WasmApp.Native.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets
index ac25a589d0d261..77dd103ab5afd4 100644
--- a/src/mono/wasm/build/WasmApp.Native.targets
+++ b/src/mono/wasm/build/WasmApp.Native.targets
@@ -143,7 +143,7 @@
     <PropertyGroup>
       <_MonoAotCrossCompilerPath>@(MonoAotCrossCompiler->WithMetadataValue('RuntimeIdentifier','browser-wasm'))</_MonoAotCrossCompilerPath>
       <_EmccDefaultFlagsRsp>$([MSBuild]::NormalizePath($(_WasmRuntimePackSrcDir), 'emcc-default.rsp'))</_EmccDefaultFlagsRsp>
-      <WasmNativeStrip Condition="'$(WasmNativeStrip)' == '' and '$(Configuration)' == 'Debug'">false</WasmNativeStrip>
+      <WasmNativeStrip Condition="'$(WasmNativeStrip)' == '' and '$(Configuration)' == 'Debug' and '$(WasmBuildingForNestedPublish)' != 'true'">false</WasmNativeStrip>
       <WasmNativeStrip Condition="'$(WasmNativeStrip)' == ''">true</WasmNativeStrip>
       <WasmNativeDebugSymbols Condition="'$(WasmNativeDebugSymbols)' == ''">true</WasmNativeDebugSymbols>
       <WasmLinkIcalls Condition="'$(WasmLinkIcalls)' == ''">$(WasmBuildNative)</WasmLinkIcalls>
@@ -157,7 +157,7 @@
 
       <_EmccAssertionLevelDefault>0</_EmccAssertionLevelDefault>
       <_EmccOptimizationFlagDefault Condition="'$(_WasmDevel)' == 'true'">-O0 -s ASSERTIONS=$(_EmccAssertionLevelDefault)</_EmccOptimizationFlagDefault>
-      <_EmccOptimizationFlagDefault Condition="'$(_EmccOptimizationFlagDefault)' == '' and '$(Configuration)' == 'Debug'">-O1</_EmccOptimizationFlagDefault>
+      <_EmccOptimizationFlagDefault Condition="'$(_EmccOptimizationFlagDefault)' == '' and '$(Configuration)' == 'Debug' and '$(WasmBuildingForNestedPublish)' != 'true'">-O1</_EmccOptimizationFlagDefault>
       <_EmccOptimizationFlagDefault Condition="'$(_EmccOptimizationFlagDefault)' == ''">-Oz</_EmccOptimizationFlagDefault>
 
       <EmccCompileOptimizationFlag Condition="'$(EmccCompileOptimizationFlag)' == ''">$(_EmccOptimizationFlagDefault)</EmccCompileOptimizationFlag>

From 56da550108aa8b16ac02bd8029a9a89815c440e1 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 23 Sep 2021 16:25:28 -0400
Subject: [PATCH 06/14] Wasm.Build.Tests: Disable net5.0 because they can't be
 tested right now

https://github.com/dotnet/runtime/issues/59538
---
 src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmTests.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmTests.cs
index 6c7e3ed788be56..727e6589c4c6d2 100644
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmTests.cs
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmTests.cs
@@ -79,6 +79,7 @@ private CommandResult PublishForRequiresWorkloadTest(string config, string extra
         [Theory]
         [InlineData("Debug")]
         [InlineData("Release")]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/59538")]
         public void Net50Projects_NativeReference(string config)
             => BuildNet50Project(config, aot: false, expectError: true, @"<NativeFileReference Include=""native-lib.o"" />");
 
@@ -92,6 +93,7 @@ public void Net50Projects_NativeReference(string config)
 
         [Theory]
         [MemberData(nameof(Net50TestData))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/59538")]
         public void Net50Projects_AOT(string config, bool aot, bool expectError)
             => BuildNet50Project(config, aot: aot, expectError: expectError);
 

From ed2cc52621a9895946ba2a38132ed70b4b66eb67 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 23 Sep 2021 16:27:57 -0400
Subject: [PATCH 07/14] Bump sdk for workload testing to 6.0.100-rc.2.21473.29

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 142ba9fedc4268..f4f758ececabd0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -165,7 +165,7 @@
     <SQLitePCLRawbundle_greenVersion>2.0.4</SQLitePCLRawbundle_greenVersion>
     <MoqVersion>4.12.0</MoqVersion>
     <FsCheckVersion>2.14.3</FsCheckVersion>
-    <SdkVersionForWorkloadTesting>6.0.100-rc.2.21472.15</SdkVersionForWorkloadTesting>
+    <SdkVersionForWorkloadTesting>6.0.100-rc.2.21473.29</SdkVersionForWorkloadTesting>
     <!-- Docs -->
     <MicrosoftPrivateIntellisenseVersion>6.0.0-preview-20210916.1</MicrosoftPrivateIntellisenseVersion>
     <!-- ILLink -->

From 94110b39ad02149948180d62c5fd3b99755075a9 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 23 Sep 2021 20:52:19 -0400
Subject: [PATCH 08/14] [wasm] Error for undefined symbols only when publishing

For non-publish builds, undefined symbols will show up as warnings:

```
EXEC : warning : undefined symbol: sqlite3_column_database_name (referenced by top-level compiled C/C++ code) [/BlazorWebAssemblySqlite.csproj]
EXEC : warning : undefined symbol: sqlite3_column_origin_name (referenced by top-level compiled C/C++ code) [/BlazorWebAssemblySqlite.csproj]
EXEC : warning : undefined symbol: sqlite3_column_table_name (referenced by top-level compiled C/C++ code) [/BlazorWebAssemblySqlite.csproj]
EXEC : warning : undefined symbol: sqlite3_snapshot_cmp (referenced by top-level compiled C/C++ code) [/BlazorWebAssemblySqlite.csproj]
EXEC : warning : undefined symbol: sqlite3_snapshot_free (referenced by top-level compiled C/C++ code) [/BlazorWebAssemblySqlite.csproj]
EXEC : warning : undefined symbol: sqlite3_snapshot_get (referenced by top-level compiled C/C++ code) [/BlazorWebAssemblySqlite.csproj]
EXEC : warning : undefined symbol: sqlite3_snapshot_open (referenced by top-level compiled C/C++ code) [/BlazorWebAssemblySqlite.csproj]
EXEC : warning : undefined symbol: sqlite3_snapshot_recover (referenced by top-level compiled C/C++ code) [/BlazorWebAssemblySqlite.csproj]
```
---
 src/mono/wasm/build/WasmApp.Native.targets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets
index 77dd103ab5afd4..e564d43520b592 100644
--- a/src/mono/wasm/build/WasmApp.Native.targets
+++ b/src/mono/wasm/build/WasmApp.Native.targets
@@ -206,6 +206,9 @@
       <_EmccLDFlags Include="@(_EmccCommonFlags)" />
       <_EmccLDFlags Include="-s TOTAL_MEMORY=$(EmccTotalMemory)" />
 
+      <!-- ILLinker should have removed unused imports, so error for Publish -->
+      <_EmccLDFlags Include="-s ERROR_ON_UNDEFINED_SYMBOLS=0" Condition="'$(WasmBuildingForNestedPublish)' != 'true'" />
+
       <_DriverCDependencies Include="$(_WasmPInvokeHPath);$(_WasmICallTablePath)" />
       <_DriverCDependencies Include="$(_DriverGenCPath)" Condition="'$(_DriverGenCNeeded)' == 'true'" />
 

From 3f7acdca26ca62fff67a6026900715a26a1a10f8 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 23 Sep 2021 20:55:12 -0400
Subject: [PATCH 09/14] [wasm] PInvokeTableGenerator: Add support for variadic
 functions

Currently, for a variadic function like:

`int sqlite3_config(int, ...);`

.. and multiple pinvokes like:

```csharp
[DllImport(SQLITE_DLL, ExactSpelling=true, EntryPoint = "sqlite3_config", CallingConvention = CALLING_CONVENTION)]
public static extern unsafe int sqlite3_config_none(int op);

[DllImport(SQLITE_DLL, ExactSpelling=true, EntryPoint = "sqlite3_config", CallingConvention = CALLING_CONVENTION)]
public static extern unsafe int sqlite3_config_int(int op, int val);

[DllImport(SQLITE_DLL, ExactSpelling=true, EntryPoint = "sqlite3_config", CallingConvention = CALLING_CONVENTION)]
public static extern unsafe int sqlite3_config_log(int op, NativeMethods.callback_log func, hook_handle pvUser);
```

.. we generate:

```c
int sqlite3_config (int);
int sqlite3_config (int,int);
int sqlite3_config (int,int,int);
```

.. which fails to compile.

Instead, this patch will generate a variadic declaration with one fixed
parameter:

```c
// Variadic signature created for
//   System.Int32 sqlite3_config_none(System.Int32)
//   System.Int32 sqlite3_config_int(System.Int32, System.Int32)
//   System.Int32 sqlite3_config_log(System.Int32, SQLitePCL.SQLite3Provider_e_sqlite3+NativeMethods+callback_log, SQLitePCL.hook_handle)
int sqlite3_config (int, ...);
```

TODO: functions with different first argument
---
 .../WasmAppBuilder/PInvokeTableGenerator.cs   | 41 ++++++++++++++-----
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs b/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs
index 825de67d6e2704..aeedc8995d1dcf 100644
--- a/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs
+++ b/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs
@@ -122,12 +122,23 @@ private void EmitPInvokeTable(StreamWriter w, Dictionary<string, string> modules
         w.WriteLine();
 
         var decls = new HashSet<string>();
-        foreach (var pinvoke in pinvokes.OrderBy(l => l.EntryPoint))
+        // FIXME: handle sigs with different first args
+        foreach (var group in pinvokes.OrderBy(l => l.EntryPoint).GroupBy(l => l.EntryPoint))
         {
+            IEnumerable<string?>? uniqueSigs = group.Select(l => l.Method.ToString()).Distinct();
+            bool treatAsVariadic = uniqueSigs.Count() > 1;
+            if (treatAsVariadic)
+            {
+                w.WriteLine($"// Variadic signature created for");
+                foreach (string? method in uniqueSigs)
+                    w.WriteLine($"//   {method}");
+            }
+
+            PInvoke pinvoke = group.First();
             if (modules.ContainsKey(pinvoke.Module)) {
                 try
                 {
-                    var decl = GenPInvokeDecl(pinvoke);
+                    var decl = GenPInvokeDecl(pinvoke, treatAsVariadic);
                     if (decls.Contains(decl))
                         continue;
 
@@ -205,7 +216,7 @@ private string MapType (Type t)
             return "int";
     }
 
-    private string GenPInvokeDecl(PInvoke pinvoke)
+    private string GenPInvokeDecl(PInvoke pinvoke, bool treatAsVariadic=false)
     {
         var sb = new StringBuilder();
         var method = pinvoke.Method;
@@ -215,15 +226,25 @@ private string GenPInvokeDecl(PInvoke pinvoke)
             sb.Append($"int {pinvoke.EntryPoint} (int, int, int, int, int);");
             return sb.ToString();
         }
+
         sb.Append(MapType(method.ReturnType));
         sb.Append($" {pinvoke.EntryPoint} (");
-        int pindex = 0;
-        var pars = method.GetParameters();
-        foreach (var p in pars) {
-            if (pindex > 0)
-                sb.Append(',');
-            sb.Append(MapType(pars[pindex].ParameterType));
-            pindex++;
+        if (!treatAsVariadic)
+        {
+            int pindex = 0;
+            var pars = method.GetParameters();
+            foreach (var p in pars) {
+                if (pindex > 0)
+                    sb.Append(',');
+                sb.Append(MapType(pars[pindex].ParameterType));
+                pindex++;
+            }
+        }
+        else
+        {
+            ParameterInfo firstParam = method.GetParameters()[0];
+            sb.Append(MapType(firstParam.ParameterType));
+            sb.Append(", ...");
         }
         sb.Append(");");
         return sb.ToString();

From bfce53a84da6ae788b14925dfa544be2dad4baee Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Fri, 24 Sep 2021 17:16:45 -0400
Subject: [PATCH 10/14] [wasm] Handle pinvokes with function pointers

- For pinvokes with function pointers, *no* declaration is added to
  `pinvoke-table.h`, and a warning is raised:

```
warning : DllImports with function pointers are not supported. Calling them will fail. Managed DllImports:  [/Users/radical/dev/r2/artifacts/bin/Wasm.Build.Tests/net6.0-Release/browser-wasm/g3acrk4b.a0o/variadic_g3acrk4b.a0o.csproj]
warning :    Type: Test, Method: System.Int32 using_sum_one(?) [/Users/radical/dev/r2/artifacts/bin/Wasm.Build.Tests/net6.0-Release/browser-wasm/g3acrk4b.a0o/variadic_g3acrk4b.a0o.csproj]
```

- Also, handle multiple pinvokes with the same number of params, but
  different types
---
 .../WasmAppBuilder/PInvokeTableGenerator.cs   | 69 +++++++++++---
 .../Wasm.Build.Tests/NativeLibraryTests.cs    | 89 +++++++++++++++++++
 2 files changed, 144 insertions(+), 14 deletions(-)

diff --git a/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs b/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs
index aeedc8995d1dcf..4aab6213eefa05 100644
--- a/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs
+++ b/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs
@@ -122,23 +122,39 @@ private void EmitPInvokeTable(StreamWriter w, Dictionary<string, string> modules
         w.WriteLine();
 
         var decls = new HashSet<string>();
-        // FIXME: handle sigs with different first args
-        foreach (var group in pinvokes.OrderBy(l => l.EntryPoint).GroupBy(l => l.EntryPoint))
+        foreach (var group in pinvokes.GroupBy(l => l.EntryPoint))
         {
-            IEnumerable<string?>? uniqueSigs = group.Select(l => l.Method.ToString()).Distinct();
-            bool treatAsVariadic = uniqueSigs.Count() > 1;
-            if (treatAsVariadic)
+            bool treatAsVariadic = false;
+            PInvoke first = group.First();
+
+            if (!ShouldApplyHackForMethodWithFunctionPointers(first.Method))
             {
-                w.WriteLine($"// Variadic signature created for");
-                foreach (string? method in uniqueSigs)
-                    w.WriteLine($"//   {method}");
+                if (HasFunctionPointerParams(first.Method))
+                {
+                    Log.LogWarning($"DllImports with function pointers are not supported. Calling them will fail. Managed DllImports: {Environment.NewLine}{GroupToString(group)}");
+                    foreach (var pinvoke in group)
+                        pinvoke.Skip = true;
+
+                    continue;
+                }
+
+                int numArgs = first.Method.GetParameters().Length;
+                treatAsVariadic = group.Count() > 1 && group.Any(p => p.Method.GetParameters().Length != numArgs);
+                if (treatAsVariadic)
+                {
+                    w.WriteLine($"// Variadic signature created for");
+                    foreach (PInvoke pinvoke in group)
+                        w.WriteLine($"//   {pinvoke.Method}");
+
+                    Log.LogWarning($"Found a native function ({first.EntryPoint}) with varargs, which is not supported. Calling it will fail at runtime. Module: {first.Module}." +
+                                    $" Managed DllImports: {Environment.NewLine}{GroupToString(group)}");
+                }
             }
 
-            PInvoke pinvoke = group.First();
-            if (modules.ContainsKey(pinvoke.Module)) {
+            if (modules.ContainsKey(first.Module)) {
                 try
                 {
-                    var decl = GenPInvokeDecl(pinvoke, treatAsVariadic);
+                    var decl = GenPInvokeDecl(first, treatAsVariadic);
                     if (decls.Contains(decl))
                         continue;
 
@@ -148,8 +164,8 @@ private void EmitPInvokeTable(StreamWriter w, Dictionary<string, string> modules
                 catch (NotSupportedException)
                 {
                     // See the FIXME in GenPInvokeDecl
-                    Log.LogWarning($"Cannot handle function pointer arguments/return value in pinvoke method '{pinvoke.Method}' in type '{pinvoke.Method.DeclaringType}'.");
-                    pinvoke.Skip = true;
+                    Log.LogWarning($"Cannot handle function pointer arguments/return value in pinvoke method '{first.Method}' in type '{first.Method.DeclaringType}'.");
+                    first.Skip = true;
                 }
             }
         }
@@ -197,6 +213,27 @@ static string ModuleNameToId(string name)
 
             return fixedName;
         }
+
+        static bool HasFunctionPointerParams(MethodInfo method)
+        {
+            try
+            {
+                method.GetParameters();
+            }
+            catch (NotSupportedException nse) when (nse.Message.Contains("function pointer types in signatures is not supported"))
+            {
+                return true;
+            }
+            catch
+            {
+                // not concerned with other exceptions
+            }
+
+            return false;
+        }
+
+        static string GroupToString(IGrouping<string, PInvoke> group)
+            => string.Join(Environment.NewLine, group.Select(p => $"   Type: {p.Method.DeclaringType}, Method: {p.Method}"));
     }
 
     private string MapType (Type t)
@@ -216,11 +253,14 @@ private string MapType (Type t)
             return "int";
     }
 
+    private static bool ShouldApplyHackForMethodWithFunctionPointers(MethodInfo method) => method.Name == "EnumCalendarInfo";
+
     private string GenPInvokeDecl(PInvoke pinvoke, bool treatAsVariadic=false)
     {
         var sb = new StringBuilder();
         var method = pinvoke.Method;
-        if (method.Name == "EnumCalendarInfo") {
+        if (ShouldApplyHackForMethodWithFunctionPointers(method))
+        {
             // FIXME: System.Reflection.MetadataLoadContext can't decode function pointer types
             // https://github.com/dotnet/runtime/issues/43791
             sb.Append($"int {pinvoke.EntryPoint} (int, int, int, int, int);");
@@ -242,6 +282,7 @@ private string GenPInvokeDecl(PInvoke pinvoke, bool treatAsVariadic=false)
         }
         else
         {
+            // FIXME: handle sigs with different first args
             ParameterInfo firstParam = method.GetParameters()[0];
             sb.Append(MapType(firstParam.ParameterType));
             sb.Append(", ...");
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs
index 3ccf400ee92113..c06759ee2aa257 100644
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using System.IO;
 using Xunit;
 using Xunit.Abstractions;
@@ -91,5 +92,93 @@ public static int Main()
 
             Assert.Contains("Size: 26462 Height: 599, Width: 499", output);
         }
+
+        [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
+        [BuildAndRun(host: RunHost.V8)]
+        public void NativeLibraryWithVariadicFunctions(BuildArgs buildArgs, RunHost host, string id)
+        {
+            string projectName = $"variadic_{id}";
+            string code = @"
+using System;
+using System.Runtime.InteropServices;
+public class Test
+{
+    public static int Main(string[] args)
+    {
+        Console.WriteLine($""Main running"");
+        if (args.Length > 0)
+        {
+            // We don't want to run this, because we can't call variadic functions
+            Console.WriteLine($""sum_three: {sum_three(7, 14, 21)}"");
+            Console.WriteLine($""sum_two: {sum_two(3, 6)}"");
+            Console.WriteLine($""sum_one: {sum_one(5)}"");
+        }
+        return 42;
+    }
+
+    [DllImport(""variadic"", EntryPoint=""sum"")] public static extern int sum_one(int a);
+    [DllImport(""variadic"", EntryPoint=""sum"")] public static extern int sum_two(int a, int b);
+    [DllImport(""variadic"", EntryPoint=""sum"")] public static extern int sum_three(int a, int b, int c);
+}";
+            string filename = "variadic.o";
+            buildArgs = buildArgs with { ProjectName = projectName };
+            buildArgs = ExpandBuildArgs(buildArgs, extraItems: $"<NativeFileReference Include=\"{filename}\" />");
+
+            BuildProject(buildArgs,
+                        initProject: () =>
+                        {
+                            File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), code);
+                            File.Copy(Path.Combine(BuildEnvironment.TestAssetsPath, "native-libs", filename),
+                                        Path.Combine(_projectDir!, filename));
+                        },
+                        publish: false,
+                        id: id,
+                        dotnetWasmFromRuntimePack: false);
+
+            string output = RunAndTestWasmApp(buildArgs, buildDir: _projectDir, expectedExitCode: 42, host: host, id: id);
+            Assert.Contains("Main running", output);
+        }
+
+        [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
+        [BuildAndRun(host: RunHost.V8)]
+        public void DllImportWithFunctionPointersCompilesWithWarning(BuildArgs buildArgs, RunHost host, string id)
+        {
+            string projectName = $"variadic_{id}";
+            string code = @"
+using System;
+using System.Runtime.InteropServices;
+public class Test
+{
+    public static int Main()
+    {
+        Console.WriteLine($""Main running"");
+        return 42;
+    }
+
+    [DllImport(""variadic"", EntryPoint=""sum"")] public unsafe static extern int using_sum_one(delegate* unmanaged<char*, IntPtr, void> callback);
+}";
+            string filename = "variadic.o";
+            buildArgs = buildArgs with { ProjectName = projectName };
+            buildArgs = ExpandBuildArgs(buildArgs, extraItems: $"<NativeFileReference Include=\"{filename}\" />", extraProperties: "<AllowUnsafeBlocks>true</AllowUnsafeBlocks>");
+
+            Console.WriteLine ($"-- args: {buildArgs}, name: {projectName}");
+
+            (_, string output) = BuildProject(buildArgs,
+                                        initProject: () =>
+                                        {
+                                            File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), code);
+                                            File.Copy(Path.Combine(BuildEnvironment.TestAssetsPath, "native-libs", filename),
+                                                        Path.Combine(_projectDir!, filename));
+                                        },
+                                        publish: false,
+                                        id: id,
+                                        dotnetWasmFromRuntimePack: false);
+
+            Assert.Matches("warning.*function pointers", output);
+            Assert.Matches("warning.*using_sum_one", output);
+
+            output = RunAndTestWasmApp(buildArgs, buildDir: _projectDir, expectedExitCode: 42, host: host, id: id);
+            Assert.Contains("Main running", output);
+        }
     }
 }

From a5a05dd569f4132e1639fc98dbd9e1654f9c6c8f Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Sat, 25 Sep 2021 01:02:34 -0400
Subject: [PATCH 11/14] [wasm] PInvokeTableGenerator: handle pinvokes with
 function pointers

- pinvokes with function pointers could be for variadic functions too
- if there are multiple pinvokes for the same native function, but some
  of them have function pointers, then ignore those but generate the
  declaration for the rest

- raise better warnings
- and emit info about the variadic pinvokes in pinvoke-table.h
---
 .../scenarios/BuildWasmAppsJobsList.txt       |   1 +
 .../WasmAppBuilder/PInvokeTableGenerator.cs   | 155 +++++++++++-------
 .../Wasm.Build.Tests/NativeLibraryTests.cs    |  88 ----------
 .../PInvokeTableGeneratorTests.cs             | 139 ++++++++++++++++
 4 files changed, 235 insertions(+), 148 deletions(-)
 create mode 100644 src/tests/BuildWasmApps/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs

diff --git a/eng/testing/scenarios/BuildWasmAppsJobsList.txt b/eng/testing/scenarios/BuildWasmAppsJobsList.txt
index c4c5a1875c3bfc..8afeea6cdeeb13 100644
--- a/eng/testing/scenarios/BuildWasmAppsJobsList.txt
+++ b/eng/testing/scenarios/BuildWasmAppsJobsList.txt
@@ -11,6 +11,7 @@ Wasm.Build.Tests.LocalEMSDKTests
 Wasm.Build.Tests.MainWithArgsTests
 Wasm.Build.Tests.NativeBuildTests
 Wasm.Build.Tests.NativeLibraryTests
+Wasm.Build.Tests.PInvokeTableGeneratorTests
 Wasm.Build.Tests.RebuildTests
 Wasm.Build.Tests.SatelliteAssembliesTests
 Wasm.Build.Tests.WasmBuildAppTest
diff --git a/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs b/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs
index 4aab6213eefa05..7264944fa5b571 100644
--- a/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs
+++ b/src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs
@@ -3,13 +3,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Text.Json;
 using System.Reflection;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
@@ -121,52 +118,42 @@ private void EmitPInvokeTable(StreamWriter w, Dictionary<string, string> modules
         w.WriteLine("// GENERATED FILE, DO NOT MODIFY");
         w.WriteLine();
 
-        var decls = new HashSet<string>();
-        foreach (var group in pinvokes.GroupBy(l => l.EntryPoint))
-        {
-            bool treatAsVariadic = false;
-            PInvoke first = group.First();
+        var pinvokesGroupedByEntryPoint = pinvokes.Where(l => modules.ContainsKey(l.Module))
+                             .OrderBy(l => l.EntryPoint)
+                             .GroupBy(l => l.EntryPoint);
 
-            if (!ShouldApplyHackForMethodWithFunctionPointers(first.Method))
+        var comparer = new PInvokeComparer();
+        foreach (IGrouping<string, PInvoke> group in pinvokesGroupedByEntryPoint)
+        {
+            var candidates = group.Distinct(comparer).ToArray();
+            PInvoke first = candidates[0];
+            if (ShouldTreatAsVariadic(candidates))
             {
-                if (HasFunctionPointerParams(first.Method))
-                {
-                    Log.LogWarning($"DllImports with function pointers are not supported. Calling them will fail. Managed DllImports: {Environment.NewLine}{GroupToString(group)}");
-                    foreach (var pinvoke in group)
-                        pinvoke.Skip = true;
+                Log.LogWarning($"Found a native function ({first.EntryPoint}) with varargs, which is not supported. Calling it will fail at runtime. Module: {first.Module}." +
+                                $" Managed DllImports: {Environment.NewLine}{CandidatesToString(candidates)}");
 
-                    continue;
-                }
-
-                int numArgs = first.Method.GetParameters().Length;
-                treatAsVariadic = group.Count() > 1 && group.Any(p => p.Method.GetParameters().Length != numArgs);
-                if (treatAsVariadic)
+                string? decl = GenPInvokeDecl(first, treatAsVariadic: true);
+                if (decl != null)
                 {
                     w.WriteLine($"// Variadic signature created for");
-                    foreach (PInvoke pinvoke in group)
+                    foreach (PInvoke pinvoke in candidates)
                         w.WriteLine($"//   {pinvoke.Method}");
 
-                    Log.LogWarning($"Found a native function ({first.EntryPoint}) with varargs, which is not supported. Calling it will fail at runtime. Module: {first.Module}." +
-                                    $" Managed DllImports: {Environment.NewLine}{GroupToString(group)}");
+                    w.WriteLine(decl);
                 }
+
+                continue;
             }
 
-            if (modules.ContainsKey(first.Module)) {
-                try
-                {
-                    var decl = GenPInvokeDecl(first, treatAsVariadic);
-                    if (decls.Contains(decl))
-                        continue;
+            var decls = new HashSet<string>();
+            foreach (var candidate in candidates)
+            {
+                var decl = GenPInvokeDecl(candidate, treatAsVariadic: false);
+                if (decl == null || decls.Contains(decl))
+                    continue;
 
-                    w.WriteLine(decl);
-                    decls.Add(decl);
-                }
-                catch (NotSupportedException)
-                {
-                    // See the FIXME in GenPInvokeDecl
-                    Log.LogWarning($"Cannot handle function pointer arguments/return value in pinvoke method '{first.Method}' in type '{first.Method.DeclaringType}'.");
-                    first.Skip = true;
-                }
+                w.WriteLine(decl);
+                decls.Add(decl);
             }
         }
 
@@ -214,26 +201,24 @@ static string ModuleNameToId(string name)
             return fixedName;
         }
 
-        static bool HasFunctionPointerParams(MethodInfo method)
+        static bool ShouldTreatAsVariadic(PInvoke[] candidates)
         {
-            try
-            {
-                method.GetParameters();
-            }
-            catch (NotSupportedException nse) when (nse.Message.Contains("function pointer types in signatures is not supported"))
-            {
-                return true;
-            }
-            catch
-            {
-                // not concerned with other exceptions
-            }
-
-            return false;
+            if (candidates.Length < 2)
+                return false;
+
+            PInvoke first = candidates[0];
+            if (TryIsMethodGetParametersUnsupported(first.Method, out _))
+                return false;
+
+            int firstNumArgs = first.Method.GetParameters().Length;
+            return candidates
+                        .Skip(1)
+                        .Any(c => !TryIsMethodGetParametersUnsupported(c.Method, out _) &&
+                                    c.Method.GetParameters().Length != firstNumArgs);
         }
 
-        static string GroupToString(IGrouping<string, PInvoke> group)
-            => string.Join(Environment.NewLine, group.Select(p => $"   Type: {p.Method.DeclaringType}, Method: {p.Method}"));
+        static string CandidatesToString(IEnumerable<PInvoke> group)
+            => string.Join(Environment.NewLine, group);
     }
 
     private string MapType (Type t)
@@ -253,20 +238,46 @@ private string MapType (Type t)
             return "int";
     }
 
-    private static bool ShouldApplyHackForMethodWithFunctionPointers(MethodInfo method) => method.Name == "EnumCalendarInfo";
+    // FIXME: System.Reflection.MetadataLoadContext can't decode function pointer types
+    // https://github.com/dotnet/runtime/issues/43791
+    private static bool TryIsMethodGetParametersUnsupported(MethodInfo method, [NotNullWhen(true)] out string? reason)
+    {
+        try
+        {
+            method.GetParameters();
+        }
+        catch (NotSupportedException nse)
+        {
+            reason = nse.Message;
+            return true;
+        }
+        catch
+        {
+            // not concerned with other exceptions
+        }
+
+        reason = null;
+        return false;
+    }
 
-    private string GenPInvokeDecl(PInvoke pinvoke, bool treatAsVariadic=false)
+    private string? GenPInvokeDecl(PInvoke pinvoke, bool treatAsVariadic)
     {
         var sb = new StringBuilder();
         var method = pinvoke.Method;
-        if (ShouldApplyHackForMethodWithFunctionPointers(method))
-        {
+        if (method.Name == "EnumCalendarInfo") {
             // FIXME: System.Reflection.MetadataLoadContext can't decode function pointer types
             // https://github.com/dotnet/runtime/issues/43791
             sb.Append($"int {pinvoke.EntryPoint} (int, int, int, int, int);");
             return sb.ToString();
         }
 
+        if (TryIsMethodGetParametersUnsupported(pinvoke.Method, out string? reason))
+        {
+            Log.LogWarning($"Skipping the following DllImport because '{reason}'. {Environment.NewLine}  {pinvoke.Method}");
+            pinvoke.Skip = true;
+            return null;
+        }
+
         sb.Append(MapType(method.ReturnType));
         sb.Append($" {pinvoke.EntryPoint} (");
         if (!treatAsVariadic)
@@ -428,7 +439,7 @@ private static bool IsBlittable (Type type)
     private static void Error (string msg) => throw new LogAsErrorException(msg);
 }
 
-internal class PInvoke
+internal class PInvoke : IEquatable<PInvoke>
 {
     public PInvoke(string entryPoint, string module, MethodInfo method)
     {
@@ -441,6 +452,30 @@ public PInvoke(string entryPoint, string module, MethodInfo method)
     public string Module;
     public MethodInfo Method;
     public bool Skip;
+
+    public bool Equals(PInvoke? other)
+        => other != null &&
+            string.Equals(EntryPoint, other.EntryPoint, StringComparison.Ordinal) &&
+            string.Equals(Module, other.Module, StringComparison.Ordinal) &&
+            string.Equals(Method.ToString(), other.Method.ToString(), StringComparison.Ordinal);
+
+    public override string ToString() => $"{{ EntryPoint: {EntryPoint}, Module: {Module}, Method: {Method}, Skip: {Skip} }}";
+}
+
+internal class PInvokeComparer : IEqualityComparer<PInvoke>
+{
+    public bool Equals(PInvoke? x, PInvoke? y)
+    {
+        if (x == null && y == null)
+            return true;
+        if (x == null || y == null)
+            return false;
+
+        return x.Equals(y);
+    }
+
+    public int GetHashCode(PInvoke pinvoke)
+        => $"{pinvoke.EntryPoint}{pinvoke.Module}{pinvoke.Method}".GetHashCode();
 }
 
 internal class PInvokeCallback
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs
index c06759ee2aa257..eb306286ba5e0d 100644
--- a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeLibraryTests.cs
@@ -92,93 +92,5 @@ public static int Main()
 
             Assert.Contains("Size: 26462 Height: 599, Width: 499", output);
         }
-
-        [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
-        [BuildAndRun(host: RunHost.V8)]
-        public void NativeLibraryWithVariadicFunctions(BuildArgs buildArgs, RunHost host, string id)
-        {
-            string projectName = $"variadic_{id}";
-            string code = @"
-using System;
-using System.Runtime.InteropServices;
-public class Test
-{
-    public static int Main(string[] args)
-    {
-        Console.WriteLine($""Main running"");
-        if (args.Length > 0)
-        {
-            // We don't want to run this, because we can't call variadic functions
-            Console.WriteLine($""sum_three: {sum_three(7, 14, 21)}"");
-            Console.WriteLine($""sum_two: {sum_two(3, 6)}"");
-            Console.WriteLine($""sum_one: {sum_one(5)}"");
-        }
-        return 42;
-    }
-
-    [DllImport(""variadic"", EntryPoint=""sum"")] public static extern int sum_one(int a);
-    [DllImport(""variadic"", EntryPoint=""sum"")] public static extern int sum_two(int a, int b);
-    [DllImport(""variadic"", EntryPoint=""sum"")] public static extern int sum_three(int a, int b, int c);
-}";
-            string filename = "variadic.o";
-            buildArgs = buildArgs with { ProjectName = projectName };
-            buildArgs = ExpandBuildArgs(buildArgs, extraItems: $"<NativeFileReference Include=\"{filename}\" />");
-
-            BuildProject(buildArgs,
-                        initProject: () =>
-                        {
-                            File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), code);
-                            File.Copy(Path.Combine(BuildEnvironment.TestAssetsPath, "native-libs", filename),
-                                        Path.Combine(_projectDir!, filename));
-                        },
-                        publish: false,
-                        id: id,
-                        dotnetWasmFromRuntimePack: false);
-
-            string output = RunAndTestWasmApp(buildArgs, buildDir: _projectDir, expectedExitCode: 42, host: host, id: id);
-            Assert.Contains("Main running", output);
-        }
-
-        [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
-        [BuildAndRun(host: RunHost.V8)]
-        public void DllImportWithFunctionPointersCompilesWithWarning(BuildArgs buildArgs, RunHost host, string id)
-        {
-            string projectName = $"variadic_{id}";
-            string code = @"
-using System;
-using System.Runtime.InteropServices;
-public class Test
-{
-    public static int Main()
-    {
-        Console.WriteLine($""Main running"");
-        return 42;
-    }
-
-    [DllImport(""variadic"", EntryPoint=""sum"")] public unsafe static extern int using_sum_one(delegate* unmanaged<char*, IntPtr, void> callback);
-}";
-            string filename = "variadic.o";
-            buildArgs = buildArgs with { ProjectName = projectName };
-            buildArgs = ExpandBuildArgs(buildArgs, extraItems: $"<NativeFileReference Include=\"{filename}\" />", extraProperties: "<AllowUnsafeBlocks>true</AllowUnsafeBlocks>");
-
-            Console.WriteLine ($"-- args: {buildArgs}, name: {projectName}");
-
-            (_, string output) = BuildProject(buildArgs,
-                                        initProject: () =>
-                                        {
-                                            File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), code);
-                                            File.Copy(Path.Combine(BuildEnvironment.TestAssetsPath, "native-libs", filename),
-                                                        Path.Combine(_projectDir!, filename));
-                                        },
-                                        publish: false,
-                                        id: id,
-                                        dotnetWasmFromRuntimePack: false);
-
-            Assert.Matches("warning.*function pointers", output);
-            Assert.Matches("warning.*using_sum_one", output);
-
-            output = RunAndTestWasmApp(buildArgs, buildDir: _projectDir, expectedExitCode: 42, host: host, id: id);
-            Assert.Contains("Main running", output);
-        }
     }
 }
diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs
new file mode 100644
index 00000000000000..27783ae85c95ad
--- /dev/null
+++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs
@@ -0,0 +1,139 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.IO;
+using Xunit;
+using Xunit.Abstractions;
+
+#nullable enable
+
+namespace Wasm.Build.Tests
+{
+    public class PInvokeTableGeneratorTests : BuildTestBase
+    {
+        public PInvokeTableGeneratorTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext)
+            : base(output, buildContext)
+        {
+        }
+
+        [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
+        [BuildAndRun(host: RunHost.V8)]
+        public void NativeLibraryWithVariadicFunctions(BuildArgs buildArgs, RunHost host, string id)
+        {
+            string code = @"
+                using System;
+                using System.Runtime.InteropServices;
+                public class Test
+                {
+                    public static int Main(string[] args)
+                    {
+                        Console.WriteLine($""Main running"");
+                        if (args.Length > 0)
+                        {
+                            // We don't want to run this, because we can't call variadic functions
+                            Console.WriteLine($""sum_three: {sum_three(7, 14, 21)}"");
+                            Console.WriteLine($""sum_two: {sum_two(3, 6)}"");
+                            Console.WriteLine($""sum_one: {sum_one(5)}"");
+                        }
+                        return 42;
+                    }
+
+                    [DllImport(""variadic"", EntryPoint=""sum"")] public static extern int sum_one(int a);
+                    [DllImport(""variadic"", EntryPoint=""sum"")] public static extern int sum_two(int a, int b);
+                    [DllImport(""variadic"", EntryPoint=""sum"")] public static extern int sum_three(int a, int b, int c);
+                }";
+
+            (buildArgs, string output) = BuildForVariadicFunctionTests(code,
+                                                          buildArgs with { ProjectName = $"variadic_{buildArgs.Config}_{id}" },
+                                                          id);
+            Assert.Matches("warning.*native function.*sum.*varargs", output);
+            Assert.Matches("warning.*sum_(one|two|three)", output);
+
+            output = RunAndTestWasmApp(buildArgs, buildDir: _projectDir, expectedExitCode: 42, host: host, id: id);
+            Assert.Contains("Main running", output);
+        }
+
+        [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
+        [BuildAndRun(host: RunHost.V8)]
+        public void DllImportWithFunctionPointersCompilesWithWarning(BuildArgs buildArgs, RunHost host, string id)
+        {
+            string code = @"
+                using System;
+                using System.Runtime.InteropServices;
+                public class Test
+                {
+                    public static int Main()
+                    {
+                        Console.WriteLine($""Main running"");
+                        return 42;
+                    }
+
+                    [DllImport(""variadic"", EntryPoint=""sum"")]
+                    public unsafe static extern int using_sum_one(delegate* unmanaged<char*, IntPtr, void> callback);
+
+                    [DllImport(""variadic"", EntryPoint=""sum"")]
+                    public static extern int sum_one(int a, int b);
+                }";
+
+            (buildArgs, string output) = BuildForVariadicFunctionTests(code,
+                                                          buildArgs with { ProjectName = $"fnptr_{buildArgs.Config}_{id}" },
+                                                          id);
+            Assert.Matches("warning.*Skipping.*because.*function pointer", output);
+            Assert.Matches("warning.*using_sum_one", output);
+
+            output = RunAndTestWasmApp(buildArgs, buildDir: _projectDir, expectedExitCode: 42, host: host, id: id);
+            Assert.Contains("Main running", output);
+        }
+
+        [ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
+        [BuildAndRun(host: RunHost.V8)]
+        public void DllImportWithFunctionPointers_ForVariadicFunction_CompilesWithWarning(BuildArgs buildArgs, RunHost host, string id)
+        {
+            string code = @"
+                using System;
+                using System.Runtime.InteropServices;
+                public class Test
+                {
+                    public static int Main()
+                    {
+                        Console.WriteLine($""Main running"");
+                        return 42;
+                    }
+
+                    [DllImport(""variadic"", EntryPoint=""sum"")]
+                    public unsafe static extern int using_sum_one(delegate* unmanaged<char*, IntPtr, void> callback);
+                }";
+
+            (buildArgs, string output) = BuildForVariadicFunctionTests(code,
+                                                          buildArgs with { ProjectName = $"fnptr_variadic_{buildArgs.Config}_{id}" },
+                                                          id);
+            Assert.Matches("warning.*Skipping.*because.*function pointer", output);
+            Assert.Matches("warning.*using_sum_one", output);
+
+            output = RunAndTestWasmApp(buildArgs, buildDir: _projectDir, expectedExitCode: 42, host: host, id: id);
+            Assert.Contains("Main running", output);
+        }
+
+        private (BuildArgs, string) BuildForVariadicFunctionTests(string programText, BuildArgs buildArgs, string id)
+        {
+            string filename = "variadic.o";
+            buildArgs = ExpandBuildArgs(buildArgs,
+                                        extraItems: $"<NativeFileReference Include=\"{filename}\" />",
+                                        extraProperties: "<AllowUnsafeBlocks>true</AllowUnsafeBlocks><_WasmDevel>true</_WasmDevel>");
+
+            (_, string output) = BuildProject(buildArgs,
+                                        initProject: () =>
+                                        {
+                                            File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), programText);
+                                            File.Copy(Path.Combine(BuildEnvironment.TestAssetsPath, "native-libs", filename),
+                                                        Path.Combine(_projectDir!, filename));
+                                        },
+                                        publish: buildArgs.AOT,
+                                        id: id,
+                                        dotnetWasmFromRuntimePack: false);
+
+            return (buildArgs, output);
+        }
+    }
+}

From 8d874043d0ab0bcb7c338b91b6e9576b4457e803 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Sat, 25 Sep 2021 01:03:48 -0400
Subject: [PATCH 12/14] add missing variadic.{c,o}

---
 .../testassets/native-libs/variadic.c             |  14 ++++++++++++++
 .../testassets/native-libs/variadic.o             | Bin 0 -> 549 bytes
 2 files changed, 14 insertions(+)
 create mode 100644 src/tests/BuildWasmApps/testassets/native-libs/variadic.c
 create mode 100644 src/tests/BuildWasmApps/testassets/native-libs/variadic.o

diff --git a/src/tests/BuildWasmApps/testassets/native-libs/variadic.c b/src/tests/BuildWasmApps/testassets/native-libs/variadic.c
new file mode 100644
index 00000000000000..cd4009439d19da
--- /dev/null
+++ b/src/tests/BuildWasmApps/testassets/native-libs/variadic.c
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+
+int sum(int n, ...)
+{
+    int result = 0;
+    va_list ptr;
+    va_start(ptr, n);
+
+    for (int i = 0; i < n; i++)
+        result += va_arg(ptr, int);
+
+    va_end(ptr);
+    return result;
+}
diff --git a/src/tests/BuildWasmApps/testassets/native-libs/variadic.o b/src/tests/BuildWasmApps/testassets/native-libs/variadic.o
new file mode 100644
index 0000000000000000000000000000000000000000..b4558ce351979341e3109ac1861ae44fea2c41b6
GIT binary patch
literal 549
zcmXYu%Wm306ozNUCI)N*<erelIm#woU~>@;*#)(cy6YoQGaiABFVu##SwXvLrEa?J
z8+6sDs?^8m8B%F9^Pm5m`OaKeP^O$Q#=q`%JI3FO?UrxFZyg9jWlzoNG>I}56w_3t
zdGRb5`)`-)KrW}NJj&LpFt*(IvL~?m-_M%#hx5+%hO8Y!F=?Rz0*ob^U;^`nGhtXE
zS@A`6V&VbGgBUHaunJY+zF<^PBezCUJQxpP-U^0wy*Ow?9UZW-0S+|Y;^Bm26Aq#I
z0b9^|Y;av=Vw=E6(1xQJkBM~b3lrL!a-#E9JcUy@iSdkbXLO904(G(WfOEKr@sbjk
z)ZSsXO{gmhuVU;#hm_ub4cASZ{nR(K=#7?9HW$_JIuy)gM!88vi?JWts23{9rThBb
zn@59N7H7Zo8`V}t9&V&6O74)9sw`F5ojvo4OoD9wjrWIc&+Wmjm#@}d>3#H~!jpkq
zC~qFEJ-I0IG}@%@JkRHeD)UVtl`HeKt3J_}WI@uUvc+b$_mbo(?e3>8^@^2T!)QDj
jjK+h}a4;Jx8o@XWM*X0#26uyS9QOKmvvBCk`&a(}ARK*H

literal 0
HcmV?d00001


From c2174f321bb7d65f602b365d4f3a2baf46c3709c Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Sat, 25 Sep 2021 01:08:42 -0400
Subject: [PATCH 13/14] disable unrelated builds

---
 eng/pipelines/common/platform-matrix.yml | 635 -----------------------
 1 file changed, 635 deletions(-)

diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
index 15fe948e92967e..6dab0ab529fe2a 100644
--- a/eng/pipelines/common/platform-matrix.yml
+++ b/eng/pipelines/common/platform-matrix.yml
@@ -26,185 +26,6 @@ parameters:
 
 jobs:
 
-# Linux arm
-- ${{ if or(containsValue(parameters.platforms, 'Linux_arm'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: Linux
-      archType: arm
-      targetRid: linux-arm
-      platform: Linux_arm
-      container:
-        image: ubuntu-16.04-cross-20210719121212-8a8d3be
-        registry: mcr
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        crossBuild: true
-        crossrootfsDir: '/crossrootfs/arm'
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux arm64
-
-- ${{ if or(containsValue(parameters.platforms, 'Linux_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: Linux
-      archType: arm64
-      targetRid: linux-arm64
-      platform: Linux_arm64
-      container:
-        image: ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
-        registry: mcr
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        crossBuild: true
-        crossrootfsDir: '/crossrootfs/arm64'
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux musl x64
-
-- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_x64'), eq(parameters.platformGroup, 'all')) }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: Linux
-      osSubgroup: _musl
-      archType: x64
-      targetRid: linux-musl-x64
-      platform: Linux_musl_x64
-      container:
-        image: alpine-3.9-WithNode-20210714125437-9b5bbc2
-        registry: mcr
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux musl arm
-
-- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_arm'), eq(parameters.platformGroup, 'all')) }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: Linux
-      osSubgroup: _musl
-      archType: arm
-      targetRid: linux-musl-arm
-      platform: Linux_musl_arm
-      container:
-        image: ubuntu-16.04-cross-arm-alpine-20210719121212-044d5b9
-        registry: mcr
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        crossBuild: true
-        crossrootfsDir: '/crossrootfs/arm'
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux musl arm64
-
-- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_arm64'), eq(parameters.platformGroup, 'all')) }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: Linux
-      osSubgroup: _musl
-      archType: arm64
-      targetRid: linux-musl-arm64
-      platform: Linux_musl_arm64
-      container:
-        image: ubuntu-16.04-cross-arm64-alpine-20210719121212-b2c2436
-        registry: mcr
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        crossBuild: true
-        crossrootfsDir: '/crossrootfs/arm64'
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux x64
-
-- ${{ if or(containsValue(parameters.platforms, 'Linux_x64'), containsValue(parameters.platforms, 'CoreClrTestBuildHost'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: Linux
-      archType: x64
-      targetRid: linux-x64
-      platform: Linux_x64
-      container:
-        image: centos-7-20210714125435-9b5bbc2
-        registry: mcr
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Linux x64 Source Build
-
-- ${{ if containsValue(parameters.platforms, 'SourceBuild_Linux_x64') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: Linux
-      archType: x64
-      targetRid: linux-x64
-      platform: Linux_x64
-      container:
-        image: centos-7-source-build-20210714125450-5d87b80
-        registry: mcr
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-        buildingOnSourceBuildImage: true
-
 # WebAssembly
 
 - ${{ if containsValue(parameters.platforms, 'Browser_wasm') }}:
@@ -250,459 +71,3 @@ jobs:
           platforms: ${{ parameters.platforms }}
         ${{ insert }}: ${{ parameters.jobParameters }}
 
-# FreeBSD
-- ${{ if containsValue(parameters.platforms, 'FreeBSD_x64') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: FreeBSD
-      archType: x64
-      targetRid: freebsd-x64
-      platform: FreeBSD_x64
-      container:
-        image: ubuntu-18.04-cross-freebsd-11-20200407092345-a84b0d2
-        registry: mcr
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        buildConfig: ${{ parameters.buildConfig }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        crossBuild: true
-        crossrootfsDir: '/crossrootfs/x64'
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Android x64
-
-- ${{ if containsValue(parameters.platforms, 'Android_x64') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: Android
-      archType: x64
-      targetRid: android-x64
-      platform: Android_x64
-      container:
-        image: ubuntu-18.04-android-20200422191843-e2c3f83
-        registry: mcr
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Android x86
-
-- ${{ if containsValue(parameters.platforms, 'Android_x86') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: Android
-      archType: x86
-      targetRid: android-x86
-      platform: Android_x86
-      container:
-        image: ubuntu-18.04-android-20200422191843-e2c3f83
-        registry: mcr
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Android arm
-
-- ${{ if containsValue(parameters.platforms, 'Android_arm') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: Android
-      archType: arm
-      targetRid: android-arm
-      platform: Android_arm
-      container:
-        image: ubuntu-18.04-android-20200422191843-e2c3f83
-        registry: mcr
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Android arm64
-
-- ${{ if containsValue(parameters.platforms, 'Android_arm64') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: Android
-      archType: arm64
-      targetRid: android-arm64
-      platform: Android_arm64
-      container:
-        image: ubuntu-18.04-android-20200422191843-e2c3f83
-        registry: mcr
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Mac Catalyst x64
-
-- ${{ if containsValue(parameters.platforms, 'MacCatalyst_x64') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: MacCatalyst
-      archType: x64
-      targetRid: maccatalyst-x64
-      platform: MacCatalyst_x64
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Mac Catalyst arm64
-
-- ${{ if containsValue(parameters.platforms, 'MacCatalyst_arm64') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: MacCatalyst
-      archType: arm64
-      targetRid: maccatalyst-arm64
-      platform: MacCatalyst_arm64
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# tvOS arm64
-
-- ${{ if containsValue(parameters.platforms, 'tvOS_arm64') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: tvOS
-      archType: arm64
-      targetRid: tvos-arm64
-      platform: tvOS_arm64
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# tvOS Simulator x64
-
-- ${{ if containsValue(parameters.platforms, 'tvOSSimulator_x64') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: tvOSSimulator
-      archType: x64
-      targetRid: tvossimulator-x64
-      platform: tvOSSimulator_x64
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# tvOS Simulator arm64
-
-- ${{ if containsValue(parameters.platforms, 'tvOSSimulator_arm64') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: tvOSSimulator
-      archType: arm64
-      targetRid: tvossimulator-arm64
-      platform: tvOSSimulator_arm64
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# iOS arm
-
-- ${{ if containsValue(parameters.platforms, 'iOS_arm') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: iOS
-      archType: arm
-      targetRid: ios-arm
-      platform: iOS_arm
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# iOS arm64
-
-- ${{ if containsValue(parameters.platforms, 'iOS_arm64') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: iOS
-      archType: arm64
-      targetRid: ios-arm64
-      platform: iOS_arm64
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# iOS Simulator x64
-
-- ${{ if containsValue(parameters.platforms, 'iOSSimulator_x64') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: iOSSimulator
-      archType: x64
-      targetRid: iossimulator-x64
-      platform: iOSSimulator_x64
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# iOS Simulator x86
-
-- ${{ if containsValue(parameters.platforms, 'iOSSimulator_x86') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: iOSSimulator
-      archType: x86
-      targetRid: iossimulator-x86
-      platform: iOSsimulator_x86
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        managedTestBuildOsGroup: OSX
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# iOS Simulator arm64
-
-- ${{ if containsValue(parameters.platforms, 'iOSSimulator_arm64') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: iOSSimulator
-      archType: arm64
-      targetRid: iossimulator-arm64
-      platform: iOSSimulator_arm64
-      jobParameters:
-        runtimeFlavor: mono
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# macOS arm64
-
-- ${{ if containsValue(parameters.platforms, 'OSX_arm64') }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: OSX
-      archType: arm64
-      targetRid: osx-arm64
-      platform: OSX_arm64
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        crossBuild: true
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# macOS x64
-
-- ${{ if or(containsValue(parameters.platforms, 'OSX_x64'), eq(parameters.platformGroup, 'all')) }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: OSX
-      archType: x64
-      targetRid: osx-x64
-      platform: OSX_x64
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Windows x64
-
-- ${{ if or(containsValue(parameters.platforms, 'windows_x64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: windows
-      archType: x64
-      targetRid: win-x64
-      platform: windows_x64
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Windows x86
-
-- ${{ if or(containsValue(parameters.platforms, 'windows_x86'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: windows
-      archType: x86
-      targetRid: win-x86
-      platform: windows_x86
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Windows arm
-- ${{ if or(containsValue(parameters.platforms, 'windows_arm'), eq(parameters.platformGroup, 'all')) }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: windows
-      archType: arm
-      targetRid: win-arm
-      platform: windows_arm
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}
-
-# Windows arm64
-
-- ${{ if or(containsValue(parameters.platforms, 'windows_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
-  - template: xplat-setup.yml
-    parameters:
-      jobTemplate: ${{ parameters.jobTemplate }}
-      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
-      variables: ${{ parameters.variables }}
-      osGroup: windows
-      archType: arm64
-      targetRid: win-arm64
-      platform: windows_arm64
-      jobParameters:
-        runtimeFlavor: ${{ parameters.runtimeFlavor }}
-        stagedBuild: ${{ parameters.stagedBuild }}
-        buildConfig: ${{ parameters.buildConfig }}
-        ${{ if eq(parameters.passPlatforms, true) }}:
-          platforms: ${{ parameters.platforms }}
-        helixQueueGroup: ${{ parameters.helixQueueGroup }}
-        ${{ insert }}: ${{ parameters.jobParameters }}

From 5413e5460a54350a8fe05695f894a9d1158bb5f8 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Sat, 25 Sep 2021 18:59:57 -0400
Subject: [PATCH 14/14] Revert "disable unrelated builds"

This reverts commit c2174f321bb7d65f602b365d4f3a2baf46c3709c.
---
 eng/pipelines/common/platform-matrix.yml | 635 +++++++++++++++++++++++
 1 file changed, 635 insertions(+)

diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
index 6dab0ab529fe2a..15fe948e92967e 100644
--- a/eng/pipelines/common/platform-matrix.yml
+++ b/eng/pipelines/common/platform-matrix.yml
@@ -26,6 +26,185 @@ parameters:
 
 jobs:
 
+# Linux arm
+- ${{ if or(containsValue(parameters.platforms, 'Linux_arm'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Linux
+      archType: arm
+      targetRid: linux-arm
+      platform: Linux_arm
+      container:
+        image: ubuntu-16.04-cross-20210719121212-8a8d3be
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        crossBuild: true
+        crossrootfsDir: '/crossrootfs/arm'
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Linux arm64
+
+- ${{ if or(containsValue(parameters.platforms, 'Linux_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Linux
+      archType: arm64
+      targetRid: linux-arm64
+      platform: Linux_arm64
+      container:
+        image: ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        crossBuild: true
+        crossrootfsDir: '/crossrootfs/arm64'
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Linux musl x64
+
+- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_x64'), eq(parameters.platformGroup, 'all')) }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Linux
+      osSubgroup: _musl
+      archType: x64
+      targetRid: linux-musl-x64
+      platform: Linux_musl_x64
+      container:
+        image: alpine-3.9-WithNode-20210714125437-9b5bbc2
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Linux musl arm
+
+- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_arm'), eq(parameters.platformGroup, 'all')) }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Linux
+      osSubgroup: _musl
+      archType: arm
+      targetRid: linux-musl-arm
+      platform: Linux_musl_arm
+      container:
+        image: ubuntu-16.04-cross-arm-alpine-20210719121212-044d5b9
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        crossBuild: true
+        crossrootfsDir: '/crossrootfs/arm'
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Linux musl arm64
+
+- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_arm64'), eq(parameters.platformGroup, 'all')) }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Linux
+      osSubgroup: _musl
+      archType: arm64
+      targetRid: linux-musl-arm64
+      platform: Linux_musl_arm64
+      container:
+        image: ubuntu-16.04-cross-arm64-alpine-20210719121212-b2c2436
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        crossBuild: true
+        crossrootfsDir: '/crossrootfs/arm64'
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Linux x64
+
+- ${{ if or(containsValue(parameters.platforms, 'Linux_x64'), containsValue(parameters.platforms, 'CoreClrTestBuildHost'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Linux
+      archType: x64
+      targetRid: linux-x64
+      platform: Linux_x64
+      container:
+        image: centos-7-20210714125435-9b5bbc2
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Linux x64 Source Build
+
+- ${{ if containsValue(parameters.platforms, 'SourceBuild_Linux_x64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Linux
+      archType: x64
+      targetRid: linux-x64
+      platform: Linux_x64
+      container:
+        image: centos-7-source-build-20210714125450-5d87b80
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+        buildingOnSourceBuildImage: true
+
 # WebAssembly
 
 - ${{ if containsValue(parameters.platforms, 'Browser_wasm') }}:
@@ -71,3 +250,459 @@ jobs:
           platforms: ${{ parameters.platforms }}
         ${{ insert }}: ${{ parameters.jobParameters }}
 
+# FreeBSD
+- ${{ if containsValue(parameters.platforms, 'FreeBSD_x64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: FreeBSD
+      archType: x64
+      targetRid: freebsd-x64
+      platform: FreeBSD_x64
+      container:
+        image: ubuntu-18.04-cross-freebsd-11-20200407092345-a84b0d2
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        buildConfig: ${{ parameters.buildConfig }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        crossBuild: true
+        crossrootfsDir: '/crossrootfs/x64'
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Android x64
+
+- ${{ if containsValue(parameters.platforms, 'Android_x64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Android
+      archType: x64
+      targetRid: android-x64
+      platform: Android_x64
+      container:
+        image: ubuntu-18.04-android-20200422191843-e2c3f83
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Android x86
+
+- ${{ if containsValue(parameters.platforms, 'Android_x86') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Android
+      archType: x86
+      targetRid: android-x86
+      platform: Android_x86
+      container:
+        image: ubuntu-18.04-android-20200422191843-e2c3f83
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Android arm
+
+- ${{ if containsValue(parameters.platforms, 'Android_arm') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Android
+      archType: arm
+      targetRid: android-arm
+      platform: Android_arm
+      container:
+        image: ubuntu-18.04-android-20200422191843-e2c3f83
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Android arm64
+
+- ${{ if containsValue(parameters.platforms, 'Android_arm64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: Android
+      archType: arm64
+      targetRid: android-arm64
+      platform: Android_arm64
+      container:
+        image: ubuntu-18.04-android-20200422191843-e2c3f83
+        registry: mcr
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Mac Catalyst x64
+
+- ${{ if containsValue(parameters.platforms, 'MacCatalyst_x64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: MacCatalyst
+      archType: x64
+      targetRid: maccatalyst-x64
+      platform: MacCatalyst_x64
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Mac Catalyst arm64
+
+- ${{ if containsValue(parameters.platforms, 'MacCatalyst_arm64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: MacCatalyst
+      archType: arm64
+      targetRid: maccatalyst-arm64
+      platform: MacCatalyst_arm64
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# tvOS arm64
+
+- ${{ if containsValue(parameters.platforms, 'tvOS_arm64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: tvOS
+      archType: arm64
+      targetRid: tvos-arm64
+      platform: tvOS_arm64
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# tvOS Simulator x64
+
+- ${{ if containsValue(parameters.platforms, 'tvOSSimulator_x64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: tvOSSimulator
+      archType: x64
+      targetRid: tvossimulator-x64
+      platform: tvOSSimulator_x64
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# tvOS Simulator arm64
+
+- ${{ if containsValue(parameters.platforms, 'tvOSSimulator_arm64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: tvOSSimulator
+      archType: arm64
+      targetRid: tvossimulator-arm64
+      platform: tvOSSimulator_arm64
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# iOS arm
+
+- ${{ if containsValue(parameters.platforms, 'iOS_arm') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: iOS
+      archType: arm
+      targetRid: ios-arm
+      platform: iOS_arm
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# iOS arm64
+
+- ${{ if containsValue(parameters.platforms, 'iOS_arm64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: iOS
+      archType: arm64
+      targetRid: ios-arm64
+      platform: iOS_arm64
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# iOS Simulator x64
+
+- ${{ if containsValue(parameters.platforms, 'iOSSimulator_x64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: iOSSimulator
+      archType: x64
+      targetRid: iossimulator-x64
+      platform: iOSSimulator_x64
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# iOS Simulator x86
+
+- ${{ if containsValue(parameters.platforms, 'iOSSimulator_x86') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: iOSSimulator
+      archType: x86
+      targetRid: iossimulator-x86
+      platform: iOSsimulator_x86
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        managedTestBuildOsGroup: OSX
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# iOS Simulator arm64
+
+- ${{ if containsValue(parameters.platforms, 'iOSSimulator_arm64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: iOSSimulator
+      archType: arm64
+      targetRid: iossimulator-arm64
+      platform: iOSSimulator_arm64
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# macOS arm64
+
+- ${{ if containsValue(parameters.platforms, 'OSX_arm64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: OSX
+      archType: arm64
+      targetRid: osx-arm64
+      platform: OSX_arm64
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        crossBuild: true
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# macOS x64
+
+- ${{ if or(containsValue(parameters.platforms, 'OSX_x64'), eq(parameters.platformGroup, 'all')) }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: OSX
+      archType: x64
+      targetRid: osx-x64
+      platform: OSX_x64
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Windows x64
+
+- ${{ if or(containsValue(parameters.platforms, 'windows_x64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: windows
+      archType: x64
+      targetRid: win-x64
+      platform: windows_x64
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Windows x86
+
+- ${{ if or(containsValue(parameters.platforms, 'windows_x86'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: windows
+      archType: x86
+      targetRid: win-x86
+      platform: windows_x86
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Windows arm
+- ${{ if or(containsValue(parameters.platforms, 'windows_arm'), eq(parameters.platformGroup, 'all')) }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: windows
+      archType: arm
+      targetRid: win-arm
+      platform: windows_arm
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Windows arm64
+
+- ${{ if or(containsValue(parameters.platforms, 'windows_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      variables: ${{ parameters.variables }}
+      osGroup: windows
+      archType: arm64
+      targetRid: win-arm64
+      platform: windows_arm64
+      jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        ${{ insert }}: ${{ parameters.jobParameters }}