Skip to content

Commit d4a8ecb

Browse files
committed
Merge in 'release/8.0' changes
2 parents 3d79865 + e97162e commit d4a8ecb

File tree

6 files changed

+349
-505
lines changed

6 files changed

+349
-505
lines changed

azure-pipelines-PR.yml

Lines changed: 13 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,8 @@ variables:
6565
value: ${{ contains(variables['Build.SourceBranch'], 'main') }}
6666
- name: NativeToolsOnMachine
6767
value: true
68-
- name: isPublic
69-
value: ${{ eq(variables['System.TeamProject'], 'public') }}
70-
- name: isPR
71-
value: ${{ eq(variables['Build.Reason'], 'PullRequest')}}
7268

73-
# used for post-build phases, internal builds only
74-
- ${{ if and(ne(variables['isPublic'], 'true'), ne(variables['isPR'], 'true')) }}:
75-
- group: DotNet-Winforms-SDLValidation-Params
69+
# used for post-build phases, no value for non-internal build
7670
- ${{ if ne(variables['System.TeamProject'], 'internal') }}:
7771
- name: _InternalRuntimeDownloadArgs
7872
value: ''
@@ -84,36 +78,18 @@ variables:
8478
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
8579

8680
# Produce test-signed build for PR and Public builds
87-
- ${{ if or(eq(variables['isPublic'], 'true'), eq(variables['isPR'], 'true')) }}:
88-
# needed for darc (dependency flow) publishing
89-
- name: _PublishArgs
90-
value: ''
91-
- name: _OfficialBuildIdArgs
92-
value: ''
93-
# needed for signing
94-
- name: _SignType
95-
value: test
96-
- name: _SignArgs
97-
value: ''
98-
- name: _Sign
99-
value: false
100-
101-
# Set up non-PR build from internal project
102-
- ${{ if and(ne(variables['isPublic'], 'true'), ne(variables['isPR'], 'true')) }}:
103-
# needed for darc (dependency flow) publishing
104-
- name: _PublishArgs
105-
value: >-
106-
/p:DotNetPublishUsingPipelines=true
107-
- name: _OfficialBuildIdArgs
108-
value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
109-
# needed for signing
110-
- name: _SignType
111-
value: real
112-
- name: _SignArgs
113-
value: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) /p:Sign=$(_Sign)
114-
- name: _Sign
115-
value: true
116-
81+
# needed for darc (dependency flow) publishing
82+
- name: _PublishArgs
83+
value: ''
84+
- name: _OfficialBuildIdArgs
85+
value: ''
86+
# needed for signing
87+
- name: _SignType
88+
value: test
89+
- name: _SignArgs
90+
value: ''
91+
- name: _Sign
92+
value: false
11793

11894
stages:
11995

@@ -140,57 +116,3 @@ stages:
140116
name: Windows_arm64
141117
targetArchitecture: arm64
142118
skipTests: $(SkipTests)
143-
144-
145-
- ${{ if and(eq(variables['EnableLoc'], 'true'), ne(variables['isPublic'], 'true'), ne(variables['isPR'], 'true')) }}:
146-
- stage: OneLocBuild
147-
displayName: Publish localizable content to OneLocBuild
148-
jobs:
149-
- template: /eng/common/templates/job/onelocbuild.yml
150-
parameters:
151-
MirrorRepo: winforms
152-
UseCheckedInLocProjectJson: true
153-
LclSource: lclFilesfromPackage
154-
LclPackageId: 'LCL-JUNO-PROD-WINFORMS'
155-
156-
157-
- ${{ if and(ne(variables['isPublic'], 'true'), ne(variables['isPR'], 'true')) }}:
158-
- stage: PublishAssetRegistry
159-
displayName: Publish to Build Asset Registry
160-
dependsOn: Build
161-
variables:
162-
- template: /eng/common/templates/variables/pool-providers.yml
163-
jobs:
164-
# Publish to Build Asset Registry in order to generate the ReleaseConfigs artifact.
165-
- template: /eng/common/templates/job/publish-build-assets.yml
166-
parameters:
167-
publishUsingPipelines: true
168-
pool:
169-
name: $(DncEngInternalBuildPool)
170-
demands: ImageOverride -equals windows.vs2022preview.amd64
171-
172-
173-
# Copied from the arcade repo and modified for winforms
174-
- ${{ if and(ne(variables['isPublic'], 'true'), ne(variables['isPR'], 'true')) }}:
175-
- template: /eng/common/templates/post-build/post-build.yml
176-
parameters:
177-
validateDependsOn: PublishAssetRegistry
178-
publishingInfraVersion: 3
179-
enableSymbolValidation: false
180-
enableSigningValidation: false
181-
enableNugetValidation: false
182-
enableSourceLinkValidation: false
183-
# these param values come from the DotNet-Winforms-SDLValidation-Params azdo variable group
184-
SDLValidationParameters:
185-
enable: false
186-
params: ' -SourceToolsList $(_TsaSourceToolsList)
187-
-TsaInstanceURL $(_TsaInstanceURL)
188-
-TsaProjectName $(_TsaProjectName)
189-
-TsaNotificationEmail $(_TsaNotificationEmail)
190-
-TsaCodebaseAdmin $(_TsaCodebaseAdmin)
191-
-TsaBugAreaPath $(_TsaBugAreaPath)
192-
-TsaIterationPath $(_TsaIterationPath)
193-
-TsaRepositoryName $(_TsaRepositoryName)
194-
-TsaCodebaseName $(_TsaCodebaseName)
195-
-TsaOnboard $(_TsaOnboard)
196-
-TsaPublish $(_TsaPublish)'

0 commit comments

Comments
 (0)