conflict

.github/actions/spelling/allow/allow.txt

@@ -14,6 +14,7 @@ changelog
 clickable
 clig
 CMMI
+consvc
 copyable
 Counterintuitively
 CtrlDToClose

.github/actions/spelling/excludes.txt

@@ -126,3 +126,4 @@
 ^tools/ReleaseEngineering/ServicingPipeline\.ps1$
 ^XamlStyler\.json$
 ignore$
+Resources/(?!en)

.github/actions/spelling/expect/expect.txt

@@ -74,6 +74,7 @@ aumid
 Authenticode
 AUTOBUDDY
 AUTOCHECKBOX
+autocrlf
 autohide
 AUTOHSCROLL
 automagically
@@ -453,6 +454,7 @@ DECSTBM
 DECSTGLT
 DECSTR
 DECSWL
+DECSWT
 DECTABSR
 DECTCEM
 DECXCPR

build/pipelines/daily-loc-submission.yml

@@ -8,6 +8,12 @@ schedules:
  - main
  always: false # only run if there's code changes!
 
+
+parameters:
+ - name: targetBranch
+ type: string
+ default: "automated/loc-update"
+
 pool:
  vmImage: windows-2019
 
@@ -38,6 +44,13 @@ steps:
  persistCredentials: true
  path: s/Terminal.Internal
 
+- pwsh: |-
+ Install-Module PSGitHub -Scope CurrentUser -Force
+ git config --local user.email "[email protected]"
+ git config --local user.name "Console Service Bot"
+ git config --local core.autocrlf true
+ displayName: Prepare git submission environment
+
 - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@1
  displayName: 'Touchdown Build - 7105, PRODEXT'
  inputs:
@@ -51,13 +64,44 @@ steps:
  outputDirectoryRoot: LocOutput
  appendRelativeDir: true
  pseudoSetting: Included
+ localizationTarget: true
 
-# Saving one of these makes it really easy to inspect the loc output...
-- powershell: 'tar czf LocOutput.tar.gz LocOutput'
- displayName: 'Archive Loc Output for Submission'
+- 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 | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
+ & tar.exe -c -f LocOutputMunged.tar -C LocOutput .
+ & tar.exe -x -v -f LocOutputMunged.tar
+ rm LocOutputMunged.tar
+ rm -r -fo LocOutput
+ & ./build/scripts/Copy-ContextMenuResourcesToCascadiaPackage.ps1
+ displayName: Move Loc files to the right places
 
-- task: PublishBuildArtifacts@1
- displayName: 'Publish Artifact: LocOutput'
- inputs:
- PathtoPublish: LocOutput.tar.gz
- ArtifactName: LocOutput
+- pwsh: |-
+ git add **/*.resw
+ git status
+ git diff --quiet --cached --exit-code
+ If ($LASTEXITCODE -Ne 0) {
+ $Now = Get-Date
+ git commit -m "Localization Updates - $Now"
+ git push origin HEAD:refs/heads/${{parameters.targetBranch}} -f
+ Write-Host "##vso[task.setvariable variable=ChangesPushedToRepo]1"
+ } Else {
+ Write-Host "##vso[task.setvariable variable=ChangesPushedToRepo]0"
+ }
+ displayName: git commit and push
+
+- pwsh: |-
+ Import-Module PSGitHub
+ $BaseBranch = "$(Build.SourceBranch)" -Replace "^refs/heads/",""
+ Write-Host "Preparing PR against $BaseBranch"
+ $PSDefaultParameterValues['*GitHub*:Owner'] = "microsoft"
+ $PSDefaultParameterValues['*GitHub*:RepositoryName'] = "terminal"
+ $PSDefaultParameterValues['*GitHub*:Token'] = ("$(GithubPullRequestToken)" | ConvertTo-SecureString -AsPlainText -Force)
+ $existingPr = Get-GitHubPullRequest -HeadBranch "${{parameters.targetBranch}}" -BaseBranch $BaseBranch
+ If ($null -Eq $existingPr) {
+ $Now = Get-Date
+ New-GitHubPullRequest -Head "${{parameters.targetBranch}}" -Base $BaseBranch -Title "Localization Updates - $BaseBranch - $Now" -Verbose
+ }
+ displayName: Publish pull request
+ condition: and(eq(variables['ChangesPushedToRepo'], '1'), succeeded())

build/pipelines/templates-v2/pipeline-full-release-build.yml

@@ -104,10 +104,6 @@ stages:
  packageListDownload: e82d490c-af86-4733-9dc4-07b772033204
  versionListDownload: ${{ parameters.terminalInternalPackageVersion }}
 
- - template: ./steps-fetch-and-prepare-localizations.yml
- parameters:
- includePseudoLoc: true
-
  - ${{ if eq(parameters.buildWPF, true) }}:
  # Add an Any CPU build flavor for the WPF control bits
  - template: ./job-build-project.yml

build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml

@@ -131,10 +131,6 @@ extends:
  packageListDownload: e82d490c-af86-4733-9dc4-07b772033204
  versionListDownload: ${{ parameters.terminalInternalPackageVersion }}
 
- - template: ./build/pipelines/templates-v2/steps-fetch-and-prepare-localizations.yml@self
- parameters:
- includePseudoLoc: true
-
  - ${{ if eq(parameters.buildWPF, true) }}:
  # Add an Any CPU build flavor for the WPF control bits
  - template: ./build/pipelines/templates-v2/job-build-project.yml@self

build/rules/GenerateFeatureFlags.proj

@@ -30,6 +30,7 @@
  <IntermediateOutputPath>$(SolutionDir)obj\$(Configuration)\GenerateFeatureFlags\</IntermediateOutputPath>
  <OpenConsoleCommonOutDir>$(SolutionDir)bin\$(Configuration)\</OpenConsoleCommonOutDir>
 
+ <_WTBrandingName Condition="'$(WindowsTerminalBranding)'=='Canary'">Canary</_WTBrandingName>
  <_WTBrandingName Condition="'$(WindowsTerminalBranding)'=='Preview'">Preview</_WTBrandingName>
  <_WTBrandingName Condition="'$(WindowsTerminalBranding)'=='Release'">Release</_WTBrandingName>
  <_WTBrandingName Condition="'$(_WTBrandingName)'==''">Dev</_WTBrandingName>

build/scripts/Copy-ContextMenuResourcesToCascadiaPackage.ps1

@@ -10,11 +10,12 @@ $LocalizationsFromContextMenu | ForEach-Object {
 ForEach ($pair in $Languages.GetEnumerator()) {
  $LanguageDir = "./src/cascadia/CascadiaPackage/Resources/$($pair.Key)"
  $ResPath = "$LanguageDir/Resources.resw"
+ $XmlDocument = $null
  $PreexistingResw = Get-Item $ResPath -EA:Ignore
  If ($null -eq $PreexistingResw) {
  Write-Host "Copying $($pair.Value.FullName) to $ResPath"
+ $XmlDocument = [xml](Get-Content $pair.Value.FullName)
  New-Item -type Directory $LanguageDir -EA:Ignore
- Copy-Item $pair.Value.FullName $ResPath
  } Else {
  # Merge Them!
  Write-Host "Merging $($pair.Value.FullName) into $ResPath"
@@ -29,6 +30,19 @@ ForEach ($pair in $Languages.GetEnumerator()) {
  $newXml.root.data | % {
  $null = $existingXml.root.AppendChild($existingXml.ImportNode($_, $true))
  }
- $existingXml.Save($PreexistingResw.FullName)
+ $XmlDocument = $existingXml # (which has been updated)
  }
+
+ # Reset paths to be absolute (for .NET)
+ $LanguageDir = (Get-Item $LanguageDir).FullName
+ $ResPath = "$LanguageDir/Resources.resw"
+ # Force the "new" and "preexisting" paths to serialize with XmlWriter,
+ # to ensure consistency.
+ $writerSettings = [System.Xml.XmlWriterSettings]::new()
+ $writerSettings.NewLineChars = "`r`n"
+ $writerSettings.Indent = $true
+ $writer = [System.Xml.XmlWriter]::Create($ResPath, $writerSettings)
+ $XmlDocument.Save($writer)
+ $writer.Flush()
+ $writer.Close()
 }