From 85ead8270490e25894fcdbae74e9037bfa49b38c Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 11 Aug 2020 15:14:34 -0700
Subject: [PATCH 1/4] Do not include the shared framework in the packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DevServer and dotnet-watch include binaries from the ASP.NET Core shared framework
as part of the package. This change compiles these projects against the most recently built
version of the shared framework which ensures build and publish work as normals. Individual
projects from the runtime can be referenced to pick up new runtime features when necessary
---
 ...re.Components.WebAssembly.DevServer.csproj | 23 +++----------------
 .../dotnet-watch/src/dotnet-watch.csproj      | 20 +++-------------
 2 files changed, 6 insertions(+), 37 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 3a4819a3839f..bfb647006144 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,17 +11,14 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <!-- Set this to false because assemblies should not reference this assembly directly, (except for tests, of course). -->
     <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
+    <UseAspNetCoreSharedRuntime>true</UseAspNetCoreSharedRuntime>
+    <DoNotApplyWorkaroundsToMicrosoftAspNetCoreApp>true</DoNotApplyWorkaroundsToMicrosoftAspNetCoreApp>
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.AspNetCore" />
-    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" />
-    <Reference Include="Microsoft.AspNetCore.Components.Server" />
-    <Reference Include="Microsoft.AspNetCore.ResponseCompression" />
-
     <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
-    <Reference Include="Microsoft.Extensions.Hosting" />
   </ItemGroup>
 
   <!-- Pack settings -->
@@ -37,19 +34,5 @@
     <NuspecProperty Include="PackageThirdPartyNoticesFile=$(PackageThirdPartyNoticesFile)" />
   </ItemGroup>
 
-  <Target Name="_FixupRuntimeConfig" BeforeTargets="_GenerateRuntimeConfigurationFilesInputCache">
-    <ItemGroup>
-      <_RuntimeFramework Include="@(RuntimeFramework)" />
-      <RuntimeFramework Remove="@(RuntimeFramework)" />
-      <RuntimeFramework Include="Microsoft.AspNetCore.App" FrameworkName="Microsoft.AspNetCore.App" Version="5.0.0-preview" />
-    </ItemGroup>
-  </Target>
-
-   <Target Name="_UndoRuntimeConfigWorkarounds" AfterTargets="GenerateBuildRuntimeConfigurationFiles">
-    <ItemGroup>
-      <RuntimeFramework Remove="@(RuntimeFramework)" />
-      <RuntimeFramework Include="@(_RuntimeFramework)" />
-    </ItemGroup>
-  </Target>
 
 </Project>
diff --git a/src/Tools/dotnet-watch/src/dotnet-watch.csproj b/src/Tools/dotnet-watch/src/dotnet-watch.csproj
index cbe5cf13c95e..0c49175abd0d 100644
--- a/src/Tools/dotnet-watch/src/dotnet-watch.csproj
+++ b/src/Tools/dotnet-watch/src/dotnet-watch.csproj
@@ -10,6 +10,8 @@
     <!-- This package is for internal use only. It contains a CLI which is bundled in the .NET Core SDK. -->
     <IsShippingPackage>false</IsShippingPackage>
     <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
+    <UseAspNetCoreSharedRuntime>true</UseAspNetCoreSharedRuntime>
+    <DoNotApplyWorkaroundsToMicrosoftAspNetCoreApp>true</DoNotApplyWorkaroundsToMicrosoftAspNetCoreApp>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,8 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.AspNetCore" />
-    <Reference Include="Microsoft.AspNetCore.WebSockets" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
     <Reference
       Include="Microsoft.AspNetCore.Watch.BrowserRefresh"
@@ -53,19 +54,4 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="_FixupRuntimeConfig" BeforeTargets="_GenerateRuntimeConfigurationFilesInputCache">
-    <ItemGroup>
-      <_RuntimeFramework Include="@(RuntimeFramework)" />
-      <RuntimeFramework Remove="@(RuntimeFramework)" />
-      <RuntimeFramework Include="Microsoft.AspNetCore.App" FrameworkName="Microsoft.AspNetCore.App" Version="5.0.0-preview" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_UndoRuntimeConfigWorkarounds" AfterTargets="GenerateBuildRuntimeConfigurationFiles">
-    <ItemGroup>
-      <RuntimeFramework Remove="@(RuntimeFramework)" />
-      <RuntimeFramework Include="@(_RuntimeFramework)" />
-    </ItemGroup>
-  </Target>
-
 </Project>

From 5b3c3307ce3a74937609b44d2d552f5a4f7dc562 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 13 Aug 2020 09:39:45 -0700
Subject: [PATCH 2/4] More hacks!

---
 ...re.Components.WebAssembly.DevServer.csproj |  5 +++++
 .../Driver/Wasm.Performance.Driver.csproj     |  7 ++++++-
 ...soft.AspNetCore.Components.E2ETests.csproj |  1 -
 .../TestServer/Components.TestServer.csproj   |  5 ++++-
 .../dotnet-watch/src/DotnetToolSettings.xml   |  6 ++++++
 .../dotnet-watch/src/dotnet-watch.csproj      |  5 +++++
 .../dotnet-watch/src/dotnet-watch.nuspec      | 20 +++++++++++++++++++
 .../test/dotnet-watch.Tests.csproj            |  8 ++++++++
 8 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 src/Tools/dotnet-watch/src/DotnetToolSettings.xml
 create mode 100644 src/Tools/dotnet-watch/src/dotnet-watch.nuspec

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 bfb647006144..63c67051e4ae 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,11 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <!-- Set this to false because assemblies should not reference this assembly directly, (except for tests, of course). -->
     <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
+
+    <!--
+      This project compiles against Microsoft.AspNetCore.App from the SDK.
+      This ensures that it's packaging output is correct and does not include local artifacts.
+    -->
     <UseAspNetCoreSharedRuntime>true</UseAspNetCoreSharedRuntime>
     <DoNotApplyWorkaroundsToMicrosoftAspNetCoreApp>true</DoNotApplyWorkaroundsToMicrosoftAspNetCoreApp>
   </PropertyGroup>
diff --git a/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj b/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
index 66aea279ee62..346ddc48f16b 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
+++ b/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj
@@ -12,13 +12,18 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore" />
     <Reference Include="Microsoft.AspNetCore.Cors" />
+    <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" />
     <Reference Include="Selenium.Support" />
     <Reference Include="Selenium.WebDriver" />
-    <ProjectReference Include="..\..\..\WebAssembly\DevServer\src\Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj" />
     <ProjectReference Include="..\TestApp\Wasm.Performance.TestApp.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\..\WebAssembly\DevServer\src\Server\*.cs" />
+  </ItemGroup>
+
   <Target Name="_AddTestProjectMetadataAttributes" BeforeTargets="BeforeCompile">
     <ItemGroup>
       <AssemblyAttribute
diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
index 256ea831e195..2cf37125dedf 100644
--- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
+++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
@@ -41,7 +41,6 @@
     <ProjectReference Include="..\..\WebAssembly\testassets\HostedInAspNet.Client\HostedInAspNet.Client.csproj" />
     <ProjectReference Include="..\..\WebAssembly\testassets\HostedInAspNet.Server\HostedInAspNet.Server.csproj" />
     <ProjectReference Include="..\..\WebAssembly\testassets\StandaloneApp\StandaloneApp.csproj" />
-    <ProjectReference Include="..\..\WebAssembly\DevServer\src\Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj" />
     <ProjectReference Include="..\testassets\BasicTestApp\BasicTestApp.csproj" />
     <ProjectReference Include="..\testassets\TestServer\Components.TestServer.csproj" />
     <ProjectReference Include="..\..\WebAssembly\testassets\Wasm.Authentication.Server\Wasm.Authentication.Server.csproj" />
diff --git a/src/Components/test/testassets/TestServer/Components.TestServer.csproj b/src/Components/test/testassets/TestServer/Components.TestServer.csproj
index 651b301bece8..59b8fe56856b 100644
--- a/src/Components/test/testassets/TestServer/Components.TestServer.csproj
+++ b/src/Components/test/testassets/TestServer/Components.TestServer.csproj
@@ -22,10 +22,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\WebAssembly\DevServer\src\Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj" />
     <ProjectReference Include="..\BasicTestApp\BasicTestApp.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\..\WebAssembly\DevServer\src\Server\*.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
       <_Parameter1>Microsoft.AspNetCore.Testing.BasicTestApp.ContentRoot</_Parameter1>
diff --git a/src/Tools/dotnet-watch/src/DotnetToolSettings.xml b/src/Tools/dotnet-watch/src/DotnetToolSettings.xml
new file mode 100644
index 000000000000..f077af6da491
--- /dev/null
+++ b/src/Tools/dotnet-watch/src/DotnetToolSettings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DotNetCliTool Version="1">
+  <Commands>
+    <Command Name="dotnet-watch" EntryPoint="dotnet-watch.dll" Runner="dotnet" />
+  </Commands>
+</DotNetCliTool>
\ No newline at end of file
diff --git a/src/Tools/dotnet-watch/src/dotnet-watch.csproj b/src/Tools/dotnet-watch/src/dotnet-watch.csproj
index 0c49175abd0d..c74d67c0e0a0 100644
--- a/src/Tools/dotnet-watch/src/dotnet-watch.csproj
+++ b/src/Tools/dotnet-watch/src/dotnet-watch.csproj
@@ -10,6 +10,11 @@
     <!-- This package is for internal use only. It contains a CLI which is bundled in the .NET Core SDK. -->
     <IsShippingPackage>false</IsShippingPackage>
     <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
+
+    <!--
+      This project compiles against Microsoft.AspNetCore.App from the SDK.
+      This ensures that it's packaging output is correct and does not include local artifacts.
+    -->
     <UseAspNetCoreSharedRuntime>true</UseAspNetCoreSharedRuntime>
     <DoNotApplyWorkaroundsToMicrosoftAspNetCoreApp>true</DoNotApplyWorkaroundsToMicrosoftAspNetCoreApp>
   </PropertyGroup>
diff --git a/src/Tools/dotnet-watch/src/dotnet-watch.nuspec b/src/Tools/dotnet-watch/src/dotnet-watch.nuspec
new file mode 100644
index 000000000000..0c775591e860
--- /dev/null
+++ b/src/Tools/dotnet-watch/src/dotnet-watch.nuspec
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    $CommonMetadataElements$
+    <packageTypes>
+      <packageType name="DotnetTool" />
+    </packageTypes>
+  </metadata>
+  <files>
+    $CommonFileElements$
+    <file src="$PackageThirdPartyNoticesFile$" target=".\THIRD-PARTY-NOTICES.txt" />
+    <file src="DotnetToolSettings.xml" target="tools\$DefaultNetCoreTargetFramework$\any\DotnetToolSettings.xml" />
+    <file src="assets\DotNetWatch.targets" target="tools\$DefaultNetCoreTargetFramework$\any\assets\DotNetWatch.targets" />
+    <file src="$OutputPath$dotnet-watch.dll" target="tools\$DefaultNetCoreTargetFramework$\any\dotnet-watch.dll" />
+    <file src="$OutputPath$dotnet-watch.deps.json" target="tools\$DefaultNetCoreTargetFramework$\any\dotnet-watch.deps.json" />
+    <file src="$OutputPath$dotnet-watch.runtimeconfig.json" target="tools\$DefaultNetCoreTargetFramework$\any\dotnet-watch.runtimeconfig.json" />
+    <file src="$OutputPath$dotnet-watch.pdb" target="tools\$DefaultNetCoreTargetFramework$\any\dotnet-watch.pdb" />
+    <file src="$BrowserRefreshOutputPath$Microsoft.AspNetCore.Watch.BrowserRefresh.dll" target="tools\$DefaultNetCoreTargetFramework$\any\middleware\Microsoft.AspNetCore.Watch.BrowserRefresh.dll" />
+  </files>
+</package>
diff --git a/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj b/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj
index d171daa39d84..b9c9d9fe3c2e 100644
--- a/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj
+++ b/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj
@@ -5,6 +5,13 @@
     <AssemblyName>Microsoft.DotNet.Watcher.Tools.Tests</AssemblyName>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestProjects\**\*</DefaultItemExcludes>
     <TestGroupName>DotNetWatcherToolsTests</TestGroupName>
+
+    <!--
+      This project compiles against Microsoft.AspNetCore.App from the SDK.
+      This ensures that it's packaging output is correct and does not include local artifacts.
+    -->
+    <UseAspNetCoreSharedRuntime>true</UseAspNetCoreSharedRuntime>
+    <DoNotApplyWorkaroundsToMicrosoftAspNetCoreApp>true</DoNotApplyWorkaroundsToMicrosoftAspNetCoreApp>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,6 +21,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\dotnet-watch.csproj" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
   <ItemGroup>

From fe1abe1facf94d0787793083b2e8b4edfb678e35 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 14 Aug 2020 07:01:23 -0700
Subject: [PATCH 3/4] Ensure shared runtime is built before running tests

---
 ...soft.AspNetCore.Components.WebAssembly.DevServer.csproj | 7 +++++++
 src/Tools/dotnet-watch/src/dotnet-watch.csproj             | 6 ++++++
 2 files changed, 13 insertions(+)

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 63c67051e4ae..241992e77efb 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
@@ -22,6 +22,13 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
+
+    <ProjectReference
+      Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
+      PrivateAssets="All"
+      ReferenceOutputAssembly="false"
+      SkipGetTargetFrameworkProperties="true" />
+
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" />
     <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
   </ItemGroup>
diff --git a/src/Tools/dotnet-watch/src/dotnet-watch.csproj b/src/Tools/dotnet-watch/src/dotnet-watch.csproj
index c74d67c0e0a0..29750598258e 100644
--- a/src/Tools/dotnet-watch/src/dotnet-watch.csproj
+++ b/src/Tools/dotnet-watch/src/dotnet-watch.csproj
@@ -29,6 +29,12 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
+   <ProjectReference
+      Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
+      PrivateAssets="All"
+      ReferenceOutputAssembly="false"
+      SkipGetTargetFrameworkProperties="true" />
+
     <Reference
       Include="Microsoft.AspNetCore.Watch.BrowserRefresh"
       PrivateAssets="All"

From 4cbad48c4954b97595b11e006556a745630be2dc Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 25 Aug 2020 07:53:21 -0700
Subject: [PATCH 4/4] Delete dotnet-watch.nuspec

---
 .../dotnet-watch/src/dotnet-watch.nuspec      | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 src/Tools/dotnet-watch/src/dotnet-watch.nuspec

diff --git a/src/Tools/dotnet-watch/src/dotnet-watch.nuspec b/src/Tools/dotnet-watch/src/dotnet-watch.nuspec
deleted file mode 100644
index 0c775591e860..000000000000
--- a/src/Tools/dotnet-watch/src/dotnet-watch.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-    $CommonMetadataElements$
-    <packageTypes>
-      <packageType name="DotnetTool" />
-    </packageTypes>
-  </metadata>
-  <files>
-    $CommonFileElements$
-    <file src="$PackageThirdPartyNoticesFile$" target=".\THIRD-PARTY-NOTICES.txt" />
-    <file src="DotnetToolSettings.xml" target="tools\$DefaultNetCoreTargetFramework$\any\DotnetToolSettings.xml" />
-    <file src="assets\DotNetWatch.targets" target="tools\$DefaultNetCoreTargetFramework$\any\assets\DotNetWatch.targets" />
-    <file src="$OutputPath$dotnet-watch.dll" target="tools\$DefaultNetCoreTargetFramework$\any\dotnet-watch.dll" />
-    <file src="$OutputPath$dotnet-watch.deps.json" target="tools\$DefaultNetCoreTargetFramework$\any\dotnet-watch.deps.json" />
-    <file src="$OutputPath$dotnet-watch.runtimeconfig.json" target="tools\$DefaultNetCoreTargetFramework$\any\dotnet-watch.runtimeconfig.json" />
-    <file src="$OutputPath$dotnet-watch.pdb" target="tools\$DefaultNetCoreTargetFramework$\any\dotnet-watch.pdb" />
-    <file src="$BrowserRefreshOutputPath$Microsoft.AspNetCore.Watch.BrowserRefresh.dll" target="tools\$DefaultNetCoreTargetFramework$\any\middleware\Microsoft.AspNetCore.Watch.BrowserRefresh.dll" />
-  </files>
-</package>