From 4a46036cc315d246aa575d0b5bd2082ad67652d3 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 14 Jan 2021 16:57:00 +0000
Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade
 build 20210113.3 (#29309)

[release/5.0] Update dependencies from dotnet/arcade
---
 NuGet.config                                 |  8 --------
 eng/Version.Details.xml                      | 12 ++++++------
 eng/Versions.props                           |  2 +-
 eng/common/post-build/publish-using-darc.ps1 |  2 +-
 global.json                                  |  4 ++--
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 1a73a851d5bb..9ed4593be07a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,14 +2,6 @@
 <configuration>
   <packageSources>
     <clear />
-    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
-    <!--  Begin: Package sources from dotnet-efcore -->
-    <add key="darc-int-dotnet-efcore-1ee6b62" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-1ee6b629/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-efcore -->
-    <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-cb5f173" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-cb5f173b/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-runtime -->
-    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2872d5087926..74fa7939630c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -313,17 +313,17 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20621.10">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21063.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f1c7a4b1bcd028e17f2714b7e6f30ec1abd1a03f</Sha>
+      <Sha>f73f462f75b5fa21805f0b3c477b11277c5da556</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20621.10">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21063.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f1c7a4b1bcd028e17f2714b7e6f30ec1abd1a03f</Sha>
+      <Sha>f73f462f75b5fa21805f0b3c477b11277c5da556</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20621.10">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21063.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f1c7a4b1bcd028e17f2714b7e6f30ec1abd1a03f</Sha>
+      <Sha>f73f462f75b5fa21805f0b3c477b11277c5da556</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 307e2ad7fa78..b1c8dbdca412 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -135,7 +135,7 @@
     <MicrosoftEntityFrameworkCorePackageVersion>5.0.2</MicrosoftEntityFrameworkCorePackageVersion>
     <MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.2</MicrosoftEntityFrameworkCoreDesignPackageVersion>
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20621.10</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21063.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <!--
 
diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1
index 386357bed9f7..650b13b089b2 100644
--- a/eng/common/post-build/publish-using-darc.ps1
+++ b/eng/common/post-build/publish-using-darc.ps1
@@ -54,7 +54,7 @@ try {
   --id $buildId `
   --publishing-infra-version $PublishingInfraVersion `
   --default-channels `
-  --source-branch internal/release-publishing `
+  --source-branch master `
   --azdev-pat $AzdoToken `
   --bar-uri $MaestroApiEndPoint `
   --password $MaestroToken `
diff --git a/global.json b/global.json
index 95989af467fa..3281cdcc2965 100644
--- a/global.json
+++ b/global.json
@@ -30,7 +30,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.15.2",
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20621.10",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20621.10"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21063.3",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21063.3"
   }
 }

From 8872b750013303585182674146a91435564c229d Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Thu, 14 Jan 2021 10:13:25 -0800
Subject: [PATCH 2/3] [release/5.0] Update to 1.0.2 SDK (#29276)

- also use latest 2.1 and 3.1 runtimes
---
 global.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/global.json b/global.json
index 3281cdcc2965..a977635a25a5 100644
--- a/global.json
+++ b/global.json
@@ -1,19 +1,19 @@
 {
   "sdk": {
-    "version": "5.0.101"
+    "version": "5.0.102"
   },
   "tools": {
-    "dotnet": "5.0.101",
+    "dotnet": "5.0.102",
     "runtimes": {
       "dotnet/x64": [
-        "2.1.23",
+        "2.1.24",
         "$(MicrosoftNETCoreAppInternalPackageVersion)"
       ],
       "dotnet/x86": [
         "$(MicrosoftNETCoreAppInternalPackageVersion)"
       ],
       "aspnetcore/x64": [
-        "3.1.10"
+        "3.1.11"
       ]
     },
     "Git": "2.22.0",

From fe37d39281965eb8cd5b8f099e849d2ac99e7e37 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 14 Jan 2021 13:11:08 -0800
Subject: [PATCH 3/3] Produce correct blazor.boot.json when using
 StaticWebAssetBasePath (#29293)

---
 .../WasmPublishIntegrationTest.cs             | 53 ++++++++++++++++++-
 ....NET.Sdk.BlazorWebAssembly.Current.targets |  2 +-
 .../BlazorMultipleApps.FirstClient/App.razor  |  1 +
 .../BlazorMultipleApps.FirstClient.csproj     | 24 +++++++++
 .../BlazorMultipleApps.FirstClient/Program.cs | 15 ++++++
 .../wwwroot/css/app.css                       |  1 +
 .../wwwroot/index.html                        | 14 +++++
 .../BlazorMultipleApps.SecondClient/App.razor |  1 +
 .../BlazorMultipleApps.SecondClient.csproj    | 24 +++++++++
 .../Program.cs                                | 12 +++++
 .../wwwroot/css/app.css                       |  1 +
 .../wwwroot/index.html                        | 14 +++++
 .../BlazorMultipleApps.Server.csproj          | 14 +++++
 .../BlazorMultipleApps.Server/Program.cs      | 10 ++++
 .../BlazorMultipleApps.Shared.csproj          |  7 +++
 .../WeatherForecast.cs                        | 17 ++++++
 .../RestoreBlazorWasmTestProjects.csproj      |  1 +
 17 files changed, 209 insertions(+), 2 deletions(-)
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/App.razor
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/BlazorMultipleApps.FirstClient.csproj
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/Program.cs
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/wwwroot/css/app.css
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/wwwroot/index.html
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/App.razor
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/BlazorMultipleApps.SecondClient.csproj
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/Program.cs
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/wwwroot/css/app.css
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/wwwroot/index.html
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Server/BlazorMultipleApps.Server.csproj
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Server/Program.cs
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Shared/BlazorMultipleApps.Shared.csproj
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Shared/WeatherForecast.cs

diff --git a/src/Components/WebAssembly/Sdk/integrationtests/WasmPublishIntegrationTest.cs b/src/Components/WebAssembly/Sdk/integrationtests/WasmPublishIntegrationTest.cs
index 7e14ca0936c6..0ad730be1b94 100644
--- a/src/Components/WebAssembly/Sdk/integrationtests/WasmPublishIntegrationTest.cs
+++ b/src/Components/WebAssembly/Sdk/integrationtests/WasmPublishIntegrationTest.cs
@@ -970,6 +970,58 @@ public async Task Publish_WithInvariantGlobalizationEnabled_DoesNotCopyGlobaliza
             Assert.FileDoesNotExist(result, publishOutputDirectory, "wwwroot", "_framework", "icudt_no_CJK.dat");
         }
 
+        [Fact]
+        public async Task Publish_HostingMultipleBlazorWebApps_Works()
+        {
+            // Regression test for https://github.com/dotnet/aspnetcore/issues/29264
+            // Arrange
+            using var project = ProjectDirectory.Create("BlazorMultipleApps.Server", "BlazorMultipleApps.FirstClient", "BlazorMultipleApps.SecondClient", "BlazorMultipleApps.Shared");
+            var result = await MSBuildProcessManager.DotnetMSBuild(project, "Publish");
+
+            var publishOutputDirectory = project.PublishOutputDirectory;
+
+            Assert.FileExists(result, Path.Combine(publishOutputDirectory, "BlazorMultipleApps.Server.dll"));
+            Assert.FileExists(result, Path.Combine(publishOutputDirectory, "BlazorMultipleApps.FirstClient.dll"));
+            Assert.FileExists(result, Path.Combine(publishOutputDirectory, "BlazorMultipleApps.SecondClient.dll"));
+
+            var firstAppPublishDirectory = Path.Combine(publishOutputDirectory, "wwwroot", "FirstApp");
+
+            var firstCss = Assert.FileExists(result, Path.Combine(firstAppPublishDirectory, "css", "app.css"));
+            Assert.FileContains(result, firstCss, "/* First app.css */");
+
+            var firstBootJsonPath = Path.Combine(firstAppPublishDirectory, "_framework", "blazor.boot.json");
+            var firstBootJson = ReadBootJsonData(result, firstBootJsonPath);
+
+            // Do a sanity check that the boot json has files.
+            Assert.Contains("System.Text.Json.dll", firstBootJson.resources.assembly.Keys);
+
+            VerifyBootManifestHashes(result, firstAppPublishDirectory);
+
+            // Verify compression works
+            Assert.FileExists(result, firstAppPublishDirectory, "_framework", "dotnet.wasm.br");
+            Assert.FileExists(result, firstAppPublishDirectory, "_framework", "BlazorMultipleApps.FirstClient.dll.br");
+            Assert.FileExists(result, firstAppPublishDirectory, "_framework", "System.Text.Json.dll.br");
+
+            var secondAppPublishDirectory = Path.Combine(publishOutputDirectory, "wwwroot", "SecondApp");
+
+            var secondCss = Assert.FileExists(result, Path.Combine(secondAppPublishDirectory, "css", "app.css"));
+            Assert.FileContains(result, secondCss, "/* Second app.css */");
+
+            var secondBootJsonPath = Path.Combine(secondAppPublishDirectory, "_framework", "blazor.boot.json");
+            var secondBootJson = ReadBootJsonData(result, secondBootJsonPath);
+
+            // Do a sanity check that the boot json has files.
+            Assert.Contains("System.Private.CoreLib.dll", secondBootJson.resources.assembly.Keys);
+
+            VerifyBootManifestHashes(result, secondAppPublishDirectory);
+
+            // Verify compression works
+            Assert.FileExists(result, secondAppPublishDirectory, "_framework", "dotnet.wasm.br");
+            Assert.FileExists(result, secondAppPublishDirectory, "_framework", "BlazorMultipleApps.SecondClient.dll.br");
+            Assert.FileExists(result, secondAppPublishDirectory, "_framework", "System.Private.CoreLib.dll.br");
+            Assert.FileDoesNotExist(result, secondAppPublishDirectory, "_framework", "System.Text.Json.dll.br");
+        }
+
         private static void AddWasmProjectContent(ProjectDirectory project, string content)
         {
             var path = Path.Combine(project.SolutionPath, "blazorwasm", "blazorwasm.csproj");
@@ -1022,7 +1074,6 @@ static string ParseWebFormattedHash(string webFormattedHash)
             }
         }
 
-
         private void VerifyTypeGranularTrimming(MSBuildResult result, string blazorPublishDirectory)
         {
             var componentsShimAssemblyPath = Path.Combine(blazorPublishDirectory, "_framework", "Microsoft.AspNetCore.Razor.Test.ComponentShim.dll");
diff --git a/src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets b/src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets
index df0d41cfc17f..514069a7e83e 100644
--- a/src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets
+++ b/src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets
@@ -509,7 +509,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ItemGroup>
       <_BlazorPublishBootResource
         Include="@(ResolvedFileToPublish)"
-        Condition="$([System.String]::Copy('%(RelativePath)').Replace('\','/').StartsWith('wwwroot/_framework')) AND '%(Extension)' != '.a'" />
+        Condition="$([System.String]::Copy('%(RelativePath)').Replace('\','/').StartsWith($(_BlazorFrameworkPublishPath.Replace('\', '/')))) AND '%(Extension)' != '.a'" />
     </ItemGroup>
 
     <GetFileHash Files="@(_BlazorPublishBootResource)" Algorithm="SHA256" HashEncoding="base64">
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/App.razor b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/App.razor
new file mode 100644
index 000000000000..28a0c6092098
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/App.razor
@@ -0,0 +1 @@
+<h1>@typeof(BlazorMultipleApps.FirstClient.Program)</h1>
\ No newline at end of file
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/BlazorMultipleApps.FirstClient.csproj b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/BlazorMultipleApps.FirstClient.csproj
new file mode 100644
index 000000000000..e57b54f6003d
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/BlazorMultipleApps.FirstClient.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <StaticWebAssetBasePath>FirstApp</StaticWebAssetBasePath>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <BlazorWebAssemblySdkDirectoryRoot>$(BlazorWebAssemblySdkArtifactsDirectory)$(Configuration)\sdk-output\</BlazorWebAssemblySdkDirectoryRoot>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BlazorMultipleApps.Shared\BlazorMultipleApps.Shared.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <BinariesRoot>$(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
+
+  <!-- DO NOT add addition references here. This is meant to simulate a non-MVC library -->
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/Program.cs b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/Program.cs
new file mode 100644
index 000000000000..be4240805cd7
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/Program.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Text;
+
+namespace BlazorMultipleApps.FirstClient
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            GC.KeepAlive(typeof(System.Text.Json.JsonSerializer));
+        }
+    }
+}
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/wwwroot/css/app.css b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/wwwroot/css/app.css
new file mode 100644
index 000000000000..4855bd609d2d
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/wwwroot/css/app.css
@@ -0,0 +1 @@
+/* First app.css */
\ No newline at end of file
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/wwwroot/index.html b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/wwwroot/index.html
new file mode 100644
index 000000000000..1f450f51fb8a
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.FirstClient/wwwroot/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>BlazorMultipleApps</title>
+    <base href="/FirstApp/" />
+    <link href="css/app.css" rel="stylesheet" />
+</head>
+
+<body>
+    <script src="_framework/blazor.webassembly.js"></script>
+</body>
+
+</html>
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/App.razor b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/App.razor
new file mode 100644
index 000000000000..28e849ebde1f
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/App.razor
@@ -0,0 +1 @@
+<h1>@typeof(BlazorMultipleApps.SecondClient.Program)</h1>
\ No newline at end of file
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/BlazorMultipleApps.SecondClient.csproj b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/BlazorMultipleApps.SecondClient.csproj
new file mode 100644
index 000000000000..0c38f14b85fb
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/BlazorMultipleApps.SecondClient.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <StaticWebAssetBasePath>SecondApp</StaticWebAssetBasePath>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <BlazorWebAssemblySdkDirectoryRoot>$(BlazorWebAssemblySdkArtifactsDirectory)$(Configuration)\sdk-output\</BlazorWebAssemblySdkDirectoryRoot>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BlazorMultipleApps.Shared\BlazorMultipleApps.Shared.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <BinariesRoot>$(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
+
+  <!-- DO NOT add addition references here. This is meant to simulate a non-MVC library -->
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/Program.cs b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/Program.cs
new file mode 100644
index 000000000000..c910511317b0
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/Program.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace BlazorMultipleApps.SecondClient
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+        }
+    }
+}
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/wwwroot/css/app.css b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/wwwroot/css/app.css
new file mode 100644
index 000000000000..d7cff8ab9dee
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/wwwroot/css/app.css
@@ -0,0 +1 @@
+/* Second app.css */
\ No newline at end of file
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/wwwroot/index.html b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/wwwroot/index.html
new file mode 100644
index 000000000000..bd7f2bbf7754
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.SecondClient/wwwroot/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>SecondBlazorApp</title>
+    <base href="/SecondApp/" />
+    <link href="css/app.css" rel="stylesheet" />
+</head>
+
+<body>
+    <script src="_framework/blazor.webassembly.js"></script>
+</body>
+
+</html>
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Server/BlazorMultipleApps.Server.csproj b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Server/BlazorMultipleApps.Server.csproj
new file mode 100644
index 000000000000..1b71bd775fd5
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Server/BlazorMultipleApps.Server.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BlazorMultipleApps.SecondClient\BlazorMultipleApps.SecondClient.csproj" />
+    <ProjectReference Include="..\BlazorMultipleApps.FirstClient\BlazorMultipleApps.FirstClient.csproj" />
+    <ProjectReference Include="..\BlazorMultipleApps.Shared\BlazorMultipleApps.Shared.csproj" />
+  </ItemGroup>
+
+
+</Project>
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Server/Program.cs b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Server/Program.cs
new file mode 100644
index 000000000000..c571651ff9d6
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Server/Program.cs
@@ -0,0 +1,10 @@
+namespace BlazorMultipleApps.Server
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            
+        }
+    }
+}
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Shared/BlazorMultipleApps.Shared.csproj b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Shared/BlazorMultipleApps.Shared.csproj
new file mode 100644
index 000000000000..d4c395e8cb78
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Shared/BlazorMultipleApps.Shared.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Shared/WeatherForecast.cs b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Shared/WeatherForecast.cs
new file mode 100644
index 000000000000..7c92131eaea7
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/BlazorMultipleApps.Shared/WeatherForecast.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BlazorMultipleApps.Shared
+{
+    public class WeatherForecast
+    {
+        public DateTime Date { get; set; }
+
+        public int TemperatureC { get; set; }
+
+        public string Summary { get; set; }
+
+        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
+    }
+}
diff --git a/src/Components/WebAssembly/Sdk/testassets/RestoreBlazorWasmTestProjects/RestoreBlazorWasmTestProjects.csproj b/src/Components/WebAssembly/Sdk/testassets/RestoreBlazorWasmTestProjects/RestoreBlazorWasmTestProjects.csproj
index 2af6c265d48c..7d1862b9a4e0 100644
--- a/src/Components/WebAssembly/Sdk/testassets/RestoreBlazorWasmTestProjects/RestoreBlazorWasmTestProjects.csproj
+++ b/src/Components/WebAssembly/Sdk/testassets/RestoreBlazorWasmTestProjects/RestoreBlazorWasmTestProjects.csproj
@@ -9,6 +9,7 @@
     <ProjectReference Include="..\blazorwasm\blazorwasm.csproj" />
     <ProjectReference Include="..\blazorwasm-minimal\blazorwasm-minimal.csproj" />
     <ProjectReference Include="..\blazorwasm-fxref\blazorwasm-fxref.csproj" />
+    <ProjectReference Include="..\BlazorMultipleApps.Server\BlazorMultipleApps.Server.csproj" />
   </ItemGroup>
 
 </Project>