From 4382a17352869bb1f33e020ac281d04aa15a8e8f Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Fri, 29 Sep 2023 03:49:34 -0700 Subject: [PATCH 1/4] [Schema] Fix incorrect default value for 'allowEmpty' (#16040) --- doc/cascadia/profiles.schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/cascadia/profiles.schema.json b/doc/cascadia/profiles.schema.json index 6f3d62fa297..9dc3a8afd58 100644 --- a/doc/cascadia/profiles.schema.json +++ b/doc/cascadia/profiles.schema.json @@ -673,7 +673,7 @@ }, "allowEmpty": { "description": "Whether to render a folder without entries, or to hide it", - "default": "false", + "default": false, "type": "boolean" } } From 1b143e34a81ad55a74033961ea16bfab542f032f Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett" Date: Fri, 29 Sep 2023 13:25:01 -0500 Subject: [PATCH 2/4] Fix CFG on our static-lib-only DLL projects (#16056) Control Flow Guard requires both linker and compiler flags. It turns out that the MSVC build rules determine whether to _link_ with CFG based on whether it compiled anything with CFG. It also turns out that when you don't compile anything (such as in our DLL projects that only consume a static library!), the build rules can't guess whether to link with CFG. Whoops. We need to force it. --- src/common.build.pre.props | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/common.build.pre.props b/src/common.build.pre.props index 1cf31b37e44..9404c24c4bd 100644 --- a/src/common.build.pre.props +++ b/src/common.build.pre.props @@ -101,6 +101,13 @@ x64 true false + + true From ac2b0e744c7438010b7487f57064a179bc20b329 Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett" Date: Fri, 29 Sep 2023 13:25:13 -0500 Subject: [PATCH 3/4] build: switch the EsrpCodeSigning task to version 3 (#16057) The version we were using requires .NET 2.1 (wow) which is way out of support. Task version 3 supports much newer versions. --- build/pipelines/templates-v2/job-build-package-wpf.yml | 2 +- build/pipelines/templates-v2/job-build-project.yml | 2 +- build/pipelines/templates-v2/job-merge-msix-into-bundle.yml | 2 +- build/pipelines/templates-v2/job-package-conpty.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pipelines/templates-v2/job-build-package-wpf.yml b/build/pipelines/templates-v2/job-build-package-wpf.yml index c9329eab519..9d64e1c7cff 100644 --- a/build/pipelines/templates-v2/job-build-package-wpf.yml +++ b/build/pipelines/templates-v2/job-build-package-wpf.yml @@ -97,7 +97,7 @@ jobs: flattenFolders: true - ${{ if eq(parameters.codeSign, true) }}: - - task: EsrpCodeSigning@1 + - task: EsrpCodeSigning@3 displayName: Submit *.nupkg to ESRP for code signing inputs: ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a diff --git a/build/pipelines/templates-v2/job-build-project.yml b/build/pipelines/templates-v2/job-build-project.yml index 5c83dccadc5..12e45e54f46 100644 --- a/build/pipelines/templates-v2/job-build-project.yml +++ b/build/pipelines/templates-v2/job-build-project.yml @@ -229,7 +229,7 @@ jobs: # Code-sign everything we just put together. # We run the signing in Terminal.BinDir, because all of the signing batches are relative to the final architecture/configuration output folder. - - task: EsrpCodeSigning@1 + - task: EsrpCodeSigning@3 displayName: Submit Signing Request inputs: ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a diff --git a/build/pipelines/templates-v2/job-merge-msix-into-bundle.yml b/build/pipelines/templates-v2/job-merge-msix-into-bundle.yml index 1457178f973..ffca7e450e3 100644 --- a/build/pipelines/templates-v2/job-merge-msix-into-bundle.yml +++ b/build/pipelines/templates-v2/job-merge-msix-into-bundle.yml @@ -89,7 +89,7 @@ jobs: displayName: Create msixbundle - ${{ if eq(parameters.codeSign, true) }}: - - task: EsrpCodeSigning@1 + - task: EsrpCodeSigning@3 displayName: Submit *.msixbundle to ESRP for code signing inputs: ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a diff --git a/build/pipelines/templates-v2/job-package-conpty.yml b/build/pipelines/templates-v2/job-package-conpty.yml index 52f3a5c15d9..2f777cdf4f5 100644 --- a/build/pipelines/templates-v2/job-package-conpty.yml +++ b/build/pipelines/templates-v2/job-package-conpty.yml @@ -82,7 +82,7 @@ jobs: versionEnvVar: XES_PACKAGEVERSIONNUMBER - ${{ if eq(parameters.codeSign, true) }}: - - task: EsrpCodeSigning@1 + - task: EsrpCodeSigning@3 displayName: Submit *.nupkg to ESRP for code signing inputs: ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a From 1669036e595bcc8a100e7b8b679dc8f4748f2eb7 Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Fri, 29 Sep 2023 20:01:38 -0500 Subject: [PATCH 4/4] Add a note on how to build the Terminal in the OS repo (#16066) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's been literally 4 years since I worked directly in the OS repo and I forgot how to build the console 🤦 --- src/project.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/project.inc b/src/project.inc index b604f50ea6d..b34fb10f2e3 100644 --- a/src/project.inc +++ b/src/project.inc @@ -3,6 +3,9 @@ # - Common Project Configuration # ------------------------------------- +# Pull our dependencies from vcpkg. This includes gsl - if you run into errors +# from a missing gsl, make sure you go build onecore/window/vcpkg first. + !include $(PROJECT_ROOT)\vcpkg\consume.inc # -------------------------------------