From 81d0a9e4678c0806c870818a02d1d21a14ad4cf7 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Mon, 28 Jan 2019 16:14:18 -0800
Subject: [PATCH] Update buildtools and fix signing configuration (#7078)

---
 eng/Versions.props           |  2 +-
 eng/Workarounds.targets      |  8 --------
 eng/signcheck.exclusions.txt | 12 ++++++++----
 global.json                  |  2 +-
 korebuild-lock.txt           |  4 ++--
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index cc118ca492..f0d6d0a819 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -108,7 +108,7 @@
   </PropertyGroup>
   <PropertyGroup Label="Build tool dependencies">
     <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
-    <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20190123.3</InternalAspNetCoreSdkPackageVersion>
+    <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20190128.3</InternalAspNetCoreSdkPackageVersion>
     <MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesPackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
   </PropertyGroup>
diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index 30f58a1220..ce7f6d432b 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -1,14 +1,6 @@
 <!-- Use this file to workaround issues. List the issue tracking the item to fix so we can remove the workaround when the issue is resolved. -->
 <Project>
 
-  <!-- Workaround https://github.com/dotnet/arcade/issues/1876. Cross-gen assemblies aren't matched by public key token's. -->
-  <ItemGroup>
-    <!-- This lists files by name to be signed. Dependency items are imported from src/Framework/Microsoft.AspNetCore.App.props -->
-    <FileNamesToSign Include="@(Dependency->'%(Identity).dll')" CertificateName="Microsoft400" />
-    <!-- These dependencies come from external teams, but we crossgen them so they need to be re-signed. -->
-    <FileNamesToSign Include="@(ExternalDependency->'%(Identity).dll')" Exclude="Newtonsoft.Json.dll" CertificateName="Microsoft400" />
-  </ItemGroup>
-
   <!-- Workaround https://github.com/aspnet/AspNetCore-Internal/issues/1501. dotnet-blazor.dll isn't strong-named signed. -->
   <ItemGroup>
     <FileNamesToSign Include="dotnet-blazor.dll" CertificateName="Microsoft400" />
diff --git a/eng/signcheck.exclusions.txt b/eng/signcheck.exclusions.txt
index 987416acf7..866830f155 100644
--- a/eng/signcheck.exclusions.txt
+++ b/eng/signcheck.exclusions.txt
@@ -1,7 +1,11 @@
 content/sdk/*/AppHostTemplate/apphost.exe;AspNetCoreRuntime.*.nupkg; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it.
-content/*.js;Microsoft.DotNet.Web.Spa.ProjectTemplates.*.nupkg; Exclude JavaScript files from codesigning in project templates
-content/*.js;Microsoft.DotNet.Web.ProjectTemplates.*.nupkg; Exclude JavaScript files from codesigning in project templates
-Templates/*.js;Microsoft.VisualStudio.Web.CodeGenerators.Mvc.*.nupkg; Exclude JavaScript files from codesigning in code generators
+*.js;Microsoft.DotNet.Web.Spa.ProjectTemplates.*.nupkg; Exclude JavaScript files from codesigning in project templates
+*.js;Microsoft.DotNet.Web.ProjectTemplates.*.nupkg; Exclude JavaScript files from codesigning in project templates
+*.js;Microsoft.AspNetCore.Blazor.Templates.*.nupkg; Exclude JavaScript files from codesigning in project templates
+*.js;Microsoft.AspNetCore.Blazor.Build.*.nupkg; Exclude JavaScript files required to make Blazor build tooling work
 *.js;signalr-*-javadoc.jar; Exclude JavaScript files in the generated javadocs
 *.binlog;; Exclude msbuild log files
-*;*.symbols.nupkg; Exclude NuGet symbols packages. These are not shipped to customers and should not be code signed.
+*.symbols.nupkg;; Exclude NuGet symbols packages. These are not shipped to customers and should not be code signed.
+;*.symbols.nupkg; Exclude everything inside NuGet symbols packages. These are not shipped to customers and should not be code signed.
+;runtime.osx-x64.Microsoft.AspNetCore.App.*.nupkg; Exclude the contents of the MacOS runtime package because MacOS only supports codesigning for MacOS native binaries and apps
+;runtime.linux-*.Microsoft.AspNetCore.App.*.nupkg; Exclude the contents of the Linux runtime packages because Linux doesn't support validating authenticode signatures
diff --git a/global.json b/global.json
index 4a7c6ca7fc..db12eadd25 100644
--- a/global.json
+++ b/global.json
@@ -3,6 +3,6 @@
     "version": "3.0.100-preview-009750"
   },
   "msbuild-sdks": {
-    "Internal.AspNetCore.Sdk": "3.0.0-build-20190123.3"
+    "Internal.AspNetCore.Sdk": "3.0.0-build-20190128.3"
   }
 }
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 0286e900f8..15f7f6c032 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:3.0.0-build-20190123.3
-commithash:bfcdf8474c79320b7e5edcdb33d94bbdccb41e32
+version:3.0.0-build-20190128.3
+commithash:59917974421fcb1511c1395fd8f4f114c792a635