Skip to content

Commit bd92af4

Browse files
kythantkythant
authored
Remove IsOneBranch conditionals and delete non-OneBranch pipeline files (always OneBranch now) (#6350)
1 parent 1ce9c9a commit bd92af4

15 files changed

Lines changed: 21 additions & 461 deletions

‎build/AzurePipelinesTemplates/WindowsAppSDK-Build-Per-Platform-Stage.yml‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ parameters:
22
- name: "SignOutput"
33
type: boolean
44
default: false
5-
- name: "IsOneBranch"
6-
type: boolean
7-
default: true
85
- name: runApiScan
96
type: boolean
107
default: true
@@ -28,12 +25,7 @@ stages:
2825
jobs:
2926
- job: BuildFoundation
3027
pool:
31-
${{ if parameters.IsOneBranch }}:
32-
type: windows
33-
${{ if not( parameters.IsOneBranch ) }}:
34-
type: windows
35-
isCustom: true
36-
name: 'ProjectReunionESPool-2022'
28+
type: windows
3729
# In the less likely case of running APIScan and/or PREfast, give it more time.
3830
${{ if or(parameters.runApiScan, parameters.runPREfast) }}:
3931
timeoutInMinutes: 180
@@ -104,19 +96,13 @@ stages:
10496
- template: WindowsAppSDK-BuildFoundation-Steps.yml@self
10597
parameters:
10698
SignOutput: ${{ parameters.SignOutput }}
107-
IsOneBranch: ${{ parameters.IsOneBranch }}
10899
runApiScan: ${{ parameters.runApiScan }}
109100
runPREfast: ${{ parameters.runPREfast }}
110101

111102
- job: BuildMRT
112103
pool:
113104
# read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
114-
${{ if parameters.IsOneBranch }}:
115-
type: windows
116-
${{ if not( parameters.IsOneBranch ) }}:
117-
type: windows
118-
isCustom: true
119-
name: 'ProjectReunionESPool-2022'
105+
type: windows
120106
# In the less likely case of running APIScan and/or PREfast, give it more time.
121107
${{ if or(parameters.runApiScan, parameters.runPREfast) }}:
122108
timeoutInMinutes: 150
@@ -189,7 +175,6 @@ stages:
189175
- template: WindowsAppSDK-BuildMRT-Steps.yml@self
190176
parameters:
191177
SignOutput: ${{ parameters.SignOutput }}
192-
IsOneBranch: ${{ parameters.IsOneBranch }}
193178
runPREfast : ${{ parameters.runPREfast }}
194179
runApiScan : ${{ parameters.runApiScan }}
195180

‎build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ parameters:
22
- name: "SignOutput"
33
type: boolean
44
default: false
5-
- name: "IsOneBranch"
6-
type: boolean
7-
default: true
85
- name: runApiScan
96
type: boolean
107
default: true
@@ -40,12 +37,7 @@ stages:
4037
# For now, this job just builds Microsoft.WindowsAppRuntime.Bootstrap.Net.dll in AnyCPU
4138
# Can be expanded to add any other binary as needed
4239
pool:
43-
${{ if parameters.IsOneBranch }}:
44-
type: windows
45-
${{ if not( parameters.IsOneBranch ) }}:
46-
type: windows
47-
isCustom: true
48-
name: 'ProjectReunionESPool-2022'
40+
type: windows
4941
variables:
5042
ob_outputDirectory: '$(REPOROOT)\out'
5143
ob_sdl_codeSignValidation_excludes: '-|**\Release\**'
@@ -66,15 +58,13 @@ stages:
6658
- template: WindowsAppSDK-BuildFoundation-AnyCPU-Steps.yml@self
6759
parameters:
6860
SignOutput: ${{ parameters.SignOutput }}
69-
IsOneBranch: ${{ parameters.IsOneBranch }}
7061
runPREfast : ${{ parameters.runPREfast }}
7162

7263
# extract BuildFoundation and BuildMRT into WindowsAppSDK-Build-Stage-Per-Platform.yml. Separate the build stage per platform
7364

7465
- template: WindowsAppSDK-Build-Per-Platform-Stage.yml@self
7566
parameters:
7667
SignOutput: ${{ parameters.SignOutput }}
77-
IsOneBranch: ${{ parameters.IsOneBranch }}
7868
runPREfast : ${{ parameters.runPREfast }}
7969
runApiScan : ${{ parameters.runApiScan }}
8070
BuildPlatform: x64
@@ -84,7 +74,6 @@ stages:
8474
- template: WindowsAppSDK-Build-Per-Platform-Stage.yml@self
8575
parameters:
8676
SignOutput: ${{ parameters.SignOutput }}
87-
IsOneBranch: ${{ parameters.IsOneBranch }}
8877
runPREfast : ${{ parameters.runPREfast }}
8978
runApiScan : ${{ parameters.runApiScan }}
9079
BuildPlatform: x86
@@ -93,7 +82,6 @@ stages:
9382
- template: WindowsAppSDK-Build-Per-Platform-Stage.yml@self
9483
parameters:
9584
SignOutput: ${{ parameters.SignOutput }}
96-
IsOneBranch: ${{ parameters.IsOneBranch }}
9785
runPREfast : ${{ parameters.runPREfast }}
9886
runApiScan : ${{ parameters.runApiScan }}
9987
BuildPlatform: arm64

‎build/AzurePipelinesTemplates/WindowsAppSDK-BuildAndTestSampleApps-Stage.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
# 3. Foundation pipeline only supports running sample app testing in one specific stage.
66

77
parameters:
8-
- name: "IsOneBranch"
9-
type: boolean
10-
default: true
118
- name: TestSampleApps
129
displayName: "Test launch of Sample apps separately in the TestSampleApps Stage"
1310
type: boolean
@@ -72,7 +69,6 @@ stages:
7269
jobs:
7370
- template: WindowsAppSDK-BuildSamplesCompat-Job.yml
7471
parameters:
75-
IsOneBranch: ${{ parameters.IsOneBranch }}
7672
JobName: "SamplesCompatTest"
7773
FeatureAreas: ${{ parameters.sampleFeatureAreasList.SamplesCompatTest }}
7874
BuildConfig:
@@ -96,7 +92,6 @@ stages:
9692
jobs:
9793
- template: WindowsAppSDK-BuildSamplesCompat-Job.yml
9894
parameters:
99-
IsOneBranch: ${{ parameters.IsOneBranch }}
10095
JobName: "SamplesCompatTest"
10196
FeatureAreas: ${{ parameters.sampleFeatureAreasList.SamplesCompatTest }}
10297
BuildConfig:
@@ -126,7 +121,6 @@ stages:
126121
samplesArtifactName: ${{ parameters.SamplesBuildOutputArtifactName }}_x64
127122
callingStage: 'TestSampleApps'
128123
sampleFeatureAreasList: ${{ parameters.sampleFeatureAreasList }}
129-
IsOneBranch: ${{ parameters.IsOneBranch }}
130124
TestMatrix: $[ variables.SampleAppsTests ]
131125

132126
- ${{ if eq(parameters.TestOnArm64, true)}}:
@@ -144,5 +138,4 @@ stages:
144138
samplesArtifactName: ${{ parameters.SamplesBuildOutputArtifactName }}_arm64
145139
callingStage: 'TestSampleApps'
146140
sampleFeatureAreasList: ${{ parameters.sampleFeatureAreasList }}
147-
IsOneBranch: ${{ parameters.IsOneBranch }}
148-
TestMatrix: $[ variables.SampleAppsTestsArm64 ]
141+
TestMatrix: $[ variables.SampleAppsTestsArm64 ]

‎build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-AnyCPU-Steps.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ parameters:
22
- name: "SignOutput"
33
type: boolean
44
default: false
5-
- name: "IsOneBranch"
6-
type: boolean
7-
default: true
85
- name: runPREfast
96
type: boolean
107
default: false
@@ -21,8 +18,6 @@ steps:
2118
arguments: 'restore dev\WindowsAppRuntime_Insights\packages.config -ConfigFile NuGet.config -PackagesDirectory dev\WindowsAppRuntime_Insights\packages'
2219

2320
- template: WindowsAppSDK-SetupBuildEnvironment-Steps.yml
24-
parameters:
25-
IsOneBranch: ${{ parameters.IsOneBranch }}
2621

2722
- task: PowerShell@2
2823
name: BuildFoundation
@@ -77,8 +72,3 @@ steps:
7772
SourceFolder: '$(build.SourcesDirectory)\BuildOutput'
7873
TargetFolder: '$(ob_outputDirectory)'
7974

80-
- ${{ if not( parameters.IsOneBranch ) }}:
81-
- task: PublishBuildArtifacts@1
82-
inputs:
83-
PathtoPublish: '$(ob_outputDirectory)'
84-
artifactName: '$(ob_artifactBaseName)'

‎build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ parameters:
22
- name: "SignOutput"
33
type: boolean
44
default: false
5-
- name: "IsOneBranch"
6-
type: boolean
7-
default: true
85
- name: runApiScan
96
type: boolean
107
default: true
@@ -24,8 +21,6 @@ steps:
2421
arguments: 'restore dev\WindowsAppRuntime_Insights\packages.config -ConfigFile NuGet.config -PackagesDirectory dev\WindowsAppRuntime_Insights\packages'
2522

2623
- template: WindowsAppSDK-SetupBuildEnvironment-Steps.yml
27-
parameters:
28-
IsOneBranch: ${{ parameters.IsOneBranch }}
2924

3025
- task: NuGetAuthenticate@1
3126

@@ -172,9 +167,3 @@ steps:
172167
Contents: Microsoft.Taef.*\**
173168
TargetFolder: '$(ob_outputDirectory)\redist'
174169

175-
- ${{ if not( parameters.IsOneBranch ) }}:
176-
- task: PublishBuildArtifacts@1
177-
condition: always()
178-
inputs:
179-
PathtoPublish: '$(ob_outputDirectory)'
180-
artifactName: '$(ob_artifactBaseName)'

‎build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ parameters:
55
- name: IsOfficial
66
type: boolean
77
default: false
8-
- name: IsOneBranch
9-
type: boolean
10-
default: true
118
- name: runStaticAnalysis
129
type: boolean
1310
default: false
@@ -291,12 +288,11 @@ steps:
291288
failOnAlert: false
292289
condition: and(succeeded(), ne(variables.SkipInstallerBuild, true))
293290

294-
- ${{ if eq(parameters.IsOneBranch, 'true') }}:
295-
- template: ${{variables['System.DefaultWorkingDirectory']}}\AzurePipelinesTemplates\WindowsAppSDK-PublishSymbol-Steps.yml@WindowsAppSDKConfig
296-
parameters:
297-
SearchPattern: '$(foundationRepoPath)BuildOutput\$(buildConfiguration)\$(buildPlatform)\WindowsAppRuntimeInstall\*.pdb'
298-
IsOfficial: ${{ parameters.IsOfficial }}
299-
condition: and(succeeded(), ne(variables.SkipInstallerBuild, true))
291+
- template: ${{variables['System.DefaultWorkingDirectory']}}\AzurePipelinesTemplates\WindowsAppSDK-PublishSymbol-Steps.yml@WindowsAppSDKConfig
292+
parameters:
293+
SearchPattern: '$(foundationRepoPath)BuildOutput\$(buildConfiguration)\$(buildPlatform)\WindowsAppRuntimeInstall\*.pdb'
294+
IsOfficial: ${{ parameters.IsOfficial }}
295+
condition: and(succeeded(), ne(variables.SkipInstallerBuild, true))
300296

301297
- ${{ if eq(parameters.SignOutput, 'true') }}:
302298
- template: ${{variables['System.DefaultWorkingDirectory']}}\AzurePipelinesTemplates/WindowsAppSDK-EsrpCodeSigning-Steps.yml@WindowsAppSDKConfig
@@ -322,9 +318,3 @@ steps:
322318
workingDirectory: '$(Build.SourcesDirectory)'
323319
condition: and(succeeded(), ne(variables.SkipInstallerBuild, true))
324320

325-
- ${{ if ne(parameters.IsOneBranch, 'true') }}:
326-
- task: PublishBuildArtifacts@1
327-
condition: ne(variables.SkipInstallerBuild, true)
328-
inputs:
329-
PathtoPublish: '$(ob_outputDirectory)'
330-
artifactName: '$(ob_artifactBaseName)'

‎build/AzurePipelinesTemplates/WindowsAppSDK-BuildMRT-Steps.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ parameters:
22
- name: "SignOutput"
33
type: boolean
44
default: false
5-
- name: "IsOneBranch"
6-
type: boolean
7-
default: true
85
- name: runApiScan
96
type: boolean
107
default: true
@@ -14,8 +11,6 @@ parameters:
1411

1512
steps:
1613
- template: WindowsAppSDK-SetupBuildEnvironment-Steps.yml
17-
parameters:
18-
IsOneBranch: ${{ parameters.IsOneBranch }}
1914

2015
- task: WinUndockNativeCompiler@1
2116
displayName: 'Setup native compiler version override'
@@ -97,9 +92,3 @@ steps:
9792
SourceFolder: '$(build.SourcesDirectory)\BuildOutput'
9893
TargetFolder: '$(ob_outputDirectory)'
9994

100-
- ${{ if not( parameters.IsOneBranch ) }}:
101-
- task: PublishBuildArtifacts@1
102-
condition: always()
103-
inputs:
104-
PathtoPublish: '$(ob_outputDirectory)'
105-
artifactName: '$(ob_artifactBaseName)'

‎build/AzurePipelinesTemplates/WindowsAppSDK-BuildSamplesCompat-Job.yml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# This yml file is used to build sample apps, having the same structure and pattern as Aggregator repo:
22
# https://microsoft.visualstudio.com/ProjectReunion/_git/WindowsAppSDKAggregator?path=/build/AzurePipelinesTemplates/WindowsAppSDK-BuildSamplesCompat-Job.yml
33
parameters:
4-
- name: "IsOneBranch"
5-
type: boolean
6-
default: true
74
- name: JobName
85
type: string
96
default: 'SamplesCompatTest'
@@ -34,12 +31,7 @@ parameters:
3431
jobs:
3532
- job: ${{ parameters.JobName }}
3633
pool:
37-
${{ if parameters.IsOneBranch }}:
38-
type: windows
39-
${{ if not( parameters.IsOneBranch ) }}:
40-
type: windows
41-
isCustom: true
42-
name: 'ProjectReunionESPool-2022'
34+
type: windows
4335
timeoutInMinutes: 120
4436
strategy:
4537
maxParallel: ${{ parameters.maxParallel }}
@@ -384,12 +376,6 @@ jobs:
384376
condition: succeededOrFailed()
385377
displayName: DIAG - Show staging trees to validate filtering
386378
387-
- ${{ if not( parameters.IsOneBranch ) }}:
388-
- task: PublishBuildArtifacts@1
389-
inputs:
390-
PathtoPublish: '$(ob_outputDirectory)'
391-
artifactName: '$(ob_artifactBaseName)$(ob_artifactSuffix)'
392-
393379
# The idea of merging the artifacts for the featureAreas produced by one call to this yml file has
394380
# been attempted and abandoned. Although this will free the subsequent Stages that run the SampleTests
395381
# from needing to know the artifacts of the individual featureAreas and downloading them one by one,

‎build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ parameters:
22
- name: SignOutput
33
type: boolean
44
default: false
5-
- name: IsOneBranch
6-
type: boolean
7-
default: true
85
- name: IsOfficial
96
type: boolean
107
default: false
@@ -196,11 +193,10 @@ steps:
196193
codeSignPattern: |
197194
**/WindowsAppSDK.*.Extension.*.dll
198195
199-
- ${{ if eq(parameters.IsOneBranch, 'true') }}:
200-
- template: ${{variables['System.DefaultWorkingDirectory']}}\AzurePipelinesTemplates\WindowsAppSDK-PublishSymbol-Steps.yml@WindowsAppSDKConfig
201-
parameters:
202-
SearchPattern: '$(FoundationRepoPath)dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)\**\WindowsAppSDK*.pdb'
203-
IsOfficial: ${{ parameters.IsOfficial }}
196+
- template: ${{variables['System.DefaultWorkingDirectory']}}\AzurePipelinesTemplates\WindowsAppSDK-PublishSymbol-Steps.yml@WindowsAppSDKConfig
197+
parameters:
198+
SearchPattern: '$(FoundationRepoPath)dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)\**\WindowsAppSDK*.pdb'
199+
IsOfficial: ${{ parameters.IsOfficial }}
204200

205201
- task: CopyFiles@2
206202
displayName: 'Stage VSIX component JSONs'
@@ -234,8 +230,3 @@ steps:
234230
flattenFolders: true
235231
TargetFolder: '$(ob_outputDirectory)'
236232

237-
- ${{ if ne(parameters.IsOneBranch, 'true') }}:
238-
- task: PublishBuildArtifacts@1
239-
inputs:
240-
PathtoPublish: '$(ob_outputDirectory)'
241-
artifactName: '$(ob_artifactBaseName)'

0 commit comments

Comments
 (0)