From 04885c8a275e43f0c5475da0125ee9f5d3b25e25 Mon Sep 17 00:00:00 2001 From: Artidoro Pagnoni Date: Thu, 18 Oct 2018 14:15:53 -0700 Subject: [PATCH 1/9] adding new x86 phase to yml script --- build/vsts-ci.yml | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index fc3184bfc9..902d3d983b 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -104,6 +104,53 @@ phases: artifactName: PackageAssets artifactType: container +################################################################################ +- phase: Windows_x86 +################################################################################ + variables: + BuildConfig: Release + OfficialBuildId: $(BUILD.BUILDNUMBER) + DOTNET_CLI_TELEMETRY_OPTOUT: 1 + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 + DOTNET_MULTILEVEL_LOOKUP: 0 + _SignType: real + _UseEsrpSigning: true + _TeamName: DotNetCore + queue: + name: DotNetCore-Build + demands: + - agent.os -equals Windows + steps: + + - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1 + displayName: Install MicroBuild Signing Plugin + inputs: + signType: '$(_SignType)' + zipSources: false + esrpSigning: '$(_UseEsrpSigning)' + env: + TeamName: $(_TeamName) + continueOnError: false + condition: and(succeeded(), in(variables._SignType, 'real', 'test')) + + - script: ./build.cmd -$(BuildConfig) -buildArch=x86 + displayName: Build + + - task: MSBuild@1 + displayName: Sign Windows_x86 Binaries + inputs: + solution: build/sign.proj + msbuildArguments: /p:SignType=$(_SignType) + msbuildVersion: 15.0 + continueOnError: false + + - task: PublishBuildArtifacts@1 + displayName: Publish Windows_x86 package assets + inputs: + pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages + artifactName: PackageAssets + artifactType: container + ################################################################################ - phase: Package ################################################################################ @@ -111,6 +158,7 @@ phases: - Linux - MacOS - Windows + - Windows_x86 variables: BuildConfig: Release OfficialBuildId: $(BUILD.BUILDNUMBER) From 5380a005e1602375ec29258016e42da5dad8467c Mon Sep 17 00:00:00 2001 From: Artidoro Pagnoni Date: Thu, 18 Oct 2018 14:20:40 -0700 Subject: [PATCH 2/9] adding new x86 phase to yml script --- build/vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 902d3d983b..3a9438c9c2 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -119,7 +119,7 @@ phases: queue: name: DotNetCore-Build demands: - - agent.os -equals Windows + - agent.os -equals Windows_x86 steps: - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1 From caac51839e1018b71ea06c80283d4373e61d9f0e Mon Sep 17 00:00:00 2001 From: Artidoro Pagnoni Date: Thu, 18 Oct 2018 14:25:01 -0700 Subject: [PATCH 3/9] adding new x86 phase to yml script --- build/vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 3a9438c9c2..b65dc8cf09 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -119,7 +119,7 @@ phases: queue: name: DotNetCore-Build demands: - - agent.os -equals Windows_x86 + - agent.os -equals win_x86 steps: - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1 From 6b9779f6e3dea88b53e060eda8b1103cd8af0380 Mon Sep 17 00:00:00 2001 From: Artidoro Pagnoni Date: Thu, 18 Oct 2018 14:38:30 -0700 Subject: [PATCH 4/9] adding new x86 phase to yml script --- build/vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index b65dc8cf09..6d9bb49810 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -119,7 +119,7 @@ phases: queue: name: DotNetCore-Build demands: - - agent.os -equals win_x86 + - agent.os -equals Windows_NT steps: - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1 From 5697e92e62ff816bc252307a4e80e9de3bd25b46 Mon Sep 17 00:00:00 2001 From: Artidoro Pagnoni Date: Thu, 18 Oct 2018 14:54:39 -0700 Subject: [PATCH 5/9] adding x86 pr verification build --- .vsts-dotnet-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index ec62ce2431..c56e7265f3 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -23,6 +23,13 @@ phases: queue: name: Hosted VS2017 +- template: /build/ci/phase-template.yml + parameters: + name: Windows_NT_x86 + buildScript: build.cmd -buildArch=x86 + queue: + name: Hosted VS2017 + - template: /build/ci/phase-template.yml parameters: name: MacOS From 7689fcb0617fbea66fa91fef680189a9bb2c2f45 Mon Sep 17 00:00:00 2001 From: Artidoro Pagnoni Date: Thu, 18 Oct 2018 15:44:54 -0700 Subject: [PATCH 6/9] removing PR verification build, as it will come in another pr --- .vsts-dotnet-ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index c56e7265f3..fa7c7a139c 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -20,13 +20,6 @@ phases: parameters: name: Windows_NT buildScript: build.cmd - queue: - name: Hosted VS2017 - -- template: /build/ci/phase-template.yml - parameters: - name: Windows_NT_x86 - buildScript: build.cmd -buildArch=x86 queue: name: Hosted VS2017 From 50287d097ff0a079fe35b252a8b98888b48cb39d Mon Sep 17 00:00:00 2001 From: Artidoro Pagnoni Date: Mon, 22 Oct 2018 10:50:30 -0700 Subject: [PATCH 7/9] only building native assests for official x86 build --- build/vsts-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 6d9bb49810..99d2bb63a1 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -58,7 +58,7 @@ phases: artifactType: container ################################################################################ -- phase: Windows +- phase: Windows_x86 ################################################################################ variables: BuildConfig: Release @@ -86,11 +86,11 @@ phases: continueOnError: false condition: and(succeeded(), in(variables._SignType, 'real', 'test')) - - script: ./build.cmd -$(BuildConfig) + - script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 displayName: Build - task: MSBuild@1 - displayName: Sign Windows Binaries + displayName: Sign Windows_x86 Binaries inputs: solution: build/sign.proj msbuildArguments: /p:SignType=$(_SignType) @@ -98,14 +98,14 @@ phases: continueOnError: false - task: PublishBuildArtifacts@1 - displayName: Publish Windows package assets + displayName: Publish Windows_x86 package assets inputs: pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages artifactName: PackageAssets artifactType: container ################################################################################ -- phase: Windows_x86 +- phase: Windows ################################################################################ variables: BuildConfig: Release @@ -133,11 +133,11 @@ phases: continueOnError: false condition: and(succeeded(), in(variables._SignType, 'real', 'test')) - - script: ./build.cmd -$(BuildConfig) -buildArch=x86 + - script: ./build.cmd -$(BuildConfig) displayName: Build - task: MSBuild@1 - displayName: Sign Windows_x86 Binaries + displayName: Sign Windows Binaries inputs: solution: build/sign.proj msbuildArguments: /p:SignType=$(_SignType) @@ -145,7 +145,7 @@ phases: continueOnError: false - task: PublishBuildArtifacts@1 - displayName: Publish Windows_x86 package assets + displayName: Publish Windows package assets inputs: pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages artifactName: PackageAssets From a524583715b1f6ac22706afcba55e9d0667f38cb Mon Sep 17 00:00:00 2001 From: Artidoro Pagnoni Date: Mon, 22 Oct 2018 10:59:03 -0700 Subject: [PATCH 8/9] naming change --- build/vsts-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 99d2bb63a1..dea48f3aa9 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -105,7 +105,7 @@ phases: artifactType: container ################################################################################ -- phase: Windows +- phase: Windows_x64 ################################################################################ variables: BuildConfig: Release @@ -157,8 +157,8 @@ phases: dependsOn: - Linux - MacOS - - Windows - Windows_x86 + - Windows_x64 variables: BuildConfig: Release OfficialBuildId: $(BUILD.BUILDNUMBER) From 8c58f56b53b4a367763f1207eafcc3d91c67b45f Mon Sep 17 00:00:00 2001 From: Artidoro Pagnoni Date: Thu, 25 Oct 2018 10:27:50 -0700 Subject: [PATCH 9/9] adding comments --- build/vsts-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index dea48f3aa9..c6b72d95a2 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -23,6 +23,7 @@ phases: - agent.os -equals linux container: LinuxContainer steps: + # Only build native assets to avoid conflicts. - script: ./build.sh -buildNative -$(BuildConfig) displayName: Build @@ -47,6 +48,7 @@ phases: demands: - agent.os -equals Darwin steps: + # Only build native assets to avoid conflicts. - script: ./build.sh -buildNative -$(BuildConfig) displayName: Build @@ -86,6 +88,7 @@ phases: continueOnError: false condition: and(succeeded(), in(variables._SignType, 'real', 'test')) + # Only build native assets to avoid conflicts. - script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 displayName: Build @@ -133,11 +136,12 @@ phases: continueOnError: false condition: and(succeeded(), in(variables._SignType, 'real', 'test')) + # Build both native and managed assets. - script: ./build.cmd -$(BuildConfig) displayName: Build - task: MSBuild@1 - displayName: Sign Windows Binaries + displayName: Sign Windows_x64 Binaries inputs: solution: build/sign.proj msbuildArguments: /p:SignType=$(_SignType) @@ -145,7 +149,7 @@ phases: continueOnError: false - task: PublishBuildArtifacts@1 - displayName: Publish Windows package assets + displayName: Publish Windows_x64 package assets inputs: pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages artifactName: PackageAssets