Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .vsts-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ trigger:
# Once they exist, we should define these as "runtime parameters"
# https://github.com/Microsoft/azure-pipelines-yaml/pull/129
# variables:
# SignType: real
# SkipApplyOptimizationData: false

parameters:
Expand All @@ -18,6 +17,10 @@ parameters:
displayName: Enable Signing Validation
type: boolean
default: true
- name: signTypeParameter
displayName: Sign Type
type: string
default: 'real'

variables:
- group: DotNet-Blob-Feed
Expand Down Expand Up @@ -74,6 +77,7 @@ extends:
parameters:
isExperimental: false
enableComponentGovernance: true
signTypeParameter: ${{ parameters.signTypeParameter }}

- template: /eng/common/templates-official/post-build/post-build.yml@self
parameters:
Expand Down
11 changes: 7 additions & 4 deletions azure-pipelines/.vsts-dotnet-build-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ parameters:
- name: enableComponentGovernance
type: boolean
default: false
- name: signTypeParameter
type: string
default: 'test'

jobs:
- job: Windows_NT
Expand Down Expand Up @@ -43,14 +46,14 @@ jobs:
- task: MicroBuildSigningPlugin@4
displayName: Install MicroBuild plugin
inputs:
signType: $(SignType)
signType: ${{ parameters.signTypeParameter }}
zipSources: false
feedSource: https://devdiv.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
${{ if and(eq(variables['SignType'], 'real'), eq(variables['System.TeamProject'], 'DevDiv')) }}:
${{ if and(eq(parameters.signTypeParameter, 'real'), eq(variables['System.TeamProject'], 'DevDiv')) }}:
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
condition: and(succeeded(), in(variables['SignType'], 'test', 'real'))
condition: and(succeeded(), in('${{ parameters.signTypeParameter }}', 'test', 'real'))

- task: MicroBuildOptProfPlugin@6
inputs:
Expand All @@ -73,7 +76,7 @@ jobs:
/p:VisualStudioIbcSourceBranchName=$(SourceBranch)
/p:VisualStudioDropAccessToken=$(System.AccessToken)
/p:VisualStudioDropName=$(VisualStudio.DropName)
/p:DotNetSignType=$(SignType)
/p:DotNetSignType=${{ parameters.signTypeParameter }}
/p:DotNetPublishToBlobFeed=true
/p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
/p:DotNetPublishBlobFeedUrl=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
Expand Down
6 changes: 5 additions & 1 deletion azure-pipelines/.vsts-dotnet-exp-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ trigger:
# Once they exist, we should define these as "runtime parameters"
# https://github.com/Microsoft/azure-pipelines-yaml/pull/129
# variables:
# SignType: test
# SkipApplyOptimizationData: false

parameters:
Expand All @@ -17,6 +16,10 @@ parameters:
displayName: Enable Signing Validation
type: boolean
default: false
- name: signTypeParameter
displayName: Sign Type
type: string
default: 'test'

variables:
# if OptProfDrop is not set, string '$(OptProfDrop)' will be passed to the build script.
Expand Down Expand Up @@ -72,6 +75,7 @@ extends:
parameters:
isExperimental: true
enableComponentGovernance: false
signTypeParameter: ${{ parameters.signTypeParameter }}

- template: /eng/common/templates/post-build/post-build.yml@self
parameters:
Expand Down