Skip to content

Commit f6a4b3d

Browse files
committed
Enable normal Arcade publish infrastructure
- create manifests and artifacts as post-build expects plus - enable test signing in internal PRs
1 parent 74555e3 commit f6a4b3d

File tree

3 files changed

+25
-14
lines changed

3 files changed

+25
-14
lines changed

.azure/pipelines/ci.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ variables:
3333
- ${{ if ne(variables['System.TeamProject'], 'internal') }}:
3434
- name: _BuildArgs
3535
value: ''
36-
- name: _SigningArgs
36+
- name: _PublishArgs
3737
value: ''
3838
- name: _SignType
3939
value: ''
@@ -50,9 +50,9 @@ variables:
5050
- name: _SignType
5151
value: real
5252

53-
# The following extra properties are not set when building on Linux or macOS but are needed on Windows.
54-
- name: _SigningArgs
55-
value: /p:DotNetSignType=$(_SignType)
53+
# The following extra properties are not set when testing. Use with final build.[cmd,sh] of asset-producing jobs.
54+
- name: _PublishArgs
55+
value: /p:Publish=true
5656
/p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
5757
/p:DotNetPublishBlobFeedUrl=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
5858
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
@@ -63,8 +63,8 @@ variables:
6363
value: ''
6464
- name: _SignType
6565
valule: test
66-
- name: _SigningArgs
67-
value: /p:DotNetSignType=$(_SignType)
66+
- name: _PublishArgs
67+
value: ''
6868

6969
stages:
7070
- stage: build
@@ -111,7 +111,6 @@ stages:
111111
-buildNative
112112
/bl:artifacts/log/build.x64.binlog
113113
$(_BuildArgs)
114-
$(_SigningArgs)
115114
displayName: Build x64
116115

117116
# Build the x86 shared framework
@@ -127,7 +126,6 @@ stages:
127126
/p:OnlyPackPlatformSpecificPackages=true
128127
/bl:artifacts/log/build.x86.binlog
129128
$(_BuildArgs)
130-
$(_SigningArgs)
131129
displayName: Build x86
132130

133131
# This is in a separate build step with -forceCoreMsbuild to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53
@@ -136,7 +134,6 @@ stages:
136134
-pack
137135
-noBuildDeps
138136
$(_BuildArgs)
139-
$(_SigningArgs)
140137
displayName: Build SiteExtension
141138

142139
# This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If https://github.com/dotnet/arcade/issues/1957 is resolved,
@@ -148,8 +145,8 @@ stages:
148145
-noRestore
149146
-sign
150147
/bl:artifacts/log/build.codesign.binlog
148+
/p:DotNetSignType=$(_SignType)
151149
$(_BuildArgs)
152-
$(_SigningArgs)
153150
displayName: Code sign packages
154151

155152
# Windows installers bundle both x86 and x64 assets
@@ -158,8 +155,9 @@ stages:
158155
-sign
159156
-buildInstallers
160157
/bl:artifacts/log/installers.msbuild.binlog
158+
/p:DotNetSignType=$(_SignType)
161159
$(_BuildArgs)
162-
$(_SigningArgs)
160+
$(_PublishArgs)
163161
displayName: Build Installers
164162

165163
artifacts:
@@ -186,10 +184,11 @@ stages:
186184
-pack
187185
-noBuildNodeJS
188186
-noBuildJava
189-
/p:OnlyPackPlatformSpecificPackages=true
190187
/bl:artifacts/log/build.win-arm.binlog
188+
/p:DotNetSignType=$(_SignType)
189+
/p:OnlyPackPlatformSpecificPackages=true
191190
$(_BuildArgs)
192-
$(_SigningArgs)
191+
$(_PublishArgs)
193192
installNodeJs: false
194193
installJdk: false
195194
artifacts:
@@ -215,6 +214,7 @@ stages:
215214
-p:OnlyPackPlatformSpecificPackages=true
216215
-bl:artifacts/log/build.macos.binlog
217216
$(_BuildArgs)
217+
$(_PublishArgs)
218218
installNodeJs: false
219219
installJdk: false
220220
artifacts:
@@ -274,6 +274,7 @@ stages:
274274
-p:LinuxInstallerType=rpm \
275275
-bl:artifacts/log/build.rpm.binlog \
276276
$(_BuildArgs)
277+
$(_PublishArgs)
277278
displayName: Build RPM installers
278279
installNodeJs: false
279280
installJdk: false
@@ -304,6 +305,7 @@ stages:
304305
-p:OnlyPackPlatformSpecificPackages=true
305306
-bl:artifacts/log/build.linux-arm.binlog
306307
$(_BuildArgs)
308+
$(_PublishArgs)
307309
installNodeJs: false
308310
installJdk: false
309311
artifacts:
@@ -333,6 +335,7 @@ stages:
333335
-p:OnlyPackPlatformSpecificPackages=true
334336
-bl:artifacts/log/build.arm64.binlog
335337
$(_BuildArgs)
338+
$(_PublishArgs)
336339
installNodeJs: false
337340
installJdk: false
338341
artifacts:
@@ -365,6 +368,7 @@ stages:
365368
-p:OnlyPackPlatformSpecificPackages=true
366369
-bl:artifacts/log/build.musl.binlog
367370
$(_BuildArgs)
371+
$(_PublishArgs)
368372
installNodeJs: false
369373
installJdk: false
370374
artifacts:
@@ -397,6 +401,7 @@ stages:
397401
-p:OnlyPackPlatformSpecificPackages=true
398402
-bl:artifacts/log/build.musl.binlog
399403
$(_BuildArgs)
404+
$(_PublishArgs)
400405
installNodeJs: false
401406
installJdk: false
402407
artifacts:

.azure/pipelines/jobs/codesign-xplat.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ jobs:
2525
displayName: Code-sign .nupkg files
2626
inputs:
2727
solution: eng\tools\XplatPackageSigner\XplatPackageSigner.proj
28-
msbuildArguments: $(_SigningArgs)
28+
msbuildArguments: /p:SignType=$(_SignType)
29+
$(_PublishArgs)
2930
/p:DirectoryToSign=$(Build.StagingDirectory)\deps\${{ parameters.inputName }}_Packages\
3031
artifacts:
3132
- name: ${{ parameters.inputName }}_Packages_Signed

Directory.Build.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@
125125
<SymbolsOutputPath>$(ArtifactsDir)symbols\$(Configuration)\</SymbolsOutputPath>
126126
</PropertyGroup>
127127

128+
<!-- Include our "loose" PDBs when publishing. -->
129+
<ItemGroup>
130+
<FilesToPublishToSymbolServer Include="$(SymbolsOutputPath)**\*.pdb" />
131+
</ItemGroup>
132+
128133
<!-- Ensure these output paths exist. -->
129134
<ItemGroup>
130135
<CreateDirectory Include="$(InstallersOutputPath)" />

0 commit comments

Comments
 (0)