update to v1.16.10231.0 (#14)

* update to v1.16.10231.0, remove old workflow * remove XamlHost, Appx manifests Co-authored-by: Marc-André Moreau <[email protected]>
Devolutions · Jan 25, 2023 · d3a8614 · d3a8614
1 parent 3b69224
commit d3a8614
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 60 deletions.
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
diff --git 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
@@ -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>