Skip to content

Commit 106a84c

Browse files
authored
Introducing official x86 CI build (#1306)
1 parent c726f7f commit 106a84c

File tree

2 files changed

+57
-5
lines changed

2 files changed

+57
-5
lines changed

.vsts-dotnet-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ phases:
2121
name: Windows_NT
2222
buildScript: build.cmd
2323
queue:
24-
name: Hosted VS2017
24+
name: Hosted VS2017
2525

2626
- template: /build/ci/phase-template.yml
2727
parameters:

build/vsts-ci.yml

+56-4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ phases:
2323
- agent.os -equals linux
2424
container: LinuxContainer
2525
steps:
26+
# Only build native assets to avoid conflicts.
2627
- script: ./build.sh -buildNative -$(BuildConfig)
2728
displayName: Build
2829

@@ -47,6 +48,7 @@ phases:
4748
demands:
4849
- agent.os -equals Darwin
4950
steps:
51+
# Only build native assets to avoid conflicts.
5052
- script: ./build.sh -buildNative -$(BuildConfig)
5153
displayName: Build
5254

@@ -58,7 +60,7 @@ phases:
5860
artifactType: container
5961

6062
################################################################################
61-
- phase: Windows
63+
- phase: Windows_x86
6264
################################################################################
6365
variables:
6466
BuildConfig: Release
@@ -86,19 +88,68 @@ phases:
8688
continueOnError: false
8789
condition: and(succeeded(), in(variables._SignType, 'real', 'test'))
8890

91+
# Only build native assets to avoid conflicts.
92+
- script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86
93+
displayName: Build
94+
95+
- task: MSBuild@1
96+
displayName: Sign Windows_x86 Binaries
97+
inputs:
98+
solution: build/sign.proj
99+
msbuildArguments: /p:SignType=$(_SignType)
100+
msbuildVersion: 15.0
101+
continueOnError: false
102+
103+
- task: PublishBuildArtifacts@1
104+
displayName: Publish Windows_x86 package assets
105+
inputs:
106+
pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages
107+
artifactName: PackageAssets
108+
artifactType: container
109+
110+
################################################################################
111+
- phase: Windows_x64
112+
################################################################################
113+
variables:
114+
BuildConfig: Release
115+
OfficialBuildId: $(BUILD.BUILDNUMBER)
116+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
117+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
118+
DOTNET_MULTILEVEL_LOOKUP: 0
119+
_SignType: real
120+
_UseEsrpSigning: true
121+
_TeamName: DotNetCore
122+
queue:
123+
name: DotNetCore-Build
124+
demands:
125+
- agent.os -equals Windows_NT
126+
steps:
127+
128+
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1
129+
displayName: Install MicroBuild Signing Plugin
130+
inputs:
131+
signType: '$(_SignType)'
132+
zipSources: false
133+
esrpSigning: '$(_UseEsrpSigning)'
134+
env:
135+
TeamName: $(_TeamName)
136+
continueOnError: false
137+
condition: and(succeeded(), in(variables._SignType, 'real', 'test'))
138+
139+
# Build both native and managed assets.
89140
- script: ./build.cmd -$(BuildConfig)
90141
displayName: Build
91142

92143
- task: MSBuild@1
93-
displayName: Sign Windows Binaries
144+
displayName: Sign Windows_x64 Binaries
94145
inputs:
95146
solution: build/sign.proj
96147
msbuildArguments: /p:SignType=$(_SignType)
97148
msbuildVersion: 15.0
98149
continueOnError: false
99150

100151
- task: PublishBuildArtifacts@1
101-
displayName: Publish Windows package assets
152+
displayName: Publish Windows_x64 package assets
102153
inputs:
103154
pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages
104155
artifactName: PackageAssets
@@ -110,7 +161,8 @@ phases:
110161
dependsOn:
111162
- Linux
112163
- MacOS
113-
- Windows
164+
- Windows_x86
165+
- Windows_x64
114166
variables:
115167
BuildConfig: Release
116168
OfficialBuildId: $(BUILD.BUILDNUMBER)

0 commit comments

Comments
 (0)