[PR #15031] [MERGED] Consolidate our MSIX distribution back down to one package #30360

Open
opened 2026-01-31 09:40:19 +00:00 by claunia · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/15031
Author: @DHowett
Created: 3/22/2023
Status: Merged
Merged: 3/24/2023
Merged by: @zadjii-msft

Base: mainHead: dev/duhowett/one-package-to-rule-them-etc


📝 Commits (7)

  • 0078c55 HAX: one package to rule them
  • 179196e Purge TerminalMUXVersion and MUXBinRoot
  • 2db228d Merge remote-tracking branch 'origin/main' into dev/duhowett/one-package-to-rule-them-etc
  • fc1394a Merge remote-tracking branch 'origin/main' into dev/duhowett/one-package-to-rule-them-etc
  • a086f5b New winget publish pipeline too!
  • a891f73 Revert "Remove the win10/win11 digit from our version number. (#14660)"
  • 9194857 Remove that pesky itemgroup

📊 Changes

19 files changed (+31 additions, -150 deletions)

View changed files

📝 .github/workflows/winget.yml (+2 -2)
📝 build/packages.config (+0 -2)
📝 build/pipelines/release.yml (+21 -45)
build/scripts/Patch-ManifestsToWindowsVersion.ps1 (+0 -14)
📝 common.openconsole.props (+0 -18)
📝 custom.props (+0 -12)
📝 dep/nuget/packages.config (+1 -1)
📝 src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj (+1 -11)
📝 src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj (+1 -11)
📝 src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj (+2 -2)
📝 src/cascadia/TerminalApp/TerminalAppLib.vcxproj (+0 -1)
src/cascadia/TerminalApp/packages.config (+0 -4)
📝 src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj (+0 -1)
src/cascadia/TerminalSettingsEditor/packages.config (+0 -4)
📝 src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp (+1 -6)
📝 src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj (+0 -3)
src/cascadia/WindowsTerminal/packages.config (+0 -4)
📝 src/cascadia/ut_app/TerminalApp.UnitTests.vcxproj (+0 -7)
📝 src/common.nugetversions.targets (+2 -2)

📄 Description

We ship a separate package to Windows 10, which contains a copy of XAML embedded in it, because of a bug in activating classes from framework packages while we're elevated.

We did this to avoid wasting disk space on Windows 11 installs (which is critical given that we're preinstalled in the Windows image.)

The fix for this issue was released in a servicing update in April 2022. Thanks to KB5011831, we no longer need this workaround!

And finally, this means that we no longer need to depend on a copy of "pre-release" XAML. We only did that because it would copy all of its assets into our package.

Introduced in #12560
Closes #14106
Closes (discussion) #14981
Reverts #14660


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/microsoft/terminal/pull/15031 **Author:** [@DHowett](https://github.com/DHowett) **Created:** 3/22/2023 **Status:** ✅ Merged **Merged:** 3/24/2023 **Merged by:** [@zadjii-msft](https://github.com/zadjii-msft) **Base:** `main` ← **Head:** `dev/duhowett/one-package-to-rule-them-etc` --- ### 📝 Commits (7) - [`0078c55`](https://github.com/microsoft/terminal/commit/0078c55e9b86ff65d4c6b617fc4b83f14e8b86ed) HAX: one package to rule them - [`179196e`](https://github.com/microsoft/terminal/commit/179196ed447d2b44c21a39caec5d157c992e9dee) Purge TerminalMUXVersion and MUXBinRoot - [`2db228d`](https://github.com/microsoft/terminal/commit/2db228d4ccdd9eee43ba23a54aef79d002a80603) Merge remote-tracking branch 'origin/main' into dev/duhowett/one-package-to-rule-them-etc - [`fc1394a`](https://github.com/microsoft/terminal/commit/fc1394aeb9fd868e1e4a2eb704fe2eeb31f56398) Merge remote-tracking branch 'origin/main' into dev/duhowett/one-package-to-rule-them-etc - [`a086f5b`](https://github.com/microsoft/terminal/commit/a086f5b29f63ac35d0891771753fa6534ebeffff) New winget publish pipeline too! - [`a891f73`](https://github.com/microsoft/terminal/commit/a891f73945cc1086a30b727f137bf9fa4104d1e2) Revert "Remove the win10/win11 digit from our version number. (#14660)" - [`9194857`](https://github.com/microsoft/terminal/commit/9194857201e78c6768eca34222e58b254ad34c20) Remove that pesky itemgroup ### 📊 Changes **19 files changed** (+31 additions, -150 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/winget.yml` (+2 -2) 📝 `build/packages.config` (+0 -2) 📝 `build/pipelines/release.yml` (+21 -45) ➖ `build/scripts/Patch-ManifestsToWindowsVersion.ps1` (+0 -14) 📝 `common.openconsole.props` (+0 -18) 📝 `custom.props` (+0 -12) 📝 `dep/nuget/packages.config` (+1 -1) 📝 `src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj` (+1 -11) 📝 `src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj` (+1 -11) 📝 `src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj` (+2 -2) 📝 `src/cascadia/TerminalApp/TerminalAppLib.vcxproj` (+0 -1) ➖ `src/cascadia/TerminalApp/packages.config` (+0 -4) 📝 `src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj` (+0 -1) ➖ `src/cascadia/TerminalSettingsEditor/packages.config` (+0 -4) 📝 `src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp` (+1 -6) 📝 `src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj` (+0 -3) ➖ `src/cascadia/WindowsTerminal/packages.config` (+0 -4) 📝 `src/cascadia/ut_app/TerminalApp.UnitTests.vcxproj` (+0 -7) 📝 `src/common.nugetversions.targets` (+2 -2) </details> ### 📄 Description We ship a separate package to Windows 10, which contains a copy of XAML embedded in it, because of a bug in activating classes from framework packages while we're elevated. We did this to avoid wasting disk space on Windows 11 installs (which is critical given that we're preinstalled in the Windows image.) The fix for this issue was released in a servicing update in April 2022. Thanks to KB5011831, we no longer need this workaround! And finally, this means that we no longer need to depend on a copy of "pre-release" XAML. We only did that because it would copy all of its assets into our package. Introduced in #12560 Closes #14106 Closes (discussion) #14981 Reverts #14660 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
claunia added the pull-request label 2026-01-31 09:40:19 +00:00
Sign in to join this conversation.
No Label pull-request
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#30360