Remove IsOneBranch conditionals and delete non-OneBranch pipeline files

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

@@ -2,9 +2,6 @@ parameters:
 - name: "SignOutput"
   type: boolean
   default: false
-- name: "IsOneBranch"
-  type: boolean
-  default: true
 - name: runApiScan
   type: boolean
   default: true
@@ -28,12 +25,7 @@ stages:
   jobs:
   - job: BuildFoundation
     pool:
-      ${{ if parameters.IsOneBranch }}:
-        type: windows
-      ${{ if not( parameters.IsOneBranch ) }}:
-        type: windows
-        isCustom: true
-        name: 'ProjectReunionESPool-2022'
+      type: windows
     # In the less likely case of running APIScan and/or PREfast, give it more time.
     ${{ if or(parameters.runApiScan, parameters.runPREfast) }}:
       timeoutInMinutes: 180
@@ -104,19 +96,13 @@ stages:
     - template: WindowsAppSDK-BuildFoundation-Steps.yml@self
       parameters:
         SignOutput: ${{ parameters.SignOutput }}
-        IsOneBranch: ${{ parameters.IsOneBranch }}
         runApiScan: ${{ parameters.runApiScan }}
         runPREfast: ${{ parameters.runPREfast }}
 
   - job: BuildMRT
     pool:
       # read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
-      ${{ if parameters.IsOneBranch }}:
-        type: windows
-      ${{ if not( parameters.IsOneBranch ) }}:
-        type: windows
-        isCustom: true
-        name: 'ProjectReunionESPool-2022'
+      type: windows
     # In the less likely case of running APIScan and/or PREfast, give it more time.
     ${{ if or(parameters.runApiScan, parameters.runPREfast) }}:
       timeoutInMinutes: 150
@@ -189,7 +175,6 @@ stages:
     - template: WindowsAppSDK-BuildMRT-Steps.yml@self
       parameters:
         SignOutput: ${{ parameters.SignOutput }}
-        IsOneBranch: ${{ parameters.IsOneBranch }}
         runPREfast : ${{ parameters.runPREfast }}
         runApiScan : ${{ parameters.runApiScan }}
 

build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml

@@ -2,9 +2,6 @@ parameters:
 - name: "SignOutput"
   type: boolean
   default: false
-- name: "IsOneBranch"
-  type: boolean
-  default: true
 - name: runApiScan
   type: boolean
   default: true
@@ -40,12 +37,7 @@ stages:
     # For now, this job just builds Microsoft.WindowsAppRuntime.Bootstrap.Net.dll in AnyCPU
     # Can be expanded to add any other binary as needed
     pool:
-      ${{ if parameters.IsOneBranch }}:
-        type: windows
-      ${{ if not( parameters.IsOneBranch ) }}:
-        type: windows
-        isCustom: true
-        name: 'ProjectReunionESPool-2022'
+      type: windows
     variables:
       ob_outputDirectory: '$(REPOROOT)\out'
       ob_sdl_codeSignValidation_excludes: '-|**\Release\**'
@@ -66,15 +58,13 @@ stages:
     - template: WindowsAppSDK-BuildFoundation-AnyCPU-Steps.yml@self
       parameters:
         SignOutput: ${{ parameters.SignOutput }}
-        IsOneBranch: ${{ parameters.IsOneBranch }}
         runPREfast : ${{ parameters.runPREfast }}
 
 # extract BuildFoundation and BuildMRT into WindowsAppSDK-Build-Stage-Per-Platform.yml. Separate the build stage per platform
 
 - template: WindowsAppSDK-Build-Per-Platform-Stage.yml@self
   parameters:
     SignOutput: ${{ parameters.SignOutput }}
-    IsOneBranch: ${{ parameters.IsOneBranch }}
     runPREfast : ${{ parameters.runPREfast }}
     runApiScan : ${{ parameters.runApiScan }}
     BuildPlatform: x64
@@ -84,7 +74,6 @@ stages:
   - template: WindowsAppSDK-Build-Per-Platform-Stage.yml@self
     parameters:
       SignOutput: ${{ parameters.SignOutput }}
-      IsOneBranch: ${{ parameters.IsOneBranch }}
       runPREfast : ${{ parameters.runPREfast }}
       runApiScan : ${{ parameters.runApiScan }}
       BuildPlatform: x86
@@ -93,7 +82,6 @@ stages:
   - template: WindowsAppSDK-Build-Per-Platform-Stage.yml@self
     parameters:
       SignOutput: ${{ parameters.SignOutput }}
-      IsOneBranch: ${{ parameters.IsOneBranch }}
       runPREfast : ${{ parameters.runPREfast }}
       runApiScan : ${{ parameters.runApiScan }}
       BuildPlatform: arm64

build/AzurePipelinesTemplates/WindowsAppSDK-BuildAndTestSampleApps-Stage.yml

@@ -5,9 +5,6 @@
 # 3. Foundation pipeline only supports running sample app testing in one specific stage.
 
 parameters:
-  - name: "IsOneBranch"
-    type: boolean
-    default: true
   - name: TestSampleApps
     displayName: "Test launch of Sample apps separately in the TestSampleApps Stage"
     type: boolean
@@ -72,7 +69,6 @@ stages:
   jobs:
   - template: WindowsAppSDK-BuildSamplesCompat-Job.yml
     parameters:
-      IsOneBranch: ${{ parameters.IsOneBranch }}
       JobName: "SamplesCompatTest"
       FeatureAreas: ${{ parameters.sampleFeatureAreasList.SamplesCompatTest }}
       BuildConfig:
@@ -96,7 +92,6 @@ stages:
   jobs:
   - template: WindowsAppSDK-BuildSamplesCompat-Job.yml
     parameters:
-      IsOneBranch: ${{ parameters.IsOneBranch }}
       JobName: "SamplesCompatTest"
       FeatureAreas: ${{ parameters.sampleFeatureAreasList.SamplesCompatTest }}
       BuildConfig:
@@ -126,7 +121,6 @@ stages:
         samplesArtifactName: ${{ parameters.SamplesBuildOutputArtifactName }}_x64
         callingStage: 'TestSampleApps'
         sampleFeatureAreasList: ${{ parameters.sampleFeatureAreasList }}
-        IsOneBranch: ${{ parameters.IsOneBranch }}
         TestMatrix: $[ variables.SampleAppsTests ]
 
   - ${{ if eq(parameters.TestOnArm64, true)}}:
@@ -144,5 +138,4 @@ stages:
           samplesArtifactName: ${{ parameters.SamplesBuildOutputArtifactName }}_arm64
           callingStage: 'TestSampleApps'
           sampleFeatureAreasList: ${{ parameters.sampleFeatureAreasList }}
-          IsOneBranch: ${{ parameters.IsOneBranch }}
-          TestMatrix: $[ variables.SampleAppsTestsArm64 ]
+          TestMatrix: $[ variables.SampleAppsTestsArm64 ]

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

@@ -2,9 +2,6 @@ parameters:
 - name: "SignOutput"
   type: boolean
   default: false
-- name: "IsOneBranch"
-  type: boolean
-  default: true
 - name: runPREfast
   type: boolean
   default: false
@@ -21,8 +18,6 @@ steps:
     arguments: 'restore dev\WindowsAppRuntime_Insights\packages.config -ConfigFile NuGet.config -PackagesDirectory dev\WindowsAppRuntime_Insights\packages'
 
 - template: WindowsAppSDK-SetupBuildEnvironment-Steps.yml
-  parameters:
-    IsOneBranch: ${{ parameters.IsOneBranch }}
 
 - task: PowerShell@2
   name: BuildFoundation
@@ -77,8 +72,3 @@ steps:
     SourceFolder: '$(build.SourcesDirectory)\BuildOutput'
     TargetFolder: '$(ob_outputDirectory)'
 
-- ${{ if not( parameters.IsOneBranch ) }}:
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: '$(ob_outputDirectory)'
-      artifactName: '$(ob_artifactBaseName)'

build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml

@@ -2,9 +2,6 @@ parameters:
 - name: "SignOutput"
   type: boolean
   default: false
-- name: "IsOneBranch"
-  type: boolean
-  default: true
 - name: runApiScan
   type: boolean
   default: true
@@ -24,8 +21,6 @@ steps:
     arguments: 'restore dev\WindowsAppRuntime_Insights\packages.config -ConfigFile NuGet.config -PackagesDirectory dev\WindowsAppRuntime_Insights\packages'
 
 - template: WindowsAppSDK-SetupBuildEnvironment-Steps.yml
-  parameters:
-    IsOneBranch: ${{ parameters.IsOneBranch }}
 
 - task: NuGetAuthenticate@1
 
@@ -172,9 +167,3 @@ steps:
     Contents: Microsoft.Taef.*\**
     TargetFolder: '$(ob_outputDirectory)\redist'
 
-- ${{ if not( parameters.IsOneBranch ) }}:
-  - task: PublishBuildArtifacts@1
-    condition: always()
-    inputs:
-      PathtoPublish: '$(ob_outputDirectory)'
-      artifactName: '$(ob_artifactBaseName)'

build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml

@@ -5,9 +5,6 @@ parameters:
 - name: IsOfficial
   type: boolean
   default: false 
-- name: IsOneBranch
-  type: boolean
-  default: true
 - name: runStaticAnalysis
   type: boolean
   default: false
@@ -291,12 +288,11 @@ steps:
     failOnAlert: false
   condition: and(succeeded(), ne(variables.SkipInstallerBuild, true))
 
-- ${{ if eq(parameters.IsOneBranch, 'true') }}:
-  - template: ${{variables['System.DefaultWorkingDirectory']}}\AzurePipelinesTemplates\WindowsAppSDK-PublishSymbol-Steps.yml@WindowsAppSDKConfig
-    parameters:
-      SearchPattern: '$(foundationRepoPath)BuildOutput\$(buildConfiguration)\$(buildPlatform)\WindowsAppRuntimeInstall\*.pdb'
-      IsOfficial: ${{ parameters.IsOfficial }}
-      condition: and(succeeded(), ne(variables.SkipInstallerBuild, true))
+- template: ${{variables['System.DefaultWorkingDirectory']}}\AzurePipelinesTemplates\WindowsAppSDK-PublishSymbol-Steps.yml@WindowsAppSDKConfig
+  parameters:
+    SearchPattern: '$(foundationRepoPath)BuildOutput\$(buildConfiguration)\$(buildPlatform)\WindowsAppRuntimeInstall\*.pdb'
+    IsOfficial: ${{ parameters.IsOfficial }}
+    condition: and(succeeded(), ne(variables.SkipInstallerBuild, true))
 
 - ${{ if eq(parameters.SignOutput, 'true') }}:
   - template: ${{variables['System.DefaultWorkingDirectory']}}\AzurePipelinesTemplates/WindowsAppSDK-EsrpCodeSigning-Steps.yml@WindowsAppSDKConfig
@@ -322,9 +318,3 @@ steps:
     workingDirectory: '$(Build.SourcesDirectory)'
   condition: and(succeeded(), ne(variables.SkipInstallerBuild, true))
 
-- ${{ if ne(parameters.IsOneBranch, 'true') }}:
-  - task: PublishBuildArtifacts@1
-    condition: ne(variables.SkipInstallerBuild, true)
-    inputs:
-      PathtoPublish: '$(ob_outputDirectory)'
-      artifactName: '$(ob_artifactBaseName)'

build/AzurePipelinesTemplates/WindowsAppSDK-BuildMRT-Steps.yml

@@ -2,9 +2,6 @@ parameters:
 - name: "SignOutput"
   type: boolean
   default: false
-- name: "IsOneBranch"
-  type: boolean
-  default: true
 - name: runApiScan
   type: boolean
   default: true
@@ -14,8 +11,6 @@ parameters:
 
 steps:
 - template: WindowsAppSDK-SetupBuildEnvironment-Steps.yml
-  parameters:
-    IsOneBranch: ${{ parameters.IsOneBranch }}
 
 - task: WinUndockNativeCompiler@1
   displayName: 'Setup native compiler version override'
@@ -97,9 +92,3 @@ steps:
     SourceFolder: '$(build.SourcesDirectory)\BuildOutput'
     TargetFolder: '$(ob_outputDirectory)'
 
-- ${{ if not( parameters.IsOneBranch ) }}:
-  - task: PublishBuildArtifacts@1
-    condition: always()
-    inputs:
-      PathtoPublish: '$(ob_outputDirectory)'
-      artifactName: '$(ob_artifactBaseName)'

build/AzurePipelinesTemplates/WindowsAppSDK-BuildSamplesCompat-Job.yml

@@ -1,9 +1,6 @@
 # This yml file is used to build sample apps, having the same structure and pattern as Aggregator repo:
 # https://microsoft.visualstudio.com/ProjectReunion/_git/WindowsAppSDKAggregator?path=/build/AzurePipelinesTemplates/WindowsAppSDK-BuildSamplesCompat-Job.yml
 parameters:
-- name: "IsOneBranch"
-  type: boolean
-  default: true
 - name: JobName
   type: string
   default: 'SamplesCompatTest'
@@ -34,12 +31,7 @@ parameters:
 jobs:
 - job: ${{ parameters.JobName }}
   pool:
-    ${{ if parameters.IsOneBranch }}:
-      type: windows
-    ${{ if not( parameters.IsOneBranch ) }}:
-      type: windows
-      isCustom: true
-      name: 'ProjectReunionESPool-2022'
+    type: windows
   timeoutInMinutes: 120
   strategy:
     maxParallel: ${{ parameters.maxParallel }}
@@ -384,12 +376,6 @@ jobs:
       condition: succeededOrFailed()
       displayName: DIAG - Show staging trees to validate filtering
 
-    - ${{ if not( parameters.IsOneBranch ) }}:
-      - task: PublishBuildArtifacts@1
-        inputs:
-          PathtoPublish: '$(ob_outputDirectory)'
-          artifactName: '$(ob_artifactBaseName)$(ob_artifactSuffix)'
-
 # The idea of merging the artifacts for the featureAreas produced by one call to this yml file has
 # been attempted and abandoned. Although this will free the subsequent Stages that run the SampleTests
 # from needing to know the artifacts of the individual featureAreas and downloading them one by one,

build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml

@@ -2,9 +2,6 @@ parameters:
 - name: SignOutput
   type: boolean
   default: false
-- name: IsOneBranch
-  type: boolean
-  default: true
 - name: IsOfficial
   type: boolean
   default: false 
@@ -196,11 +193,10 @@ steps:
       codeSignPattern: |
         **/WindowsAppSDK.*.Extension.*.dll
 
-- ${{ if eq(parameters.IsOneBranch, 'true') }}:
-  - template: ${{variables['System.DefaultWorkingDirectory']}}\AzurePipelinesTemplates\WindowsAppSDK-PublishSymbol-Steps.yml@WindowsAppSDKConfig
-    parameters:
-      SearchPattern: '$(FoundationRepoPath)dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)\**\WindowsAppSDK*.pdb'
-      IsOfficial: ${{ parameters.IsOfficial }}
+- template: ${{variables['System.DefaultWorkingDirectory']}}\AzurePipelinesTemplates\WindowsAppSDK-PublishSymbol-Steps.yml@WindowsAppSDKConfig
+  parameters:
+    SearchPattern: '$(FoundationRepoPath)dev\VSIX\BuildOutput\obj\AnyCPU$(buildConfiguration)\**\WindowsAppSDK*.pdb'
+    IsOfficial: ${{ parameters.IsOfficial }}
 
 - task: CopyFiles@2
   displayName: 'Stage VSIX component JSONs'
@@ -234,8 +230,3 @@ steps:
     flattenFolders: true
     TargetFolder: '$(ob_outputDirectory)'
 
-- ${{ if ne(parameters.IsOneBranch, 'true') }}:
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: '$(ob_outputDirectory)'
-      artifactName: '$(ob_artifactBaseName)'