From 2ebfddc2379552f0ed3e18e81d106ec3b1a38305 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Thu, 15 Feb 2018 10:19:35 +0000
Subject: [PATCH] Switch client apps to netstandard2.0 to fix type load errors

Do a "git clean -xdf" on your local copy if you get runtime errors after
updating to this.
---
 samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj | 7 +------
 samples/MonoSanity/wwwroot/loader.js                       | 2 +-
 samples/MonoSanityClient/MonoSanityClient.csproj           | 2 +-
 samples/StandaloneApp/StandaloneApp.csproj                 | 3 ++-
 .../ReferenceFromSource.props                              | 6 +++++-
 .../ReferencedAssemblyFileProviderTest.cs                  | 1 -
 test/testapps/BasicTestApp/BasicTestApp.csproj             | 3 ++-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj b/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj
index ea6cb4f61a..64be0e41fd 100644
--- a/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj
+++ b/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj
@@ -1,12 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <!-- Currently, the MonoWASM BCL only supports netstandard2.0, not netcoreapp2.0,
-         so there will be an error if you reference certain types directly from this
-         project (e.g., StringReader). To fix this, the TFM here should be netstandard2.0,
-         but that is inconvenient during builds so for now it stays as this. The issue
-         will go away if a later MonoWASM BCL supports netcoreapp2.0 fully. -->
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <!-- Local alternative to <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" /> -->
diff --git a/samples/MonoSanity/wwwroot/loader.js b/samples/MonoSanity/wwwroot/loader.js
index e812ba837c..ccf3745a4d 100644
--- a/samples/MonoSanity/wwwroot/loader.js
+++ b/samples/MonoSanity/wwwroot/loader.js
@@ -60,10 +60,10 @@
 
   function preloadAssemblies(loadAssemblyUrls) {
     var loadBclAssemblies = [
+      'netstandard',
       'mscorlib',
       'System',
       'System.Core',
-      'System.Runtime'
     ];
 
     var allAssemblyUrls = loadAssemblyUrls
diff --git a/samples/MonoSanityClient/MonoSanityClient.csproj b/samples/MonoSanityClient/MonoSanityClient.csproj
index cb23e16f7f..d42d71999d 100644
--- a/samples/MonoSanityClient/MonoSanityClient.csproj
+++ b/samples/MonoSanityClient/MonoSanityClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <!-- Local alternative to <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" /> -->
diff --git a/samples/StandaloneApp/StandaloneApp.csproj b/samples/StandaloneApp/StandaloneApp.csproj
index 2b0c9644c9..558911261e 100644
--- a/samples/StandaloneApp/StandaloneApp.csproj
+++ b/samples/StandaloneApp/StandaloneApp.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
 
     <!-- Local alternative to <RunArguments>blazor serve</RunArguments> -->
+    <RunCommand>dotnet</RunCommand>
     <RunArguments>run --project ../../src/Microsoft.AspNetCore.Blazor.DevHost serve</RunArguments>
   </PropertyGroup>
 
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props b/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props
index a3d2a055f2..fa62fe3b52 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props
+++ b/src/Microsoft.AspNetCore.Blazor.Build/ReferenceFromSource.props
@@ -14,6 +14,10 @@
     <!-- Ensures this project is built before the consuming project, but without
          adding a runtime dependency on the .dll (to be equivalent to a <PackageDependency>
          given that the packed version of this project wouldn't add a .dll reference) -->
-    <ProjectReference Include="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.Blazor.Build.csproj" ReferenceOutputAssembly="false" PrivateAssets="all" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.Blazor.Build.csproj">
+      <SetTargetFramework>TargetFramework=netcoreapp2.0</SetTargetFramework>
+      <PrivateAssets>all</PrivateAssets>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/test/Microsoft.AspNetCore.Blazor.Build.Test/ReferencedAssemblyFileProviderTest.cs b/test/Microsoft.AspNetCore.Blazor.Build.Test/ReferencedAssemblyFileProviderTest.cs
index f870877d84..30e153b7e0 100644
--- a/test/Microsoft.AspNetCore.Blazor.Build.Test/ReferencedAssemblyFileProviderTest.cs
+++ b/test/Microsoft.AspNetCore.Blazor.Build.Test/ReferencedAssemblyFileProviderTest.cs
@@ -87,7 +87,6 @@ namespace Microsoft.AspNetCore.Blazor.Server.Test
                 "/System.IO.Compression.FileSystem.dll",
                 "/System.Net.Http.dll",
                 "/System.Numerics.dll",
-                "/System.Runtime.dll",
                 "/System.Runtime.Serialization.dll",
                 "/System.Runtime.Serialization.Primitives.dll",
                 "/System.Runtime.Serialization.Xml.dll",
diff --git a/test/testapps/BasicTestApp/BasicTestApp.csproj b/test/testapps/BasicTestApp/BasicTestApp.csproj
index 78720cd71d..b41f246ec0 100644
--- a/test/testapps/BasicTestApp/BasicTestApp.csproj
+++ b/test/testapps/BasicTestApp/BasicTestApp.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
 
     <!-- Local alternative to <RunArguments>blazor serve</RunArguments> -->
+    <RunCommand>dotnet</RunCommand>
     <RunArguments>run --project ..\..\..\src\Microsoft.AspNetCore.Blazor.DevHost serve</RunArguments>
   </PropertyGroup>