From 53a5c065df530e82b13e2bb92ca0e17d0192e308 Mon Sep 17 00:00:00 2001
From: Safia Abdalla <safia@safia.rocks>
Date: Wed, 31 Mar 2021 14:11:50 -0700
Subject: [PATCH 1/3] Only include Microsoft.AspNetCore.App framework reference
 for Blazor dev server

---
 ....AspNetCore.Components.WebAssembly.DevServer.csproj |  1 +
 ....AspNetCore.Components.WebAssembly.DevServer.nuspec |  1 +
 .../DevServer/src/blazor-devserver.runtimeconfig.json  | 10 ++++++++++
 .../DevServer/src/runtimeconfig.template.json          |  7 -------
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json
 delete mode 100644 src/Components/WebAssembly/DevServer/src/runtimeconfig.template.json

diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
index 6ee44e50573f..0a4774534441 100644
--- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
+++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
@@ -11,6 +11,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <!-- Set this to false because assemblies should not reference this assembly directly, (except for tests, of course). -->
     <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
+    <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec
index 77df4b791b98..9bad37b0cbf4 100644
--- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec
+++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec
@@ -8,5 +8,6 @@
     <file src="build\**" target="build" />
     <file src="$publishDir$**\*" target="tools" />
     <file src="$PackageThirdPartyNoticesFile$" target=".\THIRD-PARTY-NOTICES.txt" />
+    <file src="blazor-devserver.runtimeconfig.json" target="tools\blazor-devserver.runtimeconfig.json" />
   </files>
 </package>
diff --git a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json
new file mode 100644
index 000000000000..e2bfcdbee933
--- /dev/null
+++ b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json
@@ -0,0 +1,10 @@
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.AspNetCore.App",
+      "version": "6.0.0-preview.3.21167.1"
+    },
+    "rollForwardOnNoCandidateFx": 2
+  }
+}
\ No newline at end of file
diff --git a/src/Components/WebAssembly/DevServer/src/runtimeconfig.template.json b/src/Components/WebAssembly/DevServer/src/runtimeconfig.template.json
deleted file mode 100644
index a148d76b8b0e..000000000000
--- a/src/Components/WebAssembly/DevServer/src/runtimeconfig.template.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "framework": {
-    "name": "Microsoft.AspNetCore.App",
-    "version": "6.0.0-preview.3.21167.1"
-  },
-  "rollForwardOnNoCandidateFx": 2
-}
\ No newline at end of file

From 6e530306fbe8ee94b23afafeddb056388bbdbf1f Mon Sep 17 00:00:00 2001
From: Safia Abdalla <safia@safia.rocks>
Date: Wed, 31 Mar 2021 15:24:40 -0700
Subject: [PATCH 2/3] Address feedback from peer review

---
 eng/Versions.props                              |  1 +
 ...Core.Components.WebAssembly.DevServer.csproj | 17 +++++++++++++++++
 ...Core.Components.WebAssembly.DevServer.nuspec |  2 +-
 ...n => blazor-devserver.runtimeconfig.json.in} |  2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)
 rename src/Components/WebAssembly/DevServer/src/{blazor-devserver.runtimeconfig.json => blazor-devserver.runtimeconfig.json.in} (74%)

diff --git a/eng/Versions.props b/eng/Versions.props
index d024bd89252a..41664d482b31 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -261,6 +261,7 @@
     <XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
     <XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
     <MicrosoftDataSqlClientVersion>1.0.19249.1</MicrosoftDataSqlClientVersion>
+    <MicrosoftAspNetCoreAppVersion>6.0.0-preview.3.21167.1</MicrosoftAspNetCoreAppVersion>
   </PropertyGroup>
   <!-- Restore feeds -->
   <PropertyGroup Label="Restore feeds">
diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
index 0a4774534441..a8f6810a7400 100644
--- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
+++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
@@ -11,6 +11,8 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <!-- Set this to false because assemblies should not reference this assembly directly, (except for tests, of course). -->
     <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
+    <!-- Disable the default runtimeconfig.json in favor of the one that we create which contains the correct
+    framework references. Workaround for issues launching Blazor WASM apps with IIS Express. -->
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
@@ -20,6 +22,21 @@
     <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
   </ItemGroup>
 
+  <Target Name="_CreateRuntimeConfig" BeforeTargets="CoreBuild">
+    <PropertyGroup>
+      <_RuntimeConfigProperties>
+        MicrosoftAspNetCoreAppVersion=$(MicrosoftAspNetCoreAppVersion);
+      </_RuntimeConfigProperties>
+
+      <_RuntimeConfigPath>$(PublishDir)blazor-devserver.runtimeconfig.json</_RuntimeConfigPath>
+    </PropertyGroup>
+
+    <GenerateFileFromTemplate
+      TemplateFile="blazor-devserver.runtimeconfig.json.in"
+      Properties="$(_RuntimeConfigProperties)"
+      OutputPath="$(_RuntimeConfigPath)" />
+  </Target>
+
   <!-- Pack settings -->
   <PropertyGroup>
     <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);publish</GenerateNuspecDependsOn>
diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec
index 9bad37b0cbf4..c4cbac6a3342 100644
--- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec
+++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec
@@ -8,6 +8,6 @@
     <file src="build\**" target="build" />
     <file src="$publishDir$**\*" target="tools" />
     <file src="$PackageThirdPartyNoticesFile$" target=".\THIRD-PARTY-NOTICES.txt" />
-    <file src="blazor-devserver.runtimeconfig.json" target="tools\blazor-devserver.runtimeconfig.json" />
+    <file src="$publishDir$blazor-devserver.runtimeconfig.json" target="tools\blazor-devserver.runtimeconfig.json" />
   </files>
 </package>
diff --git a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in
similarity index 74%
rename from src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json
rename to src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in
index e2bfcdbee933..2fa652d50012 100644
--- a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json
+++ b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in
@@ -3,7 +3,7 @@
     "tfm": "net6.0",
     "framework": {
       "name": "Microsoft.AspNetCore.App",
-      "version": "6.0.0-preview.3.21167.1"
+      "version": "${MicrosoftAspNetCoreAppVersion}"
     },
     "rollForwardOnNoCandidateFx": 2
   }

From ce2449ad698607af939b6cfdd531e108fd788279 Mon Sep 17 00:00:00 2001
From: Safia Abdalla <safia@microsoft.com>
Date: Thu, 1 Apr 2021 02:00:14 +0000
Subject: [PATCH 3/3] Use SharedFxVersion property

---
 ...rosoft.AspNetCore.Components.WebAssembly.DevServer.csproj | 5 +++--
 ...rosoft.AspNetCore.Components.WebAssembly.DevServer.nuspec | 2 +-
 .../DevServer/src/blazor-devserver.runtimeconfig.json.in     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
index a8f6810a7400..5737771dc8fb 100644
--- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
+++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
@@ -25,10 +25,10 @@
   <Target Name="_CreateRuntimeConfig" BeforeTargets="CoreBuild">
     <PropertyGroup>
       <_RuntimeConfigProperties>
-        MicrosoftAspNetCoreAppVersion=$(MicrosoftAspNetCoreAppVersion);
+        SharedFxVersion=$(SharedFxVersion);
       </_RuntimeConfigProperties>
 
-      <_RuntimeConfigPath>$(PublishDir)blazor-devserver.runtimeconfig.json</_RuntimeConfigPath>
+      <_RuntimeConfigPath>$(IntermediateOutputPath)blazor-devserver.runtimeconfig.json</_RuntimeConfigPath>
     </PropertyGroup>
 
     <GenerateFileFromTemplate
@@ -46,6 +46,7 @@
 
   <ItemGroup>
     <NuspecProperty Include="publishDir=$(PublishDir)" />
+    <NuspecProperty Include="objDir=$(IntermediateOutputPath)" />
     <NuspecProperty Include="PackageThirdPartyNoticesFile=$(PackageThirdPartyNoticesFile)" />
   </ItemGroup>
 
diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec
index c4cbac6a3342..7421979853e7 100644
--- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec
+++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec
@@ -8,6 +8,6 @@
     <file src="build\**" target="build" />
     <file src="$publishDir$**\*" target="tools" />
     <file src="$PackageThirdPartyNoticesFile$" target=".\THIRD-PARTY-NOTICES.txt" />
-    <file src="$publishDir$blazor-devserver.runtimeconfig.json" target="tools\blazor-devserver.runtimeconfig.json" />
+    <file src="$objDir$blazor-devserver.runtimeconfig.json" target="tools\blazor-devserver.runtimeconfig.json" />
   </files>
 </package>
diff --git a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in
index 2fa652d50012..e5bc81165938 100644
--- a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in
+++ b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in
@@ -3,8 +3,8 @@
     "tfm": "net6.0",
     "framework": {
       "name": "Microsoft.AspNetCore.App",
-      "version": "${MicrosoftAspNetCoreAppVersion}"
+      "version": "${SharedFxVersion}"
     },
     "rollForwardOnNoCandidateFx": 2
   }
-}
\ No newline at end of file
+}