From 8009b5381936780ccc33d091a87222382ab0cf6e Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett" Date: Mon, 1 Jul 2024 12:23:05 -0500 Subject: [PATCH] Check the PDPs and StoreBroker configs into the repo (#17476) This also updates the localization pipeline to check in translations for the PDPs. Right now, the primary source for PDPs is the Terminal.Internal repository. They are submitted from there, and pulled back in as though they were destined for the internal repo. We rename them on disk prior to loc check-in to pretend they live in this repo. Once I submit a change request to the Touchdown team to update the paths in their backend, I will follow up with another pull request that updates the remaining build steps to account for that. --- .github/actions/spelling/excludes.txt | 1 + build/StoreSubmission/.gitignore | 2 + .../Preview/PDPs/en-US/PDP.xml | 177 ++++++++++++++++++ build/StoreSubmission/Preview/SBConfig.json | 67 +++++++ build/StoreSubmission/README.md | 3 + .../StoreSubmission/Stable/PDPs/en-US/PDP.xml | 177 ++++++++++++++++++ build/StoreSubmission/Stable/SBConfig.json | 67 +++++++ build/pipelines/daily-loc-submission.yml | 10 +- 8 files changed, 502 insertions(+), 2 deletions(-) create mode 100644 build/StoreSubmission/.gitignore create mode 100644 build/StoreSubmission/Preview/PDPs/en-US/PDP.xml create mode 100644 build/StoreSubmission/Preview/SBConfig.json create mode 100644 build/StoreSubmission/README.md create mode 100644 build/StoreSubmission/Stable/PDPs/en-US/PDP.xml create mode 100644 build/StoreSubmission/Stable/SBConfig.json diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt index 88592f6fea..4ee5cecb7d 100644 --- a/.github/actions/spelling/excludes.txt +++ b/.github/actions/spelling/excludes.txt @@ -97,6 +97,7 @@ ^\Qsrc/tools/lnkd/lnkd.bat\E$ ^\Qsrc/tools/pixels/pixels.bat\E$ ^build/config/ +^build/StoreSubmission/ ^consolegit2gitfilters\.json$ ^dep/ ^doc/reference/master-sequence-list\.csv$ diff --git a/build/StoreSubmission/.gitignore b/build/StoreSubmission/.gitignore new file mode 100644 index 0000000000..baeddd65d0 --- /dev/null +++ b/build/StoreSubmission/.gitignore @@ -0,0 +1,2 @@ +Media +SubmissionPackages diff --git a/build/StoreSubmission/Preview/PDPs/en-US/PDP.xml b/build/StoreSubmission/Preview/PDPs/en-US/PDP.xml new file mode 100644 index 0000000000..9428874560 --- /dev/null +++ b/build/StoreSubmission/Preview/PDPs/en-US/PDP.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + Terminal + + Console + + + + + + + + + + + + + + + + + + This is the preview build of the Windows Terminal, which contains the latest features as they are developed. The Windows Terminal is a modern, fast, efficient, powerful, and productive terminal application for users of command-line tools and shells like Command Prompt, PowerShell, and WSL. Its main features include multiple tabs, panes, Unicode and UTF-8 character support, a GPU accelerated text rendering engine, and custom themes, styles, and configurations. + +This is an open source project and we welcome community participation. To participate please visit https://github.com/microsoft/terminal + + + + + + + + + + + + + + + + + + + + + + Version __VERSION_NUMBER__ + +Please see our GitHub releases page for additional details. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->The new Windows Terminal + + + + + + + + + + + + Multiple tabs + + Full Unicode support + + GPU-accelerated text rendering + + Full customizability + + Split panes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Keyboard + + + + + + Copyright (c) Microsoft Corporation + + + + + https://github.com/microsoft/terminal + + https://github.com/microsoft/terminal/issues/new + + https://go.microsoft.com/fwlink/?LinkID=521839 + diff --git a/build/StoreSubmission/Preview/SBConfig.json b/build/StoreSubmission/Preview/SBConfig.json new file mode 100644 index 0000000000..78facc62bb --- /dev/null +++ b/build/StoreSubmission/Preview/SBConfig.json @@ -0,0 +1,67 @@ +{ + "helpUri": "https:\\\\aka.ms\\StoreBroker_Config", + "schemaVersion": 2, + "packageParameters": { + "PDPRootPath": "PDPs", + "Release": "", + "PDPInclude": ["PDP.xml"], + "PDPExclude": [], + "LanguageExclude": [ + "default", + "qps-ploc", + "qps-ploca", + "qps-plocm" + ], + "MediaRootPath": "..\\Media", + "MediaFallbackLanguage": "en-us", + "PackagePath": [], + "OutPath": "..\\SubmissionPackages", + "OutName": "WindowsTerminalPreview", + "DisableAutoPackageNameFormatting": false + }, + "appSubmission": { + "productId": "00014050269303149694", + "targetPublishMode": "NotSet", + "targetPublishDate": null, + "visibility": "NotSet", + "pricing": { + "priceId": "NotAvailable", + "trialPeriod": "NoFreeTrial", + "marketSpecificPricings": {}, + "sales": [] + }, + "allowTargetFutureDeviceFamilies": { + "Xbox": false, + "Team": false, + "Holographic": false, + "Desktop": false, + "Mobile": false + }, + "allowMicrosoftDecideAppAvailabilityToFutureDeviceFamilies": false, + "enterpriseLicensing": "None", + "applicationCategory": "NotSet", + "hardwarePreferences": [], + "hasExternalInAppProducts": false, + "meetAccessibilityGuidelines": false, + "canInstallOnRemovableMedia": false, + "automaticBackupEnabled": false, + "isGameDvrEnabled": false, + "gamingOptions": [ + { + "genres": [], + "isLocalMultiplayer": false, + "isLocalCooperative": false, + "isOnlineMultiplayer": false, + "isOnlineCooperative": false, + "localMultiplayerMinPlayers": 0, + "localMultiplayerMaxPlayers": 0, + "localCooperativeMinPlayers": 0, + "localCooperativeMaxPlayers": 0, + "isBroadcastingPrivilegeGranted": false, + "isCrossPlayEnabled": false, + "kinectDataForExternal": "Disabled" + } + ], + "notesForCertification": "" + } +} diff --git a/build/StoreSubmission/README.md b/build/StoreSubmission/README.md new file mode 100644 index 0000000000..2e66bc98f3 --- /dev/null +++ b/build/StoreSubmission/README.md @@ -0,0 +1,3 @@ +This directory is intended to be used with the [StoreBroker PowerShell module]. + +[StoreBroker PowerShell module]: https://github.com/microsoft/StoreBroker/tree/v2 diff --git a/build/StoreSubmission/Stable/PDPs/en-US/PDP.xml b/build/StoreSubmission/Stable/PDPs/en-US/PDP.xml new file mode 100644 index 0000000000..7468f319e5 --- /dev/null +++ b/build/StoreSubmission/Stable/PDPs/en-US/PDP.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + Terminal + + Console + + + + + + + + + + + + + + + + + + The Windows Terminal is a modern, fast, efficient, powerful, and productive terminal application for users of command-line tools and shells like Command Prompt, PowerShell, and WSL. Its main features include multiple tabs, panes, Unicode and UTF-8 character support, a GPU accelerated text rendering engine, and custom themes, styles, and configurations. + +This is an open source project and we welcome community participation. To participate please visit https://github.com/microsoft/terminal + + + + + + + + + + + + + + + + + + + + + + Version __VERSION_NUMBER__ + +Please see our GitHub releases page for additional details. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->The new Windows Terminal + + + + + + + + + + + + Multiple tabs + + Full Unicode support + + GPU-accelerated text rendering + + Full customizability + + Split panes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Keyboard + + + + + + Copyright (c) Microsoft Corporation + + + + + https://github.com/microsoft/terminal + + https://github.com/microsoft/terminal/issues/new + + https://go.microsoft.com/fwlink/?LinkID=521839 + diff --git a/build/StoreSubmission/Stable/SBConfig.json b/build/StoreSubmission/Stable/SBConfig.json new file mode 100644 index 0000000000..c38d53443b --- /dev/null +++ b/build/StoreSubmission/Stable/SBConfig.json @@ -0,0 +1,67 @@ +{ + "helpUri": "https:\\\\aka.ms\\StoreBroker_Config", + "schemaVersion": 2, + "packageParameters": { + "PDPRootPath": "PDPs", + "Release": "", + "PDPInclude": ["PDP.xml"], + "PDPExclude": [], + "LanguageExclude": [ + "default", + "qps-ploc", + "qps-ploca", + "qps-plocm" + ], + "MediaRootPath": "..\\Media", + "MediaFallbackLanguage": "en-us", + "PackagePath": [], + "OutPath": "..\\SubmissionPackages", + "OutName": "WindowsTerminal", + "DisableAutoPackageNameFormatting": false + }, + "appSubmission": { + "productId": "00013926773940052066", + "targetPublishMode": "NotSet", + "targetPublishDate": null, + "visibility": "NotSet", + "pricing": { + "priceId": "NotAvailable", + "trialPeriod": "NoFreeTrial", + "marketSpecificPricings": {}, + "sales": [] + }, + "allowTargetFutureDeviceFamilies": { + "Xbox": false, + "Team": false, + "Holographic": false, + "Desktop": false, + "Mobile": false + }, + "allowMicrosoftDecideAppAvailabilityToFutureDeviceFamilies": false, + "enterpriseLicensing": "None", + "applicationCategory": "NotSet", + "hardwarePreferences": [], + "hasExternalInAppProducts": false, + "meetAccessibilityGuidelines": false, + "canInstallOnRemovableMedia": false, + "automaticBackupEnabled": false, + "isGameDvrEnabled": false, + "gamingOptions": [ + { + "genres": [], + "isLocalMultiplayer": false, + "isLocalCooperative": false, + "isOnlineMultiplayer": false, + "isOnlineCooperative": false, + "localMultiplayerMinPlayers": 0, + "localMultiplayerMaxPlayers": 0, + "localCooperativeMinPlayers": 0, + "localCooperativeMaxPlayers": 0, + "isBroadcastingPrivilegeGranted": false, + "isCrossPlayEnabled": false, + "kinectDataForExternal": "Disabled" + } + ], + "notesForCertification": "" + } +} diff --git a/build/pipelines/daily-loc-submission.yml b/build/pipelines/daily-loc-submission.yml index afab55a70f..822c46040b 100644 --- a/build/pipelines/daily-loc-submission.yml +++ b/build/pipelines/daily-loc-submission.yml @@ -67,9 +67,14 @@ steps: localizationTarget: true - pwsh: |- - Remove-Item -EA:Ignore -R -Force LocOutput\Terminal.Internal - $Files = Get-ChildItem LocOutput -R -Include 'ContextMenu.resw','Resources.resw' | ? FullName -Like '*en-US\*\*.resw' + $Files = Get-ChildItem LocOutput -R -Include 'ContextMenu.resw','Resources.resw','PDP.xml' | ? FullName -Like '*en-US\*\*.*' $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore } + + # TEMPORARY - Move PDPs into place until we can get them renamed on the backend. + New-Item -Type Directory -EA:Ignore LocOutput\build\StoreSubmission + Move-Item LocOutput\Terminal.Internal\PDPs\* LocOutput\build\StoreSubmission + Remove-Item -EA:Ignore -R -Force LocOutput\Terminal.Internal + & tar.exe -c -f LocOutputMunged.tar -C LocOutput . & tar.exe -x -v -f LocOutputMunged.tar rm LocOutputMunged.tar @@ -80,6 +85,7 @@ steps: - pwsh: |- git add **/*.resw + git add build/StoreSubmission/**/*.xml git status git diff --quiet --cached --exit-code If ($LASTEXITCODE -Ne 0) {