diff --git a/build/pipelines/release.yml b/build/pipelines/release.yml index ec8dcf17dce..4c40ac623c5 100644 --- a/build/pipelines/release.yml +++ b/build/pipelines/release.yml @@ -151,6 +151,11 @@ jobs: $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore } pwsh: true + - task: PowerShell@2 + displayName: Copy the Context Menu Loc Resources to CascadiaPackage + inputs: + filePath: ./build/scripts/Copy-ContextMenuResourcesToCascadiaPackage.ps1 + pwsh: true - task: PowerShell@2 displayName: Generate NOTICE.html from NOTICE.md inputs: diff --git a/build/scripts/Copy-ContextMenuResourcesToCascadiaPackage.ps1 b/build/scripts/Copy-ContextMenuResourcesToCascadiaPackage.ps1 new file mode 100644 index 00000000000..8111b3fc66e --- /dev/null +++ b/build/scripts/Copy-ContextMenuResourcesToCascadiaPackage.ps1 @@ -0,0 +1,34 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT license. + +$LocalizationsFromContextMenu = Get-ChildItem ./src/cascadia/TerminalApp/Resources -Recurse -Filter ContextMenu.resw +$Languages = [System.Collections.HashTable]::New() +$LocalizationsFromContextMenu | ForEach-Object { + $Languages[$_.Directory.Name] = $_ +} + +ForEach ($pair in $Languages.GetEnumerator()) { + $LanguageDir = "./src/cascadia/CascadiaPackage/Resources/$($pair.Key)" + $ResPath = "$LanguageDir/Resources.resw" + $PreexistingResw = Get-Item $ResPath -EA:Ignore + If ($null -eq $PreexistingResw) { + Write-Host "Copying $($pair.Value.FullName) to $ResPath" + New-Item -type Directory $LanguageDir -EA:Ignore + Copy-Item $pair.Value.FullName $ResPath + } Else { + # Merge Them! + Write-Host "Merging $($pair.Value.FullName) into $ResPath" + $existingXml = [xml](Get-Content $PreexistingResw.FullName) + $newXml = [xml](Get-Content $pair.Value.FullName) + $newDataKeys = $newXml.root.data.name + $existingXml.root.data | % { + If ($_.name -in $newDataKeys) { + $null = $existingXml.root.RemoveChild($_) + } + } + $newXml.root.data | % { + $null = $existingXml.root.AppendChild($existingXml.ImportNode($_, $true)) + } + $existingXml.Save($PreexistingResw.FullName) + } +} diff --git a/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest b/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest index 9658fd1804c..0627906f7c0 100644 --- a/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest +++ b/src/cascadia/CascadiaPackage/Package-Dev.appxmanifest @@ -20,7 +20,7 @@ Version="0.0.1.0" /> - ms-resource:TerminalApp/ContextMenu/AppStoreNameDev + ms-resource:AppStoreNameDev A Lone Developer Images\StoreLogo.png @@ -38,8 +38,8 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> @@ -47,7 +47,7 @@ Wide310x150Logo="Images\Wide310x150Logo.png" Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" - ShortName="ms-resource:TerminalApp/ContextMenu/AppShortNameDev"> + ShortName="ms-resource:AppShortNameDev"> @@ -66,7 +66,7 @@ + DisplayName="ms-resource:AppNameDev" /> diff --git a/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest b/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest index 9b9ef83ae32..a55af61e2a0 100644 --- a/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest +++ b/src/cascadia/CascadiaPackage/Package-Pre.appxmanifest @@ -21,7 +21,7 @@ Version="0.5.0.0" /> - ms-resource:TerminalApp/ContextMenu/AppStoreNamePre + ms-resource:AppStoreNamePre Microsoft Corporation Images\StoreLogo.png @@ -127,8 +127,8 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> @@ -136,7 +136,7 @@ Wide310x150Logo="Images\Wide310x150Logo.png" Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" - ShortName="ms-resource:TerminalApp/ContextMenu/AppShortNamePre"> + ShortName="ms-resource:AppShortNamePre"> @@ -160,7 +160,7 @@ + DisplayName="ms-resource:AppNamePre" /> - ms-resource:TerminalApp/ContextMenu/AppStoreName + ms-resource:AppStoreName Microsoft Corporation Images\StoreLogo.png @@ -127,8 +127,8 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> @@ -136,7 +136,7 @@ Wide310x150Logo="Images\Wide310x150Logo.png" Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" - ShortName="ms-resource:TerminalApp/ContextMenu/AppShortName"> + ShortName="ms-resource:AppShortName"> @@ -160,7 +160,7 @@ + DisplayName="ms-resource:AppName" /> System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Terminal + {Locked} + + + Terminal Dev + {Locked} + + + Terminal Preview + {Locked} + + + Windows Terminal + {Locked} + + + Windows Terminal Dev + {Locked} + + + Windows Terminal Preview + {Locked} + + + Terminal + {Locked} + + + Terminal Dev + {Locked} + + + Terminal Preview + {Locked} + + + The New Windows Terminal + {Locked} + + + The Windows Terminal, but Unofficial + {Locked} + + + Windows Terminal with a preview of upcoming features + {Locked} +