From f5417265430e5123ed0fc9759cb1f30e7537f823 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 23 May 2017 15:03:20 -0700 Subject: [PATCH] Sign ARM binaries in pipeline (dotnet/core-setup#2477) * Sign ARM binaries in pipeline * Sign msi before bundling * Remove spaces Commit migrated from https://github.com/dotnet/core-setup/commit/a574014861010bf7dbedcd001599a809cb4f0a3a --- ...dows-BT.json => Core-Setup-Windows-Arm-BT.json} | 205 +-------- .../buildpipeline/Core-Setup-Windows-BT.json | 501 +++++++++++++++++++-- src/installer/buildpipeline/pipeline.json | 12 +- src/installer/pkg/packaging/dir.proj | 7 +- .../pkg/packaging/windows/package.targets | 23 +- 5 files changed, 518 insertions(+), 230 deletions(-) rename src/installer/buildpipeline/{Core-Setup-Signing-Windows-BT.json => Core-Setup-Windows-Arm-BT.json} (71%) diff --git a/src/installer/buildpipeline/Core-Setup-Signing-Windows-BT.json b/src/installer/buildpipeline/Core-Setup-Windows-Arm-BT.json similarity index 71% rename from src/installer/buildpipeline/Core-Setup-Signing-Windows-BT.json rename to src/installer/buildpipeline/Core-Setup-Windows-Arm-BT.json index ffea641..1fb4994 100644 --- a/src/installer/buildpipeline/Core-Setup-Signing-Windows-BT.json +++ b/src/installer/buildpipeline/Core-Setup-Windows-Arm-BT.json @@ -259,168 +259,6 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Build and run tests", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "$(PB_SourcesDirectory)\\src\\test\\dir.proj", - "platform": "$(PB_TargetArchitecture)", - "configuration": "$(BuildConfiguration)", - "msbuildArguments": "$(PB_CommonMSBuildArgs) /flp:v=diag;LogFile=$(PB_SourcesDirectory)\\tests.log", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Sign MSI and cab", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "$(PB_SourcesDirectory)\\sign.proj", - "platform": "$(PB_TargetArchitecture)", - "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/t:SignMsiAndCab $(PB_CommonMSBuildArgs) $(MsbuildSigningArguments)", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Extract engine from bundle", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", - "platform": "$(PB_TargetArchitecture)", - "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/t:ExtractEngineBundle $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\extractengine.log", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Sign engine", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "$(PB_SourcesDirectory)\\sign.proj", - "platform": "$(PB_TargetArchitecture)", - "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/t:SignEngine $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\signengine.log", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Reattach engine to bundle", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", - "platform": "$(PB_TargetArchitecture)", - "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/t:ReattachEngineToBundle $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\reattachengine.log", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Sign Bundle", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "$(PB_SourcesDirectory)\\sign.proj", - "platform": "$(PB_TargetArchitecture)", - "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/t:SignBundle $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\signbundle.log", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, "displayName": "Publish", "timeoutInMinutes": 0, "task": { @@ -432,7 +270,7 @@ "solution": "$(PB_SourcesDirectory)\\publish\\publish.proj", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", - "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:PublishRidAgnosticPackages=$(PB_PublishRidAgnosticPackages) /p:BuildFullPlatformManifest=$(PB_BuildFullPlatformManifest) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log", + "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken)", "clean": "false", "maximumCpuCount": "false", "restoreNugetPackages": "false", @@ -603,6 +441,13 @@ "PB_SourcesDirectory": { "value": "$(Build.SourcesDirectory)\\core-setup" }, + "PB_ChecksumAzureAccountName": { + "value": "dotnetclichecksums" + }, + "PB_ChecksumAzureAccessToken": { + "value": null, + "isSecret": true + }, "PB_VsoRepoUrl": { "value": "--branch $(PB_Branch) https://$(PB_VsoAccountName):$(PB_VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/DotNet-Core-Setup-Trusted" }, @@ -613,13 +458,6 @@ "value": null, "isSecret": true }, - "PB_ChecksumAzureAccountName": { - "value": "dotnetclichecksums" - }, - "PB_ChecksumAzureAccessToken": { - "value": null, - "isSecret": true - }, "PB_VsoAccountName": { "value": "dn-bot" }, @@ -637,27 +475,29 @@ "value": "real" }, "PB_CommonMSBuildArgs": { - "value": "/p:DistroRid=$(PB_DistroRid) /p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild)" + "value": "/p:DistroRid=$(PB_DistroRid) /p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild) /p:DisableCrossgen=true $(PB_AdditionalBuildArguments)" + }, + "PB_AdditionalBuildArguments": { + "value": "" }, "OfficialBuildId": { "value": "$(Build.BuildNumber)" }, "PB_TargetArchitecture": { - "value": "x64", + "value": "arm", "allowOverride": true }, "PB_CleanAgent": { "value": "true" }, - "PB_PublishRidAgnosticPackages": { - "value": "false" - }, "PB_BuildFullPlatformManifest": { "value": "false" } }, "demands": [ - "Agent.OS -equals Windows_NT" + "Agent.OS -equals Windows_NT", + "DotNetFramework", + "Cmd" ], "retentionRules": [ { @@ -669,15 +509,15 @@ "FilePath", "SymbolStore" ], - "daysToKeep": 2, + "daysToKeep": 7, "minimumToKeep": 1, "deleteBuildRecord": true, "deleteTestResults": true } ], - "buildNumberFormat": "$(Date:yyyyMMdd)$(Rev:-rr)", + "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", "jobAuthorizationScope": "projectCollection", - "jobTimeoutInMinutes": 120, + "jobTimeoutInMinutes": 90, "jobCancelTimeoutInMinutes": 5, "badgeEnabled": true, "repository": { @@ -687,7 +527,7 @@ "fetchDepth": "0", "gitLfsSupport": "false", "skipSyncSource": "true", - "cleanOptions": "3" + "cleanOptions": "0" }, "id": "c19ea379-feb7-4ca5-8f7f-5f2b5095ea62", "type": "TfsGit", @@ -697,6 +537,7 @@ "clean": "false", "checkoutSubmodules": false }, + "processParameters": {}, "quality": "definition", "queue": { "id": 36, @@ -706,8 +547,8 @@ "name": "DotNet-Build" } }, - "id": 6102, - "name": "Core-Setup-Signing-Windows-BT", + "id": 4371, + "name": "Core-Setup-Windows-Arm-BT", "path": "\\", "type": "build", "project": { diff --git a/src/installer/buildpipeline/Core-Setup-Windows-BT.json b/src/installer/buildpipeline/Core-Setup-Windows-BT.json index 19737be..e9680aa 100644 --- a/src/installer/buildpipeline/Core-Setup-Windows-BT.json +++ b/src/installer/buildpipeline/Core-Setup-Windows-BT.json @@ -60,7 +60,62 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Build", + "displayName": "Install Signing Plugin", + "timeoutInMinutes": 0, + "task": { + "id": "30666190-6959-11e5-9f96-f56098202fef", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "signType": "$(PB_SignType)", + "zipSources": "false", + "version": "", + "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Run init-tools.cmd", + "timeoutInMinutes": 0, + "task": { + "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(PB_SourcesDirectory)\\init-tools.cmd", + "arguments": "", + "modifyEnvironment": "false", + "workingFolder": "$(PB_SourcesDirectory)", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Generate version assets", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(PB_SourcesDirectory)\\build.cmd", + "arguments": "-- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /p:OfficialBuildId=$(OfficialBuildId) $(PB_CommonMSBuildArgs)", + "workingFolder": "$(PB_SourcesDirectory)", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build traversal build dependencies", "timeoutInMinutes": 0, "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", @@ -69,7 +124,7 @@ }, "inputs": { "filename": "$(PB_SourcesDirectory)\\build.cmd", - "arguments": "-- $(PB_CommonMSBuildArgs)", + "arguments": "-- $(PB_CommonMSBuildArgs) /t:BuildTraversalBuildDependencies /flp:v=diag", "workingFolder": "$(PB_SourcesDirectory)", "failOnStandardError": "false" } @@ -78,6 +133,321 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, + "displayName": "Build binaries", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(PB_SourcesDirectory)\\build.cmd", + "arguments": "-src-builds -- $(PB_CommonMSBuildArgs)", + "workingFolder": "$(PB_SourcesDirectory)", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Sign binaries", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\sign.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:SignBinaries $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs)", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build nuget packages", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\pkg\\dir.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:BuildFullPlatformManifest=$(PB_BuildFullPlatformManifest) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\packages.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build sharedframework layout", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\sharedFramework\\sharedFramework.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "$(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\sharedframework.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Create installers", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:BuildInstallers $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\packaging.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "true", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Sign MSI and cab", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\sign.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:SignMsiAndCab $(PB_CommonMSBuildArgs) $(MsbuildSigningArguments)", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Create bundles", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:BuildCombinedInstallers $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\createbundles.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Extract engine from bundle", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:ExtractEngineBundle $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\extractengine.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Sign engine", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\sign.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:SignEngine $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\signengine.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Reattach engine to bundle", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:ReattachEngineToBundle $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\reattachengine.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Sign Bundle", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\sign.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:SignBundle $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\signbundle.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build and run tests", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\test\\dir.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "$(PB_CommonMSBuildArgs) /flp:v=diag;LogFile=$(PB_SourcesDirectory)\\tests.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, "displayName": "Publish", "timeoutInMinutes": 0, "task": { @@ -89,7 +459,7 @@ "solution": "$(PB_SourcesDirectory)\\publish\\publish.proj", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", - "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken)", + "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:PublishRidAgnosticPackages=$(PB_PublishRidAgnosticPackages) /p:BuildFullPlatformManifest=$(PB_BuildFullPlatformManifest) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log", "clean": "false", "maximumCpuCount": "false", "restoreNugetPackages": "false", @@ -105,7 +475,7 @@ "enabled": true, "continueOnError": true, "alwaysRun": false, - "displayName": "Clean up VSTS agent", + "displayName": "Cleanup VSTS Agent", "timeoutInMinutes": 0, "task": { "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", @@ -127,6 +497,38 @@ "msbuildArchitecture": "x64", "msbuildLocation": "" } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Perform Cleanup Tasks", + "timeoutInMinutes": 0, + "task": { + "id": "521a94ea-9e68-468a-8167-6dcf361ea776", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": {} + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Copy Publish Artifact: Build Logs", + "timeoutInMinutes": 0, + "task": { + "id": "1d341bb0-2106-458c-8422-d00bcea6512a", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "CopyRoot": "", + "Contents": "**\\*.log", + "ArtifactName": "Build Logs", + "ArtifactType": "Container", + "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" + } } ], "options": [ @@ -173,11 +575,13 @@ } ], "variables": { - "GITHUB_PASSWORD": { - "value": "PassedViaPipeBuild" + "BuildConfiguration": { + "value": "Release", + "allowOverride": true }, "COREHOST_TRACE": { - "value": "0" + "value": "0", + "allowOverride": true }, "STORAGE_ACCOUNT": { "value": "dotnetcli" @@ -189,27 +593,54 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "true" + }, + "NUGET_FEED_URL": { + "value": "https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v2/package" + }, + "NUGET_API_KEY": { + "value": "PassedViaPipeBuild" + }, + "GITHUB_PASSWORD": { + "value": "PassedViaPipeBuild" + }, + "BUILD_FULL_PLATFORM_MANIFEST": { + "value": "true" + }, + "PUBLISH_RID_AGNOSTIC_PACKAGES": { + "value": "true" + }, + "CertificateId": { + "value": "400" + }, + "PB_DistroRid": { + "value": "win-x64" + }, + "RID": { + "value": "win-x64", "allowOverride": true }, - "BuildConfiguration": { - "value": "Release" + "MsbuildSigningArguments": { + "value": "/p:CertificateId=$(CertificateId) /v:detailed" }, - "PB_CommonMSBuildArgs": { - "value": "/p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) $(PB_AdditionalBuildArguments)" + "TeamName": { + "value": "DotNetCore" + }, + "system.debug": { + "value": "false" }, "PB_PortableBuild": { "value": "false", "allowOverride": true }, - "PB_CleanAgent": { - "value": "true" + "NUGET_SYMBOLS_FEED_URL": { + "value": "https:%2F%2Fdotnet.myget.org/F/dotnet-core/symbols/api/v2/package" }, "PB_SourcesDirectory": { "value": "$(Build.SourcesDirectory)\\core-setup" }, - "PB_Branch": { - "value": "master" + "PB_VsoRepoUrl": { + "value": "--branch $(PB_Branch) https://$(PB_VsoAccountName):$(PB_VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/DotNet-Core-Setup-Trusted" }, "PB_AzureAccountName": { "value": "sourcebuild" @@ -225,9 +656,6 @@ "value": null, "isSecret": true }, - "PB_VsoRepoUrl": { - "value": "--branch $(PB_Branch) https://$(PB_VsoAccountName):$(PB_VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/DotNet-Core-Setup-Trusted" - }, "PB_VsoAccountName": { "value": "dn-bot" }, @@ -235,9 +663,18 @@ "value": null, "isSecret": true }, + "PB_Branch": { + "value": "master" + }, "SourceVersion": { "value": "HEAD" }, + "PB_SignType": { + "value": "real" + }, + "PB_CommonMSBuildArgs": { + "value": "/p:DistroRid=$(PB_DistroRid) /p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild)" + }, "OfficialBuildId": { "value": "$(Build.BuildNumber)" }, @@ -245,15 +682,18 @@ "value": "x64", "allowOverride": true }, - "PB_AdditionalBuildArguments": { - "value": "", - "allowOverride": true + "PB_CleanAgent": { + "value": "true" + }, + "PB_PublishRidAgnosticPackages": { + "value": "false" + }, + "PB_BuildFullPlatformManifest": { + "value": "false" } }, "demands": [ - "Agent.OS -equals Windows_NT", - "DotNetFramework", - "Cmd" + "Agent.OS -equals Windows_NT" ], "retentionRules": [ { @@ -265,15 +705,15 @@ "FilePath", "SymbolStore" ], - "daysToKeep": 7, + "daysToKeep": 2, "minimumToKeep": 1, "deleteBuildRecord": true, "deleteTestResults": true } ], - "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", + "buildNumberFormat": "$(Date:yyyyMMdd)$(rev:-rr)", "jobAuthorizationScope": "projectCollection", - "jobTimeoutInMinutes": 90, + "jobTimeoutInMinutes": 120, "jobCancelTimeoutInMinutes": 5, "badgeEnabled": true, "repository": { @@ -283,7 +723,7 @@ "fetchDepth": "0", "gitLfsSupport": "false", "skipSyncSource": "true", - "cleanOptions": "0" + "cleanOptions": "3" }, "id": "c19ea379-feb7-4ca5-8f7f-5f2b5095ea62", "type": "TfsGit", @@ -293,7 +733,6 @@ "clean": "false", "checkoutSubmodules": false }, - "processParameters": {}, "quality": "definition", "queue": { "id": 36, @@ -303,7 +742,7 @@ "name": "DotNet-Build" } }, - "id": 4371, + "id": 6102, "name": "Core-Setup-Windows-BT", "path": "\\", "type": "build", diff --git a/src/installer/buildpipeline/pipeline.json b/src/installer/buildpipeline/pipeline.json index 21bca77..99a5b6d 100644 --- a/src/installer/buildpipeline/pipeline.json +++ b/src/installer/buildpipeline/pipeline.json @@ -61,10 +61,11 @@ } }, { - "Name": "Core-Setup-Windows-BT", + "Name": "Core-Setup-Windows-Arm-BT", "Parameters": { "PB_AdditionalBuildArguments": "/p:SkipTests=true", "PB_TargetArchitecture": "arm", + "PB_DistroRid": "win-arm", "PB_PortableBuild": "true" }, "ReportingParameters": { @@ -75,10 +76,11 @@ } }, { - "Name": "Core-Setup-Windows-BT", + "Name": "Core-Setup-Windows-Arm-BT", "Parameters": { "PB_AdditionalBuildArguments": "/p:SkipTests=true /p:NativeToolSetDir=C:\\tools\\clr", "PB_TargetArchitecture": "arm64", + "PB_DistroRid": "win-arm64", "PB_PortableBuild": "true" }, "ReportingParameters": { @@ -89,7 +91,7 @@ } }, { - "Name": "Core-Setup-Signing-Windows-BT", + "Name": "Core-Setup-Windows-BT", "Parameters": { "PB_DistroRid": "win7-x64", "PB_TargetArchitecture": "x64", @@ -105,7 +107,7 @@ } }, { - "Name": "Core-Setup-Signing-Windows-BT", + "Name": "Core-Setup-Windows-BT", "Parameters": { "PB_DistroRid": "win7-x86", "PB_TargetArchitecture": "x86", @@ -147,4 +149,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/src/installer/pkg/packaging/dir.proj b/src/installer/pkg/packaging/dir.proj index d009bd5..45ac56f 100644 --- a/src/installer/pkg/packaging/dir.proj +++ b/src/installer/pkg/packaging/dir.proj @@ -12,7 +12,9 @@ - + + + @@ -148,7 +150,6 @@ GenerateMsis; - GenerateBundles; GeneratePkgs; GenerateDebs; GenerateRpms; @@ -156,6 +157,8 @@ + + diff --git a/src/installer/pkg/packaging/windows/package.targets b/src/installer/pkg/packaging/windows/package.targets index 06b81f9..b2d93a3 100644 --- a/src/installer/pkg/packaging/windows/package.targets +++ b/src/installer/pkg/packaging/windows/package.targets @@ -6,7 +6,19 @@ + + + + + + @@ -60,15 +72,6 @@ - - - - @@ -85,7 +88,7 @@ $(WindowsScriptRoot)sharedframework\generatebundle.ps1 -- 2.7.4