Skip to content

Commit e48e542

Browse files
authored
[release/5.0-rc2] Sign CrossOSDiag packages even with post-build signing (#42688)
* Sign CrossOsDiag packages even in Post-Build * Sign base as well as symbols packages * Install the plugin anyway * Use VS2019 pools
1 parent e9ac240 commit e48e542

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

eng/Signing.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,13 @@
159159
<ItemsToSign Include="$(CoreCLRSharedFrameworkDir)mscordaccore*.dll" />
160160
<ItemsToSign Include="$(CoreCLRSharedFrameworkDir)mscordbi.dll" />
161161
</ItemGroup>
162+
163+
<ItemGroup Condition="'$(SignFinalPackages)' == 'true'">
164+
<!-- The cross OS diagnostics symbol packages need to be signed as they are the only packages
165+
that have a specific version of assets that are only meant to be indexed in symbol servers.
166+
Since only *symbols.nupkg get indexed, and installer doesn't produce these, we need to glob them for signing. -->
167+
<ItemsToSign Include="$(DownloadDirectory)**\*CrossOsDiag*.nupkg" />
168+
</ItemGroup>
162169
</When>
163170
</Choose>
164171

eng/pipelines/official/jobs/prepare-signed-artifacts.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
dependsOn: ${{ parameters.dependsOn }}
1111
pool:
1212
name: NetCoreInternal-Pool
13-
queue: buildpool.windows.10.amd64.vs2017
13+
queue: buildpool.windows.10.amd64.vs2019
1414
# Double the default timeout.
1515
timeoutInMinutes: 120
1616
workspace:
@@ -34,8 +34,7 @@ jobs:
3434
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
3535
continueOnError: false
3636
condition: and(succeeded(),
37-
in(variables['SignType'], 'real', 'test'),
38-
ne(variables['PostBuildSign'], 'true'))
37+
in(variables['SignType'], 'real', 'test'))
3938

4039
- task: DownloadBuildArtifacts@0
4140
displayName: Download IntermediateUnsignedArtifacts

0 commit comments

Comments
 (0)