From 6bafc157e78371f4ad4c80e4671a9c9a00d03694 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 26 Oct 2018 11:51:23 -0700
Subject: [PATCH] Update code signing config to exclude .js and .ttf files in
template packages
---
build/dependencies.props | 10 +++++-----
korebuild-lock.txt | 4 ++--
.../Microsoft.DotNet.Web.ProjectTemplates.csproj | 7 +++++++
.../Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj | 5 +++++
4 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/build/dependencies.props b/build/dependencies.props
index a647d872e7e..3110c18d643 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -7,7 +7,7 @@
<PropertyGroup Label="Package Versions: Auto">
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
<DotNetEfPackageVersion>2.1.2-rtm-30913</DotNetEfPackageVersion>
- <InternalAspNetCoreSdkPackageVersion>2.1.3-rtm-15802</InternalAspNetCoreSdkPackageVersion>
+ <InternalAspNetCoreSdkPackageVersion>2.1.3-rtm-15831</InternalAspNetCoreSdkPackageVersion>
<MicrosoftAspNetCoreAllPackageVersion>2.1.3-rtm-30913</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.3-rtm-30913</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>2.1.1</MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>
@@ -36,7 +36,7 @@
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.2-rtm-30913</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.1.1</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsProcessSourcesPackageVersion>2.1.1</MicrosoftExtensionsProcessSourcesPackageVersion>
- <MicrosoftNETCoreApp21PackageVersion>2.1.3-servicing-26708-02</MicrosoftNETCoreApp21PackageVersion>
+ <MicrosoftNETCoreApp21PackageVersion>2.1.5</MicrosoftNETCoreApp21PackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.1.2-rtm-30913</MicrosoftNETSdkRazorPackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
<MicrosoftVisualStudioWebBrowserLinkPackageVersion>2.1.1</MicrosoftVisualStudioWebBrowserLinkPackageVersion>
@@ -47,9 +47,9 @@
<SeleniumWebDriverMicrosoftDriverPackageVersion>17.17134.0</SeleniumWebDriverMicrosoftDriverPackageVersion>
<SeleniumWebDriverPackageVersion>3.12.1</SeleniumWebDriverPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.5.0</SystemSecurityPermissionsPackageVersion>
- <XunitAnalyzersPackageVersion>0.8.0</XunitAnalyzersPackageVersion>
- <XunitPackageVersion>2.3.1</XunitPackageVersion>
- <XunitRunnerVisualStudioPackageVersion>2.4.0-rc.1.build4038</XunitRunnerVisualStudioPackageVersion>
+ <XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
+ <XunitPackageVersion>2.4.0</XunitPackageVersion>
+ <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
</PropertyGroup>
<!-- This may import a generated file which may override the variables above. -->
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 5c4ddc6928a..b0ffcc38d73 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.3-rtm-15814
-commithash:6ca1b9d686c747a38a45f538ae34b99354876658
+version:2.1.3-rtm-15831
+commithash:979736d4d4c1332ca2c6df0f338e4dd1c5ed795b
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
index b068a0b34fb..fb30191ade6 100644
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
@@ -8,6 +8,13 @@
<Description>ASP.NET Core Web Template Pack for Microsoft Template Engine</Description>
</PropertyGroup>
+ <ItemGroup>
+ <!-- We don't need to code sign these .js files because they are not used in Windows Script Host. -->
+ <ExcludePackageFileFromSigning Include="content\**\*.js" />
+ <!-- Exclude glyphicons-halflings-regular from signing because this is not produced by Microsoft, nor intended to be installed in the system. It's only meant to be used in the browser. -->
+ <ExcludePackageFileFromSigning Include="content\**\glyphicons-halflings-regular.ttf" />
+ </ItemGroup>
+
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<!-- Set this last to ensure the properties get the final versions which may be overridden by CI. -->
diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
index e9821e13199..576f4673055 100644
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
@@ -8,6 +8,11 @@
<PackageTags>$(PackageTags);spa</PackageTags>
</PropertyGroup>
+ <ItemGroup>
+ <!-- We don't need to code sign these .js files because they are not used in Windows Script Host. -->
+ <ExcludePackageFileFromSigning Include="content\**\*.js" />
+ </ItemGroup>
+
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<!-- Set this last to ensure the properties get the final versions which may be overridden by CI. -->
--
GitLab