diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index ec62ce2431..fa7c7a139c 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -21,7 +21,7 @@ phases: name: Windows_NT buildScript: build.cmd queue: - name: Hosted VS2017 + name: Hosted VS2017 - template: /build/ci/phase-template.yml parameters: diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index fc3184bfc9..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 @@ -58,7 +60,7 @@ phases: artifactType: container ################################################################################ -- phase: Windows +- phase: Windows_x86 ################################################################################ variables: BuildConfig: Release @@ -86,11 +88,60 @@ 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 + + - 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: Windows_x64 +################################################################################ + 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_NT + 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')) + + # 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) @@ -98,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 @@ -110,7 +161,8 @@ phases: dependsOn: - Linux - MacOS - - Windows + - Windows_x86 + - Windows_x64 variables: BuildConfig: Release OfficialBuildId: $(BUILD.BUILDNUMBER)