diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml index 76ba2563a0..e2cdcf2d26 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml @@ -13,6 +13,13 @@ parameters: default: false steps: +# Supports both root and subfolder Foundation checkouts. +- template: AzurePipelinesTemplates\WindowsAppSDK-MaterializeTsaOptions-Steps.yml@WindowsAppSDKConfig + parameters: + componentTsaOptionsPath: '$(Build.SourcesDirectory)\$(foundationRepoPath).config\tsaoptions.json' + areaPath: '$(WinAppSDKCoreTsaAreaPath)' + outputPath: '$(Build.SourcesDirectory)\.config\tsaoptions.json' + - task: PowerShell@2 name: InitializeSkipInstallerBuild displayName: 'Decide if we can skip this installer build job' diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml index fb4595bc98..a2a4563da0 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildVSIX-Steps.yml @@ -39,6 +39,13 @@ parameters: default: false steps: +# Supports both root and subfolder Foundation checkouts. +- template: AzurePipelinesTemplates\WindowsAppSDK-MaterializeTsaOptions-Steps.yml@WindowsAppSDKConfig + parameters: + componentTsaOptionsPath: '$(Build.SourcesDirectory)\$(FoundationRepoPath).config\tsaoptions.json' + areaPath: '$(WinAppSDKCoreTsaAreaPath)' + outputPath: '$(Build.SourcesDirectory)\.config\tsaoptions.json' + - ${{ if eq(parameters.UseCurrentBuild, 'true') }}: - task: DownloadPipelineArtifact@2 displayName: 'Download WindowsAppSDK From Current Build' diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml index 825464bf4b..08eaa95d4c 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml @@ -1,4 +1,10 @@ steps: +- template: AzurePipelinesTemplates\WindowsAppSDK-MaterializeTsaOptions-Steps.yml@WindowsAppSDKConfig + parameters: + componentTsaOptionsPath: '$(Build.SourcesDirectory)\.config\tsaoptions.json' + areaPath: '$(WinAppSDKCoreTsaAreaPath)' + outputPath: '$(Build.SourcesDirectory)\.config\tsaoptions.json' + - task: UseDotNet@2 displayName: Use .NET Core SDK 6 inputs: diff --git a/build/WindowsAppSDK-Foundation-DevTest.yml b/build/WindowsAppSDK-Foundation-DevTest.yml index 7c47ba6908..d2e3e15c24 100644 --- a/build/WindowsAppSDK-Foundation-DevTest.yml +++ b/build/WindowsAppSDK-Foundation-DevTest.yml @@ -47,6 +47,7 @@ parameters: variables: - template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig +- template: AzurePipelinesTemplates\WindowsAppSDK-TSAVariables.yml@WindowsAppSDKConfig - template: AzurePipelinesTemplates\WindowsAppSDK-Versions.yml@WindowsAppSDKVersionConfig - template: WindowsAppSDK-CommonVariables.yml parameters: diff --git a/build/WindowsAppSDK-Foundation-Nightly.yml b/build/WindowsAppSDK-Foundation-Nightly.yml index c6a629a3f0..9fc360a743 100644 --- a/build/WindowsAppSDK-Foundation-Nightly.yml +++ b/build/WindowsAppSDK-Foundation-Nightly.yml @@ -54,6 +54,7 @@ parameters: variables: - template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig +- template: AzurePipelinesTemplates\WindowsAppSDK-TSAVariables.yml@WindowsAppSDKConfig - template: AzurePipelinesTemplates\WindowsAppSDK-Versions.yml@WindowsAppSDKVersionConfig - template: WindowsAppSDK-CommonVariables.yml parameters: diff --git a/build/WindowsAppSDK-Foundation-Official.yml b/build/WindowsAppSDK-Foundation-Official.yml index 96873dc6a5..0e58f1b1d2 100644 --- a/build/WindowsAppSDK-Foundation-Official.yml +++ b/build/WindowsAppSDK-Foundation-Official.yml @@ -70,6 +70,7 @@ parameters: variables: - template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig +- template: AzurePipelinesTemplates\WindowsAppSDK-TSAVariables.yml@WindowsAppSDKConfig - template: AzurePipelinesTemplates\WindowsAppSDK-Versions.yml@WindowsAppSDKVersionConfig - template: WindowsAppSDK-CommonVariables.yml parameters: diff --git a/build/WindowsAppSDK-Foundation-PR.yml b/build/WindowsAppSDK-Foundation-PR.yml index 0b4e815c5d..d91acb3bdf 100644 --- a/build/WindowsAppSDK-Foundation-PR.yml +++ b/build/WindowsAppSDK-Foundation-PR.yml @@ -37,6 +37,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time variables: - template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig +- template: AzurePipelinesTemplates\WindowsAppSDK-TSAVariables.yml@WindowsAppSDKConfig - template: AzurePipelinesTemplates\WindowsAppSDK-Versions.yml@WindowsAppSDKVersionConfig - template: WindowsAppSDK-CommonVariables.yml parameters: diff --git a/build/WindowsAppSDK-Templates-PR.yml b/build/WindowsAppSDK-Templates-PR.yml index 9c875f842d..4caba67faf 100644 --- a/build/WindowsAppSDK-Templates-PR.yml +++ b/build/WindowsAppSDK-Templates-PR.yml @@ -38,6 +38,7 @@ variables: - name: OfficialPipelineID value: 118002 - template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig +- template: AzurePipelinesTemplates\WindowsAppSDK-TSAVariables.yml@WindowsAppSDKConfig - template: AzurePipelinesTemplates\WindowsAppSDK-Versions.yml@WindowsAppSDKVersionConfig - template: WindowsAppSDK-CommonVariables.yml