Skip to content

Commit 8bab15e

Browse files
YuliiaKovalovaJanProvaznikCopilot
authored
Add signtype to parameters (dotnet#12466)
Co-authored-by: Jan Provazník <janprovaznik@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 6289910 commit 8bab15e

3 files changed

Lines changed: 17 additions & 6 deletions

File tree

.vsts-dotnet.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ trigger:
66
# Once they exist, we should define these as "runtime parameters"
77
# https://github.com/Microsoft/azure-pipelines-yaml/pull/129
88
# variables:
9-
# SignType: real
109
# SkipApplyOptimizationData: false
1110

1211
parameters:
@@ -18,6 +17,10 @@ parameters:
1817
displayName: Enable Signing Validation
1918
type: boolean
2019
default: true
20+
- name: signTypeParameter
21+
displayName: Sign Type
22+
type: string
23+
default: 'real'
2124

2225
variables:
2326
- group: DotNet-Blob-Feed
@@ -74,6 +77,7 @@ extends:
7477
parameters:
7578
isExperimental: false
7679
enableComponentGovernance: true
80+
signTypeParameter: ${{ parameters.signTypeParameter }}
7781

7882
- template: /eng/common/templates-official/post-build/post-build.yml@self
7983
parameters:

azure-pipelines/.vsts-dotnet-build-jobs.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ parameters:
66
- name: enableComponentGovernance
77
type: boolean
88
default: false
9+
- name: signTypeParameter
10+
type: string
11+
default: 'test'
912

1013
jobs:
1114
- job: Windows_NT
@@ -43,14 +46,14 @@ jobs:
4346
- task: MicroBuildSigningPlugin@4
4447
displayName: Install MicroBuild plugin
4548
inputs:
46-
signType: $(SignType)
49+
signType: ${{ parameters.signTypeParameter }}
4750
zipSources: false
4851
feedSource: https://devdiv.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
49-
${{ if and(eq(variables['SignType'], 'real'), eq(variables['System.TeamProject'], 'DevDiv')) }}:
52+
${{ if and(eq(parameters.signTypeParameter, 'real'), eq(variables['System.TeamProject'], 'DevDiv')) }}:
5053
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
5154
env:
5255
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
53-
condition: and(succeeded(), in(variables['SignType'], 'test', 'real'))
56+
condition: and(succeeded(), in('${{ parameters.signTypeParameter }}', 'test', 'real'))
5457

5558
- task: MicroBuildOptProfPlugin@6
5659
inputs:
@@ -73,7 +76,7 @@ jobs:
7376
/p:VisualStudioIbcSourceBranchName=$(SourceBranch)
7477
/p:VisualStudioDropAccessToken=$(System.AccessToken)
7578
/p:VisualStudioDropName=$(VisualStudio.DropName)
76-
/p:DotNetSignType=$(SignType)
79+
/p:DotNetSignType=${{ parameters.signTypeParameter }}
7780
/p:DotNetPublishToBlobFeed=true
7881
/p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
7982
/p:DotNetPublishBlobFeedUrl=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json

azure-pipelines/.vsts-dotnet-exp-perf.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ trigger:
55
# Once they exist, we should define these as "runtime parameters"
66
# https://github.com/Microsoft/azure-pipelines-yaml/pull/129
77
# variables:
8-
# SignType: test
98
# SkipApplyOptimizationData: false
109

1110
parameters:
@@ -17,6 +16,10 @@ parameters:
1716
displayName: Enable Signing Validation
1817
type: boolean
1918
default: false
19+
- name: signTypeParameter
20+
displayName: Sign Type
21+
type: string
22+
default: 'test'
2023

2124
variables:
2225
# if OptProfDrop is not set, string '$(OptProfDrop)' will be passed to the build script.
@@ -72,6 +75,7 @@ extends:
7275
parameters:
7376
isExperimental: true
7477
enableComponentGovernance: false
78+
signTypeParameter: ${{ parameters.signTypeParameter }}
7579

7680
- template: /eng/common/templates/post-build/post-build.yml@self
7781
parameters:

0 commit comments

Comments
 (0)