From 83e13ae7d0ae2493f96d8eaf9ae13f281b5ed0f3 Mon Sep 17 00:00:00 2001 From: Dustin Howett Date: Thu, 24 Feb 2022 17:46:20 -0600 Subject: [PATCH 1/8] Add a pipeline that validates builds that touch features.xml This is intended to be a PR triggered build that only runs when features.xml has been touched, to validate that the disabled features do not cause compilation errors. --- build/pipelines/feature-flag-ci.yml | 34 +++++++++++++++++++ .../pipelines/templates/build-console-ci.yml | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 build/pipelines/feature-flag-ci.yml diff --git a/build/pipelines/feature-flag-ci.yml b/build/pipelines/feature-flag-ci.yml new file mode 100644 index 00000000000..7e6f58ea08f --- /dev/null +++ b/build/pipelines/feature-flag-ci.yml @@ -0,0 +1,34 @@ +trigger: none + +pr: + branches: + include: + - main + paths: + include: + - src/features.xml + +variables: + - name: runCodesignValidationInjectionBG + value: false + +parameters: + - name: buildBrandings + type: object + default: + - Release + - Preview + # Dev is built automatically + # WindowsInbox does not typically build with VS. + +stages: + - ${{ each branding in parameters.buildBrandings }} + - stage: Build_x64_${{ branding }} + displayName: Build x64 ${{ branding }} + dependsOn: [] + condition: succeeded() + jobs: + - template: ./templates/build-console-ci.yml + parameters: + platform: x64 + branding: ${{ branding }} diff --git a/build/pipelines/templates/build-console-ci.yml b/build/pipelines/templates/build-console-ci.yml index 7256d521988..45c2e70a342 100644 --- a/build/pipelines/templates/build-console-ci.yml +++ b/build/pipelines/templates/build-console-ci.yml @@ -1,5 +1,6 @@ parameters: configuration: 'Release' + branding: 'Dev' platform: '' additionalBuildArguments: '' @@ -9,6 +10,7 @@ jobs: variables: BuildConfiguration: ${{ parameters.configuration }} BuildPlatform: ${{ parameters.platform }} + WindowsTerminalBranding: ${{ parameters.branding }} pool: ${{ if eq(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}: name: WinDevPoolOSS-L From de85ef8af590fa3ff22701ee832ff189ea275c7e Mon Sep 17 00:00:00 2001 From: Dustin Howett Date: Thu, 24 Feb 2022 17:51:33 -0600 Subject: [PATCH 2/8] okay? make it a job then --- build/pipelines/feature-flag-ci.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/build/pipelines/feature-flag-ci.yml b/build/pipelines/feature-flag-ci.yml index 7e6f58ea08f..d34ef683b35 100644 --- a/build/pipelines/feature-flag-ci.yml +++ b/build/pipelines/feature-flag-ci.yml @@ -21,14 +21,10 @@ parameters: # Dev is built automatically # WindowsInbox does not typically build with VS. -stages: +jobs: - ${{ each branding in parameters.buildBrandings }} - - stage: Build_x64_${{ branding }} + - template: ./templates/build-console-ci.yml displayName: Build x64 ${{ branding }} - dependsOn: [] - condition: succeeded() - jobs: - - template: ./templates/build-console-ci.yml - parameters: - platform: x64 - branding: ${{ branding }} + parameters: + platform: x64 + branding: ${{ branding }} From 4f699103b3875ad9c70decf388a9c4035375a600 Mon Sep 17 00:00:00 2001 From: Dustin Howett Date: Thu, 24 Feb 2022 17:52:55 -0600 Subject: [PATCH 3/8] yaml: fury --- build/pipelines/feature-flag-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pipelines/feature-flag-ci.yml b/build/pipelines/feature-flag-ci.yml index d34ef683b35..4229e79f82b 100644 --- a/build/pipelines/feature-flag-ci.yml +++ b/build/pipelines/feature-flag-ci.yml @@ -22,7 +22,7 @@ parameters: # WindowsInbox does not typically build with VS. jobs: - - ${{ each branding in parameters.buildBrandings }} + - ${{ each branding in parameters.buildBrandings }}: - template: ./templates/build-console-ci.yml displayName: Build x64 ${{ branding }} parameters: From 638d29cdbca42325ddb7ff4cb22166fdbf9a379d Mon Sep 17 00:00:00 2001 From: Dustin Howett Date: Thu, 24 Feb 2022 17:53:44 -0600 Subject: [PATCH 4/8] why live --- build/pipelines/feature-flag-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/build/pipelines/feature-flag-ci.yml b/build/pipelines/feature-flag-ci.yml index 4229e79f82b..0ca4400463d 100644 --- a/build/pipelines/feature-flag-ci.yml +++ b/build/pipelines/feature-flag-ci.yml @@ -24,7 +24,6 @@ parameters: jobs: - ${{ each branding in parameters.buildBrandings }}: - template: ./templates/build-console-ci.yml - displayName: Build x64 ${{ branding }} parameters: platform: x64 branding: ${{ branding }} From aa62371d9532b8874c307a1f75326474ee01f902 Mon Sep 17 00:00:00 2001 From: Dustin Howett Date: Thu, 24 Feb 2022 17:54:19 -0600 Subject: [PATCH 5/8] unique the jerbs --- build/pipelines/templates/build-console-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/pipelines/templates/build-console-ci.yml b/build/pipelines/templates/build-console-ci.yml index 45c2e70a342..45d6bd4267e 100644 --- a/build/pipelines/templates/build-console-ci.yml +++ b/build/pipelines/templates/build-console-ci.yml @@ -5,8 +5,8 @@ parameters: additionalBuildArguments: '' jobs: -- job: Build${{ parameters.platform }}${{ parameters.configuration }} - displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }} +- job: Build${{ parameters.platform }}${{ parameters.configuration }}${{ parameters.branding }} + displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }} ${{ parameters.branding }} variables: BuildConfiguration: ${{ parameters.configuration }} BuildPlatform: ${{ parameters.platform }} From 88f2e254d30c46431c90c7d7fd12d8b1338dc436 Mon Sep 17 00:00:00 2001 From: Dustin Howett Date: Fri, 25 Feb 2022 12:18:30 -0600 Subject: [PATCH 6/8] make Dev more ... good --- src/cascadia/CascadiaPackage/CascadiaPackage.wapproj | 6 +++--- src/host/proxy/Host.Proxy.vcxproj | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj index 48d8caffdf9..83363d6e2b0 100644 --- a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj +++ b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj @@ -11,7 +11,7 @@ --> false false - wtd + wtd wt @@ -38,7 +38,7 @@ Designer - + Designer @@ -52,7 +52,7 @@ - + -Dev diff --git a/src/host/proxy/Host.Proxy.vcxproj b/src/host/proxy/Host.Proxy.vcxproj index c6129bf828f..dd0551e104d 100644 --- a/src/host/proxy/Host.Proxy.vcxproj +++ b/src/host/proxy/Host.Proxy.vcxproj @@ -60,7 +60,7 @@ PROXY_CLSID_IS={0x1833E661,0xCC81,0x4DD0,{0x87,0xC6,0xC2,0xF7,0x4B,0xD3,0x9E,0xFA}};%(PreprocessorDefinitions) - + PROXY_CLSID_IS={0xDEC4804D,0x56D1,0x4F73,{0x9F,0xBE,0x68,0x28,0xE7,0xC8,0x5C,0x56}};%(PreprocessorDefinitions) From 43541b2f60fce0075bb1bf15123ccd50dd9c0430 Mon Sep 17 00:00:00 2001 From: Dustin Howett Date: Fri, 25 Feb 2022 12:19:07 -0600 Subject: [PATCH 7/8] NFCI --- src/features.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/features.xml b/src/features.xml index 2a04dd1b0b0..abcb884fced 100644 --- a/src/features.xml +++ b/src/features.xml @@ -76,3 +76,4 @@ + From 2aa8d75f2b1448b498b178b171725f0b175b38ff Mon Sep 17 00:00:00 2001 From: Dustin Howett Date: Fri, 25 Feb 2022 15:04:08 -0600 Subject: [PATCH 8/8] Revert "NFCI" This reverts commit 43541b2f60fce0075bb1bf15123ccd50dd9c0430. --- src/features.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/features.xml b/src/features.xml index abcb884fced..2a04dd1b0b0 100644 --- a/src/features.xml +++ b/src/features.xml @@ -76,4 +76,3 @@ -