From d3a86149327cd22a9faa0c5a09eb76c4b4082a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <marcandre.moreau@gmail.com>
Date: Wed, 25 Jan 2023 15:34:47 -0500
Subject: [PATCH] update to v1.16.10231.0 (#14)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* update to v1.16.10231.0, remove old workflow

* remove XamlHost, Appx manifests

Co-authored-by: Marc-André Moreau <mamoreau@devolutions.net>
---
 .github/workflows/dependencies.yml     | 54 --------------------------
 .github/workflows/windows-terminal.yml |  5 ++-
 installer/WindowsTerminal.wxs          |  4 --
 3 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 .github/workflows/dependencies.yml

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
deleted file mode 100644
index df36260..0000000
--- a/.github/workflows/dependencies.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-name: Dependencies
-on:
-  workflow_dispatch:
-    inputs:
-      codesign:
-        description: 'Code signing'
-        required: true
-        default: 'test'
-        type: choice
-        options:
-        - test
-        - none
-
-jobs:
-  package:
-    runs-on: windows-2022
-    
-    steps:
-      - name: Clone project
-        uses: actions/checkout@v3
-
-      - name: Import code signing certificate
-        if:  ${{ inputs.codesign == 'test' }} 
-        shell: pwsh
-        run: |
-          $AuthenticodePath = "~\Documents\Authenticode"
-          New-Item -ItemType Directory -Path $AuthenticodePath -ErrorAction SilentlyContinue | Out-Null
-          $TestCertsUrl = "https://raw.githubusercontent.com/Devolutions/devolutions-authenticode/master/data/certs"
-          @('authenticode-test-ca.crt','authenticode-test-cert.pfx') | ForEach-Object {
-              Invoke-WebRequest -Uri "$TestCertsUrl/$_" -OutFile $AuthenticodePath\$_
-          }
-          Import-Certificate -FilePath "$AuthenticodePath\authenticode-test-ca.crt" -CertStoreLocation "cert:\LocalMachine\Root"
-          $CodeSignPassword = ConvertTo-SecureString "CodeSign123!" -AsPlainText -Force
-          Import-PfxCertificate -FilePath "$AuthenticodePath\authenticode-test-cert.pfx" -CertStoreLocation 'cert:\CurrentUser\My' -Password $CodeSignPassword
-
-          $CodesignThumbprint = Get-ChildItem cert:\CurrentUser\My -CodeSigning | Select-Object -First 1 -ExpandProperty Thumbprint
-          echo "CODESIGN_THUMBPRINT=$CodesignThumbprint" >> $Env:GITHUB_ENV
-          echo "TIMESTAMP_SERVER=http://timestamp.digicert.com" >> $Env:GITHUB_ENV
-
-      - name: VCRT Forwarders
-        shell: pwsh
-        run: |
-          choco install reshack -y --no-progress
-          Install-Module -Name VsDevShell -Force
-          Enter-VsDevShell x64
-          New-Item -Path .\package -ItemType Directory -Force | Out-Null
-          Set-Location .\package
-          ..\scripts\FixVCRTForwarders.ps1
-
-      - name: Upload packages
-        uses: actions/upload-artifact@v3
-        with:
-          name: wt-dependencies
-          path: package/*.nupkg
diff --git a/.github/workflows/windows-terminal.yml b/.github/workflows/windows-terminal.yml
index 4b35edc..0cda3ea 100644
--- a/.github/workflows/windows-terminal.yml
+++ b/.github/workflows/windows-terminal.yml
@@ -4,11 +4,11 @@ on:
     inputs:
       git_ref:
         description: 'upstream git ref'
-        default: "v1.16.3463.0"
+        default: "v1.16.10231.0"
         required: true
       version:
         description: 'build version'
-        default: "1.16.3463.0"
+        default: "1.16.10231.0"
         required: true
 
 jobs:
@@ -98,6 +98,7 @@ jobs:
           Remove-Item ".\output\${PackageName}" -Recurse -ErrorAction SilentlyContinue
           New-Item ".\output\${PackageName}" -Type Directory -Force | Out-Null
           & makeappx unpack /v /o /p $MsixPackage.FullName /d ".\output\${PackageName}"
+          Remove-Item ".\output\${PackageName}\Appx*.xml" -Force
           Remove-Item ".\output\${PackageName}\Images" -Recurse
           Compress-Archive ".\output\${PackageName}\*" -DestinationPath "C:\workspace\${PackageName}.zip" -CompressionLevel Optimal
 
diff --git a/installer/WindowsTerminal.wxs b/installer/WindowsTerminal.wxs
index e45c815..053ea0a 100644
--- a/installer/WindowsTerminal.wxs
+++ b/installer/WindowsTerminal.wxs
@@ -23,13 +23,9 @@
 				<File Source="$(var.WTDir)\Microsoft.Terminal.Settings.Model.winmd"></File>
 				<File Source="$(var.WTDir)\Microsoft.UI.Xaml.dll"></File>
 				<File Source="$(var.WTDir)\Microsoft.UI.Xaml.winmd"></File>
-				<File Source="$(var.WTDir)\Microsoft.Toolkit.Win32.UI.XamlHost.dll"></File>
-				<File Source="$(var.WTDir)\Microsoft.Toolkit.Win32.UI.XamlHost.winmd"></File>
 				<File Source="$(var.WTDir)\defaults.json"></File>
 				<File Source="$(var.WTDir)\resources.pri"></File>
 				<File Source="$(var.WTDir)\NOTICE.html"></File>
-				<File Source="$(var.WTDir)\AppxManifest.xml"></File>
-				<File Source="$(var.WTDir)\AppxBlockMap.xml"></File>
 			</Component>
 			<Component Guid="e6896119-c022-4203-85a0-bd71b801f3fb">
 				<File Source="$(var.WTDir)\WindowsTerminalShellExt.dll"></File>