From 2aee3e23bb2ddf60193ffc20f0188ca19fdb8586 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Mon, 23 Sep 2019 15:34:21 -0700
Subject: [PATCH 1/5] Switch to embedded PackageIcon

---
 Directory.Build.props                            |   7 ++++++-
 packageIcon.png                                  | Bin 0 -> 7006 bytes
 .../Microsoft.NET.Sdk.Razor.csproj               |   1 +
 .../Microsoft.NET.Sdk.Razor.nuspec               |   1 +
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 packageIcon.png

diff --git a/Directory.Build.props b/Directory.Build.props
index 299b8160022..038e0489ae9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -32,9 +32,14 @@
   <PropertyGroup Label="Package and Assembly Metadata">
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <Product>Microsoft ASP.NET Core</Product>
-    <PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
+    <PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
   <PropertyGroup Label="Warning Suppressions">
     <!--
       Suppress warnings about assembly conflicts. This happens for assemblies that ship in VS so it's irrelevant.
diff --git a/packageIcon.png b/packageIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0f1fdbf4d5eae0e561018cccee74f6a454cdb9c
GIT binary patch
literal 7006
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

literal 0
HcmV?d00001

diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
index 24bf87a38ef..d4e86db5b6a 100644
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
@@ -75,6 +75,7 @@
 
     <ItemGroup>
       <NuspecProperty Include="outputPath=$(OutputPath)\sdk-output" />
+      <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
index 85713bd9630..6fe840ccd7d 100644
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
@@ -10,6 +10,7 @@
     <file src="buildMultiTargeting\**" target="buildMultiTargeting" />
     <file src="_._" target="lib\netstandard2.0\_._" />
 
+    <file src="$PackageIcon$" target="" />
     <file src="$outputPath$\**" target="\" />
   </files>
 </package>

From 973448284cf444ef643c1b2d0ca978d79ae5ab17 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Tue, 24 Sep 2019 09:56:51 -0700
Subject: [PATCH 2/5] Merge branches

---
 .../src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
index 6fe840ccd7d..55d4970b684 100644
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
@@ -2,6 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>

From 6b1fdb9cbc6cac29bbee231b0f6c1af93110c7f4 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Tue, 24 Sep 2019 15:58:27 -0700
Subject: [PATCH 3/5] Update to GA SDK

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 502d09563bb..c2774e40bc1 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.0.100-preview8-013656",
+    "dotnet": "3.0.100",
     "runtimes": {
       "dotnet": [
         "2.1.11",
@@ -15,7 +15,7 @@
     }
   },
   "sdk": {
-    "version": "3.0.100-preview8-013656"
+    "version": "3.0.100"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7"

From 83b434dfc3452bfe050bc7193c2e5a7520726ecb Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 24 Sep 2019 18:12:16 -0700
Subject: [PATCH 4/5] Fixup build errors

---
 .../Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj   | 2 +-
 .../Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec   | 5 +++++
 .../Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj    | 3 +++
 ...ft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj | 5 ++++-
 ...ft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj | 5 ++++-
 .../Microsoft.AspNetCore.Razor.Language.Test.csproj          | 3 +++
 6 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
index d4e86db5b6a..381d0011fa7 100644
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
@@ -10,7 +10,7 @@
     <!-- Do not disable ApiCheck. We need to be aware of when we make changes to the Tasks since they need to be backwards compatible. -->
 
     <!-- Allow assemblies outside of lib in the package -->
-    <NoWarn>$(NoWarn);NU5100</NoWarn>
+    <NoWarn>$(NoWarn);NU5100;NU5129</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
index 55d4970b684..b49cc5c2de7 100644
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
@@ -3,6 +3,9 @@
   <metadata>
     $CommonMetadataElements$
     <icon>packageIcon.png</icon>
+    <dependencies>
+      <group targetFramework=".NETStandard2.0" />
+    </dependencies>
   </metadata>
 
   <files>
@@ -14,4 +17,6 @@
     <file src="$PackageIcon$" target="" />
     <file src="$outputPath$\**" target="\" />
   </files>
+
+
 </package>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
index 310177f1b90..9ad9d37327f 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
@@ -4,6 +4,9 @@
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+
+    <!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
index 60f85d388f6..2a07595fca0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
@@ -4,6 +4,9 @@
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+
+    <!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,7 +17,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
-    
+
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj" />
   </ItemGroup>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
index 5f09868d529..e03b65a8770 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
@@ -4,6 +4,9 @@
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
+
+    <!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,7 +17,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.CodeAnalysis.Razor\Microsoft.CodeAnalysis.Razor.csproj" />
-    
+
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.csproj" />
   </ItemGroup>
diff --git a/src/Razor/test/RazorLanguage.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Razor/test/RazorLanguage.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj
index 4430c2e13b6..abdd61a8fd1 100644
--- a/src/Razor/test/RazorLanguage.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj
+++ b/src/Razor/test/RazorLanguage.Test/Microsoft.AspNetCore.Razor.Language.Test.csproj
@@ -4,6 +4,9 @@
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
     <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
     <DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
+
+    <!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
   </PropertyGroup>
 
   <ItemGroup>

From f925f138ef31a9c6421ea195de62a6beca406526 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 24 Sep 2019 18:13:26 -0700
Subject: [PATCH 5/5] Remove empty lines

---
 .../src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
index b49cc5c2de7..6fadcf81384 100644
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.nuspec
@@ -17,6 +17,4 @@
     <file src="$PackageIcon$" target="" />
     <file src="$outputPath$\**" target="\" />
   </files>
-
-
 </package>