Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] main from microsoft:main #81

Merged
merged 4 commits into from
Sep 30, 2023
Merged

[pull] main from microsoft:main #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4382a17
[Schema] Fix incorrect default value for 'allowEmpty' (#16040)
carlos-zamora Sep 29, 2023
1b143e3
Fix CFG on our static-lib-only DLL projects (#16056)
DHowett Sep 29, 2023
ac2b0e7
build: switch the EsrpCodeSigning task to version 3 (#16057)
DHowett Sep 29, 2023
1669036
Add a note on how to build the Terminal in the OS repo (#16066)
zadjii-msft Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/pipelines/templates-v2/job-build-package-wpf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/pipelines/templates-v2/job-build-project.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/pipelines/templates-v2/job-merge-msix-into-bundle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/pipelines/templates-v2/job-package-conpty.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/cascadia/profiles.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@
},
"allowEmpty": {
"description": "Whether to render a folder without entries, or to hide it",
"default": "false",
"default": false,
"type": "boolean"
}
}
Expand Down
7 changes: 7 additions & 0 deletions src/common.build.pre.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,13 @@
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
<EnableHybridCRT Condition="'$(EnableHybridCRT)'=='' and '$(ConfigurationSupportsHybridCRT)'=='true'">true</EnableHybridCRT>
<UseCrtSDKReferenceStaticWarning Condition="'$(EnableHybridCRT)'=='true'">false</UseCrtSDKReferenceStaticWarning>
<!--
We must set this to True for projects that do not contain any ClCompile entries.
The Link task guesses whether to enable CFG based on ClCompile->ControlFlowGuard.
Without any ClCompile entries, there's nothing to guess!
This impacts our dll projects that only link a lib.
-->
<LinkControlFlowGuard>true</LinkControlFlowGuard>
</PropertyGroup>

<ItemDefinitionGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/project.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

# -------------------------------------
Expand Down
Loading