huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update buildtools and fix signing configuration (#7078)

This commit is contained in:
Nate McMaster 2019-01-28 16:14:18 -08:00 committed by GitHub
parent f06e1822f5
commit 81d0a9e467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eng/Versions.props
View File

@ -108,7 +108,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Build tool dependencies"> <PropertyGroup Label="Build tool dependencies">
<InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion> <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> <MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesPackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion> <MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
</PropertyGroup> </PropertyGroup>

8
eng/Workarounds.targets
View File

@ -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. --> <!-- 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> <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. --> <!-- Workaround https://github.com/aspnet/AspNetCore-Internal/issues/1501. dotnet-blazor.dll isn't strong-named signed. -->
<ItemGroup> <ItemGroup>
<FileNamesToSign Include="dotnet-blazor.dll" CertificateName="Microsoft400" /> <FileNamesToSign Include="dotnet-blazor.dll" CertificateName="Microsoft400" />

12
eng/signcheck.exclusions.txt
View File

@ -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/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 *.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 *.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.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 *.js;signalr-*-javadoc.jar; Exclude JavaScript files in the generated javadocs
*.binlog;; Exclude msbuild log files *.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

2
global.json
View File

@ -3,6 +3,6 @@
"version": "3.0.100-preview-009750" "version": "3.0.100-preview-009750"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Internal.AspNetCore.Sdk": "3.0.0-build-20190123.3" "Internal.AspNetCore.Sdk": "3.0.0-build-20190128.3"
} }
} }

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:3.0.0-build-20190123.3 version:3.0.0-build-20190128.3
commithash:bfcdf8474c79320b7e5edcdb33d94bbdccb41e32 commithash:59917974421fcb1511c1395fd8f4f114c792a635