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

Upgrade KoreBuild (#1498) 

* remove sources.props and use NuGet.config. Source.props is only necessary for products that bulid in ProdCon, which Blazor does not
* Remove code signing glue code. This is part of KoreBuild now
* Update SDK to 2.1.400
* Update certificate names used for code-signing to use SHA2
This commit is contained in:
Nate McMaster 2018-10-01 11:13:09 -07:00 committed by GitHub
parent 234f089a0a
commit f6b64e5d26
13 changed files with 55 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.azure/pipelines/ci-official.yml
View File

@ -18,6 +18,7 @@ phases:
displayName: Install CodeSigning plugin
inputs:
signType: $(SignType)
zipSources: false
condition: and(succeeded(), in(variables['SignType'], 'test', 'real'))
afterBuild:

1
Directory.Build.props
View File

@ -5,7 +5,6 @@
<Import Project="version.props" />
<Import Project="build\dependencies.props" />
<Import Project="build\sources.props" />
<PropertyGroup>
<Product>Microsoft ASP.NET Core Blazor</Product>

6
build/SignToolData.json
View File

@ -1,7 +1,7 @@
{
"sign": [
{
"certificate": "Microsoft",
"certificate": "Microsoft400",
"values": [
"bin/Microsoft.AspNetCore.Blazor.Analyzers/netstandard1.3/Microsoft.AspNetCore.Blazor.Analyzers.dll",
"bin/Microsoft.AspNetCore.Blazor.Browser.JS/netcoreapp2.1/Microsoft.AspNetCore.Blazor.Browser.JS.dll",
@ -20,14 +20,14 @@
]
},
{
"certificate": "3PartyDual",
"certificate": "3PartySHA2",
"values": [
"bin/Microsoft.AspNetCore.Blazor.Build/netcoreapp2.1/AngleSharp.dll",
"bin/Microsoft.VisualStudio.BlazorExtension/AngleSharp.dll"
]
},
{
"certificate": "Vsix",
"certificate": "VsixSHA2",
"values": [
"bin/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.vsix"
]

2
build/dependencies.props
View File

@ -6,7 +6,7 @@
<AspNetCorePackageVersion>2.1.0</AspNetCorePackageVersion>
<AspNetCoreRuntimeVersion>2.1.3</AspNetCoreRuntimeVersion>
<BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
<InternalAspNetCoreSdkPackageVersion>2.1.3-rtm-15811</InternalAspNetCoreSdkPackageVersion>
<InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-20181001.1</InternalAspNetCoreSdkPackageVersion>
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>2.2.0-preview1-34576</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.2</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreRazorDesignPackageVersion>2.1.2</MicrosoftAspNetCoreRazorDesignPackageVersion>

12
build/repo.props
View File

@ -5,7 +5,9 @@
<PropertyGroup>
<BuildDir>$(ArtifactsDir)$(Configuration)\packages\</BuildDir>
<SkipArtifactVerification>true</SkipArtifactVerification>
<GenerateSignRequest>false</GenerateSignRequest>
<EnableBenchmarkValidation>false</EnableBenchmarkValidation>
<SignToolDataFile>$(MSBuildThisFileDirectory)SignToolData.json</SignToolDataFile>
<SignToolDataWorkingDir>$(ArtifactsDir)\$(Configuration)\</SignToolDataWorkingDir>
</PropertyGroup>
<PropertyGroup>
@ -40,8 +42,8 @@
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
</ItemGroup>
<ItemGroup>
<AspNetCoreRuntime Include="$(AspNetCoreRuntimeVersion)" />
</ItemGroup>
<ItemGroup>
<AspNetCoreRuntime Include="$(AspNetCoreRuntimeVersion)" />
</ItemGroup>
</Project>

6
build/repo.targets
View File

@ -6,10 +6,4 @@
<AdditionalProperties>Configuration=$(Configuration)NoVSIX</AdditionalProperties>
</Solutions>
</ItemGroup>
<Target Name="CodeSign" AfterTargets="Package" DependsOnTargets="GetToolsets" Condition=" '$(OS)' == 'Windows_NT' ">
<MSBuild Projects="$(MSBuildThisFileDirectory)sign.proj"
Targets="Restore;CodeSign"
Properties="VisualStudioMSBuildx86Path=$(VisualStudioMSBuildx86Path);Configuration=$(Configuration)" />
</Target>
</Project>

31
build/sign.proj
View File

@ -1,31 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<!--
See https://github.com/dotnet/roslyn-tools/tree/master/src/SignTool for docs on using the sign tool.
-->
<PropertyGroup>
<TargetFramework>net452</TargetFramework>
<RestorePackagesPath>$(MSBuildThisFileDirectory)..\artifacts\obj\tools\</RestorePackagesPath>
<SignToolVersion>1.0.0-beta2-63206-01</SignToolVersion>
<CodeSignToolPath>$(RestorePackagesPath)roslyntools.signtool\$(SignToolVersion)\tools\SignTool.exe</CodeSignToolPath>
<SignToolOptions Condition=" '$(VisualStudioMSBuildx86Path)' != '' " >-msbuildPath "$(VisualStudioMSBuildx86Path)"</SignToolOptions>
<SignToolOptions Condition=" '$(CI)' != 'true' OR '$(SkipCodeSign)' == 'true' ">$(SignToolOptions) -test</SignToolOptions>
<SignToolOptions Condition=" '$(SignType)' == 'test' ">$(SignToolOptions) -testSign</SignToolOptions>
<SignToolOptions>$(SignToolOptions) -nugetPackagesPath $(RestorePackagesPath)</SignToolOptions>
<SignToolOptions>$(SignToolOptions) -config "$(MSBuildThisFileDirectory)SignToolData.json"</SignToolOptions>
<SignToolOptions>$(SignToolOptions) $(ArtifactsConfigurationDir)</SignToolOptions>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
<PackageReference Include="RoslynTools.SignTool" Version="$(SignToolVersion)" />
</ItemGroup>
<Target Name="CodeSign">
<Exec Command="&quot;$(CodeSignToolPath)&quot; $(SignToolOptions)" />
</Target>
</Project>

19
build/sources.props
View File

@ -1,19 +0,0 @@
<Project>
<Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
<PropertyGroup Label="RestoreSources">
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
$(RestoreSources);
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json
</RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
$(RestoreSources);
https://api.nuget.org/v3/index.json;
https://dotnet.myget.org/f/blazor-dev/api/v3/index.json;
</RestoreSources>
</PropertyGroup>
</Project>

13
global.json
View File

@ -1,5 +1,8 @@
{ "sdk": {
"version": "2.1.302" },
"msbuild-sdks": {
"Microsoft.DotNet.GlobalTools.Sdk": "2.1.3-rtm-15811"}
}
{
"sdk": {
"version": "2.1.400"
},
"msbuild-sdks": {
"Internal.AspNetCore.Sdk": "2.2.0-preview1-20181001.1"
}
}

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:2.1.3-rtm-15811
commithash:640972bd30677321840c88105030d5f97e13738f
version:2.2.0-preview1-20181001.1
commithash:b4d9869fc1acead6346a1067d1642544d0c389ff

2
korebuild.json
View File

@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
"channel": "release/2.1",
"channel": "release/2.2",
"toolsets": {
"visualstudio": {
"required": false,

11
nuget.config Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="myget.org aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
<add key="myget.org aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
<add key="myget.org blazor-dev" value="https://dotnet.myget.org/f/blazor-dev/api/v3/index.json" />
</packageSources>
</configuration>

28
src/Microsoft.AspNetCore.Blazor.Browser.JS/package-lock.json generated
View File

@ -1540,12 +1540,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@ -1560,17 +1562,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
@ -1687,7 +1692,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
@ -1699,6 +1705,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -1713,6 +1720,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@ -1720,12 +1728,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@ -1744,6 +1754,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -1824,7 +1835,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
@ -1836,6 +1848,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -1957,6 +1970,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",