From f6b64e5d26b8aee5210999858ded4f1396d8c424 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 1 Oct 2018 11:13:09 -0700 Subject: [PATCH] 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 --- .azure/pipelines/ci-official.yml | 1 + Directory.Build.props | 1 - build/SignToolData.json | 6 ++-- build/dependencies.props | 2 +- build/repo.props | 12 ++++--- build/repo.targets | 6 ---- build/sign.proj | 31 ------------------- build/sources.props | 19 ------------ global.json | 13 +++++--- korebuild-lock.txt | 4 +-- korebuild.json | 2 +- nuget.config | 11 +++++++ .../package-lock.json | 28 ++++++++++++----- 13 files changed, 55 insertions(+), 81 deletions(-) delete mode 100644 build/sign.proj delete mode 100644 build/sources.props create mode 100644 nuget.config diff --git a/.azure/pipelines/ci-official.yml b/.azure/pipelines/ci-official.yml index 6cbe006ba8..2f5baa3fd4 100644 --- a/.azure/pipelines/ci-official.yml +++ b/.azure/pipelines/ci-official.yml @@ -18,6 +18,7 @@ phases: displayName: Install CodeSigning plugin inputs: signType: $(SignType) + zipSources: false condition: and(succeeded(), in(variables['SignType'], 'test', 'real')) afterBuild: diff --git a/Directory.Build.props b/Directory.Build.props index 3571bb79bc..7e11478f8a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,7 +5,6 @@ - Microsoft ASP.NET Core Blazor diff --git a/build/SignToolData.json b/build/SignToolData.json index e00506cc13..c388b58f28 100644 --- a/build/SignToolData.json +++ b/build/SignToolData.json @@ -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" ] diff --git a/build/dependencies.props b/build/dependencies.props index 2fc71545b6..346c6f18e6 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -6,7 +6,7 @@ 2.1.0 2.1.3 0.10.13 - 2.1.3-rtm-15811 + 2.2.0-preview1-20181001.1 2.2.0-preview1-34576 2.1.2 2.1.2 diff --git a/build/repo.props b/build/repo.props index 4ef9b63373..143a657e4d 100644 --- a/build/repo.props +++ b/build/repo.props @@ -5,7 +5,9 @@ $(ArtifactsDir)$(Configuration)\packages\ true - false + false + $(MSBuildThisFileDirectory)SignToolData.json + $(ArtifactsDir)\$(Configuration)\ @@ -40,8 +42,8 @@ - - - - + + + + diff --git a/build/repo.targets b/build/repo.targets index d2b64c74c1..cbd94c07f6 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -6,10 +6,4 @@ Configuration=$(Configuration)NoVSIX - - - - diff --git a/build/sign.proj b/build/sign.proj deleted file mode 100644 index af3dcd0a8c..0000000000 --- a/build/sign.proj +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - net452 - $(MSBuildThisFileDirectory)..\artifacts\obj\tools\ - 1.0.0-beta2-63206-01 - - $(RestorePackagesPath)roslyntools.signtool\$(SignToolVersion)\tools\SignTool.exe - - -msbuildPath "$(VisualStudioMSBuildx86Path)" - $(SignToolOptions) -test - $(SignToolOptions) -testSign - $(SignToolOptions) -nugetPackagesPath $(RestorePackagesPath) - $(SignToolOptions) -config "$(MSBuildThisFileDirectory)SignToolData.json" - $(SignToolOptions) $(ArtifactsConfigurationDir) - - - - - - - - - - - - diff --git a/build/sources.props b/build/sources.props deleted file mode 100644 index 7af557c87b..0000000000 --- a/build/sources.props +++ /dev/null @@ -1,19 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(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); - https://api.nuget.org/v3/index.json; - https://dotnet.myget.org/f/blazor-dev/api/v3/index.json; - - - diff --git a/global.json b/global.json index 3e98304e37..0f9a7c54ff 100644 --- a/global.json +++ b/global.json @@ -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" + } +} diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 07356838be..210c2aa713 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.3-rtm-15811 -commithash:640972bd30677321840c88105030d5f97e13738f +version:2.2.0-preview1-20181001.1 +commithash:b4d9869fc1acead6346a1067d1642544d0c389ff diff --git a/korebuild.json b/korebuild.json index c187e3b203..dc41efc753 100644 --- a/korebuild.json +++ b/korebuild.json @@ -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, diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000000..8b484fc40d --- /dev/null +++ b/nuget.config @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Blazor.Browser.JS/package-lock.json b/src/Microsoft.AspNetCore.Blazor.Browser.JS/package-lock.json index 01a8c82d41..2be91b3132 100644 --- a/src/Microsoft.AspNetCore.Blazor.Browser.JS/package-lock.json +++ b/src/Microsoft.AspNetCore.Blazor.Browser.JS/package-lock.json @@ -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",