dotnet · lewing · Apr 21, 2023 · Mar 29, 2023 · Mar 30, 2023 · Mar 30, 2023
diff --git a/src/Tasks/Common/Resources/Strings.resx b/src/Tasks/Common/Resources/Strings.resx
@@ -896,4 +896,8 @@ You may need to build the project on another operating system or architecture, o
     <value>NETSDK1198: A publish profile with the name '{0}' was not found in the project. Set the PublishProfile property to a valid file name.</value>
     <comment>{StrBegin="NETSDK1198: "}</comment>
   </data>
+  <data name="WebAssemblySdkNoValidRuntimePackageError" xml:space="preserve">
+    <value>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</value>
+    <comment>{StrBegin="NETSDK1199: "}</comment>
+  </data>
 </root>
diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf
@@ -942,6 +942,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1057: Používáte verzi Preview rozhraní .NET. Viz: https://aka.ms/dotnet-support-policy</target>
         <note />
       </trans-unit>
+      <trans-unit id="WebAssemblySdkNoValidRuntimePackageError">
+        <source>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</source>
+        <target state="new">NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</target>
+        <note>{StrBegin="NETSDK1199: "}</note>
+      </trans-unit>
       <trans-unit id="WinMDObjNotSupportedOnTargetFramework">
         <source>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</source>
         <target state="translated">NETSDK1131: Vytvoření spravované komponenty Metadata Windows s WinMDExp se při cílení na {0} nepodporuje.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf
@@ -942,6 +942,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="new">NETSDK1057: You are using a preview version of .NET. See: https://aka.ms/dotnet-support-policy</target>
         <note />
       </trans-unit>
+      <trans-unit id="WebAssemblySdkNoValidRuntimePackageError">
+        <source>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</source>
+        <target state="new">NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</target>
+        <note>{StrBegin="NETSDK1199: "}</note>
+      </trans-unit>
       <trans-unit id="WinMDObjNotSupportedOnTargetFramework">
         <source>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</source>
         <target state="new">NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf
@@ -942,6 +942,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1057: Está usando una versión preliminar de .NET. Visite: https://aka.ms/dotnet-support-policy</target>
         <note />
       </trans-unit>
+      <trans-unit id="WebAssemblySdkNoValidRuntimePackageError">
+        <source>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</source>
+        <target state="new">NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</target>
+        <note>{StrBegin="NETSDK1199: "}</note>
+      </trans-unit>
       <trans-unit id="WinMDObjNotSupportedOnTargetFramework">
         <source>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</source>
         <target state="translated">NETSDK1131: No se admite la generación de un componente administrado de metadatos de Windows con WinMDExp cuando el destino es {0}.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf
@@ -942,6 +942,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1057 : vous utilisez une version d'aperçu de .NET. Voir : https://aka.ms/dotnet-support-policy</target>
         <note />
       </trans-unit>
+      <trans-unit id="WebAssemblySdkNoValidRuntimePackageError">
+        <source>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</source>
+        <target state="new">NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</target>
+        <note>{StrBegin="NETSDK1199: "}</note>
+      </trans-unit>
       <trans-unit id="WinMDObjNotSupportedOnTargetFramework">
         <source>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</source>
         <target state="translated">NETSDK1131: la production d'un composant de métadonnées Windows managé avec WinMDExp n'est pas prise en charge pour le ciblage de {0}.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf
@@ -942,6 +942,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1057: si sta usando una versione in anteprima di .NET. Vedere https://aka.ms/dotnet-support-policy</target>
         <note />
       </trans-unit>
+      <trans-unit id="WebAssemblySdkNoValidRuntimePackageError">
+        <source>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</source>
+        <target state="new">NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</target>
+        <note>{StrBegin="NETSDK1199: "}</note>
+      </trans-unit>
       <trans-unit id="WinMDObjNotSupportedOnTargetFramework">
         <source>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</source>
         <target state="translated">NETSDK1131: la produzione di un componente Metadati Windows gestito con WinMDExp non è supportata quando la destinazione è {0}.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf
@@ -942,6 +942,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1057: プレビュー版の .NET を使用しています。https://aka.ms/dotnet-support-policy をご覧ください</target>
         <note />
       </trans-unit>
+      <trans-unit id="WebAssemblySdkNoValidRuntimePackageError">
+        <source>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</source>
+        <target state="new">NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</target>
+        <note>{StrBegin="NETSDK1199: "}</note>
+      </trans-unit>
       <trans-unit id="WinMDObjNotSupportedOnTargetFramework">
         <source>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</source>
         <target state="translated">NETSDK1131: {0} をターゲットにする場合、WinMDExp を使用したマネージド Windows メタデータ コンポーネント生成はサポートされていません。</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf
@@ -942,6 +942,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="new">NETSDK1057: You are using a preview version of .NET. See: https://aka.ms/dotnet-support-policy</target>
         <note />
       </trans-unit>
+      <trans-unit id="WebAssemblySdkNoValidRuntimePackageError">
+        <source>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</source>
+        <target state="new">NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</target>
+        <note>{StrBegin="NETSDK1199: "}</note>
+      </trans-unit>
       <trans-unit id="WinMDObjNotSupportedOnTargetFramework">
         <source>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</source>
         <target state="new">NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf
@@ -942,6 +942,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="new">NETSDK1057: You are using a preview version of .NET. See: https://aka.ms/dotnet-support-policy</target>
         <note />
       </trans-unit>
+      <trans-unit id="WebAssemblySdkNoValidRuntimePackageError">
+        <source>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</source>
+        <target state="new">NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</target>
+        <note>{StrBegin="NETSDK1199: "}</note>
+      </trans-unit>
       <trans-unit id="WinMDObjNotSupportedOnTargetFramework">
         <source>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</source>
         <target state="new">NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
@@ -942,6 +942,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1057: Você está usando uma versão de visualização do .NET. Veja: https://aka.ms/dotnet-support-policy</target>
         <note />
       </trans-unit>
+      <trans-unit id="WebAssemblySdkNoValidRuntimePackageError">
+        <source>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</source>
+        <target state="new">NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</target>
+        <note>{StrBegin="NETSDK1199: "}</note>
+      </trans-unit>
       <trans-unit id="WinMDObjNotSupportedOnTargetFramework">
         <source>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</source>
         <target state="translated">NETSDK1131: não há suporte para a produção de um componente de Metadados do Windows gerenciado com o WinMDExp ao direcionar ao {0}.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf
@@ -942,6 +942,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1057: Вы используете предварительную версию .NET. Дополнительные сведения см. на странице https://aka.ms/dotnet-support-policy</target>
         <note />
       </trans-unit>
+      <trans-unit id="WebAssemblySdkNoValidRuntimePackageError">
+        <source>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</source>
+        <target state="new">NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</target>
+        <note>{StrBegin="NETSDK1199: "}</note>
+      </trans-unit>
       <trans-unit id="WinMDObjNotSupportedOnTargetFramework">
         <source>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</source>
         <target state="translated">NETSDK1131: создание управляемого компонента метаданных Windows с WinMDExp не поддерживается при нацеливании на {0}.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf
@@ -942,6 +942,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1057: Bir .NET önizleme sürümü kullanıyorsunuz. Bkz. https://aka.ms/dotnet-support-policy</target>
         <note />
       </trans-unit>
+      <trans-unit id="WebAssemblySdkNoValidRuntimePackageError">
+        <source>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</source>
+        <target state="new">NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</target>
+        <note>{StrBegin="NETSDK1199: "}</note>
+      </trans-unit>
       <trans-unit id="WinMDObjNotSupportedOnTargetFramework">
         <source>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</source>
         <target state="translated">NETSDK1131: {0} hedeflenirken, WinMDExp ile yönetilen bir Windows Meta Veri bileşeninin üretilmesi desteklenmiyor.</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
@@ -942,6 +942,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1057: 你正在使用 .NET 的预览版。请参阅 https://aka.ms/dotnet-support-policy</target>
         <note />
       </trans-unit>
+      <trans-unit id="WebAssemblySdkNoValidRuntimePackageError">
+        <source>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</source>
+        <target state="new">NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</target>
+        <note>{StrBegin="NETSDK1199: "}</note>
+      </trans-unit>
       <trans-unit id="WinMDObjNotSupportedOnTargetFramework">
         <source>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</source>
         <target state="translated">NETSDK1131: 当目标为 {0} 时，不支持使用 WinMDExp 生成托管 Windows 元数据组件。</target>

diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
@@ -942,6 +942,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1057: 您目前使用的是 .NET 預覽版。請參閱: https://aka.ms/dotnet-support-policy</target>
         <note />
       </trans-unit>
+      <trans-unit id="WebAssemblySdkNoValidRuntimePackageError">
+        <source>NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</source>
+        <target state="new">NETSDK1199: Unable to build a WebAssembly application: a valid WebAssembly SDK package was not found.</target>
+        <note>{StrBegin="NETSDK1199: "}</note>
+      </trans-unit>
       <trans-unit id="WinMDObjNotSupportedOnTargetFramework">
         <source>NETSDK1131: Producing a managed Windows Metadata component with WinMDExp is not supported when targeting {0}.</source>
         <target state="translated">NETSDK1131: 當目標為 {0} 時，無法使用 WinMDExp 產生受控 Windows 中繼資料元件。</target>

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs
@@ -78,6 +78,10 @@ public class ProcessFrameworkReferences : TaskBase
 
         public ITaskItem[] KnownILLinkPacks { get; set; } = Array.Empty<ITaskItem>();
 
+        public ITaskItem[] KnownWebAssemblySdkPacks { get; set; } = Array.Empty<ITaskItem>();
+
+        public bool UsingMicrosoftNETSdkWebAssembly { get; set; }
+
         [Required]
         public string NETCoreSdkRuntimeIdentifier { get; set; }
 
@@ -387,6 +391,15 @@ var runtimeRequiredByDeployment
                 }
             }
 
+            if (UsingMicrosoftNETSdkWebAssembly)
+            {
+                if (!AddToolPack(ToolPackType.WebAssemblySdk, _normalizedTargetFrameworkVersion, packagesToDownload, implicitPackageReferences))
+                {
+                    Log.LogError(Strings.WebAssemblySdkNoValidRuntimePackageError);
+                    return;
+                }
+            }
+
             if (packagesToDownload.Any())
             {
                 PackagesToDownload = packagesToDownload.Distinct(new PackageToDownloadComparer<ITaskItem>()).ToArray();
@@ -594,7 +607,8 @@ private enum ToolPackType
         {
             Crossgen2,
             ILCompiler,
-            ILLink
+            ILLink,
+            WebAssemblySdk
         }
 
         private bool AddToolPack(
@@ -607,6 +621,7 @@ private bool AddToolPack(
                 ToolPackType.Crossgen2 => KnownCrossgen2Packs,
                 ToolPackType.ILCompiler => KnownILCompilerPacks,
                 ToolPackType.ILLink => KnownILLinkPacks,
+                ToolPackType.WebAssemblySdk => KnownWebAssemblySdkPacks,
                 _ => throw new ArgumentException($"Unknown package type {toolPackType}", nameof(toolPackType))
             };
 
@@ -688,13 +703,13 @@ private bool AddToolPack(
             }
 
             // ILCompiler and ILLink have RID-agnostic build packages that contain MSBuild targets.
-            if (toolPackType is ToolPackType.ILCompiler or ToolPackType.ILLink)
+            if (toolPackType is ToolPackType.ILCompiler or ToolPackType.ILLink or ToolPackType.WebAssemblySdk)
             {
                 var buildPackageName = knownPack.ItemSpec;
                 var buildPackage = new TaskItem(buildPackageName);
                 buildPackage.SetMetadata(MetadataKeys.Version, packVersion);
                 implicitPackageReferences.Add(buildPackage);
-           }
+            }
 
             return true;
         }

diff --git a/.../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets b/.../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets
@@ -113,6 +113,8 @@ Copyright (c) .NET Foundation. All rights reserved.
                                 KnownCrossgen2Packs="@(KnownCrossgen2Pack)"
                                 KnownILCompilerPacks="@(KnownILCompilerPack)"
                                 KnownILLinkPacks="@(KnownILLinkPack)"
+                                KnownWebAssemblySdkPacks="@(KnownWebAssemblySdkPack)"
+                                UsingMicrosoftNETSdkWebAssembly="$(UsingMicrosoftNETSdkWebAssembly)"
                                 NETCoreSdkRuntimeIdentifier="$(NETCoreSdkRuntimeIdentifier)"
                                 NetCoreRoot="$(NetCoreRoot)"
                                 NETCoreSdkVersion="$(NETCoreSdkVersion)">

diff --git a/....NET.Sdk.BlazorWebAssembly.AoT.Tests/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests.csproj b/....NET.Sdk.BlazorWebAssembly.AoT.Tests/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests.csproj
@@ -38,6 +38,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Include="..\Microsoft.NET.Sdk.BlazorWebAssembly.Tests\BootJsonData.cs" Link="BootJsonData.cs" />
     <Compile Include="..\Microsoft.NET.Sdk.BlazorWebAssembly.Tests\WasmPublishIntegrationTestBase.cs" Link="WasmPublishIntegrationTestBase.cs" />
     <Compile Include="..\Microsoft.NET.Sdk.BlazorWebAssembly.Tests\ServiceWorkerAssert.cs" Link="ServiceWorkerAssert.cs" />
   </ItemGroup>
@@ -51,7 +52,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\BlazorWasmSdk\Tasks\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj" SkipGetTargetFrameworkProperties="true" />
-    <ProjectReference Include="..\..\..\src\WasmSdk\Tasks\Microsoft.NET.Sdk.WebAssembly.Tasks.csproj" SkipGetTargetFrameworkProperties="true" />
     <ProjectReference Include="..\..\RazorSdk\Tasks\Microsoft.NET.Sdk.Razor.Tasks.csproj" />
     <ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
   </ItemGroup>

diff --git a/src/WasmSdk/Tasks/BootJsonData.cs → ...k.BlazorWebAssembly.Tests/BootJsonData.cs b/src/WasmSdk/Tasks/BootJsonData.cs → ...k.BlazorWebAssembly.Tests/BootJsonData.cs
@@ -5,6 +5,8 @@
 using System.Runtime.Serialization;
 using ResourceHashesByNameDictionary = System.Collections.Generic.Dictionary<string, string>;
 
+// For test purposes only. Actual build time implementation lives in runtime repository with WasmSDK
+
 namespace Microsoft.NET.Sdk.WebAssembly
 {
 #pragma warning disable IDE1006 // Naming Styles