From a277b56f6ae02d3dea8f20fb50a73a57c94e54ff Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Tue, 16 Aug 2022 16:42:55 -0500 Subject: [PATCH] [1.14] Update the MUX package to 2.7.3 (#13761) Does two things: * the first two commits: shakes up the way we reference MUX in our projects so we can actually just ```xml true ``` Like every other dependency we have * the last commit: update to MUX.2.7.3 This is the 1.14 PR, which should be appropriately cherry-picked through to `release-1.15` and `main` --- build/packages.config | 2 +- common.openconsole.props | 4 ++-- dep/nuget/packages.config | 2 +- .../CascadiaPackage/CascadiaPackage.wapproj | 13 ++++++------- src/cascadia/TerminalApp/TerminalAppLib.vcxproj | 8 +------- src/cascadia/TerminalApp/dll/TerminalApp.vcxproj | 9 +-------- .../Microsoft.Terminal.Settings.Editor.vcxproj | 8 +------- .../Microsoft.Terminal.Settings.ModelLib.vcxproj | 8 +------- .../dll/Microsoft.Terminal.Settings.Model.vcxproj | 9 +-------- .../WindowsTerminal/WindowsTerminal.vcxproj | 9 +-------- src/common.nugetversions.targets | 6 ++++++ 11 files changed, 22 insertions(+), 56 deletions(-) diff --git a/build/packages.config b/build/packages.config index 189017052d2..6e72d2e4a3b 100644 --- a/build/packages.config +++ b/build/packages.config @@ -4,5 +4,5 @@ - + diff --git a/common.openconsole.props b/common.openconsole.props index e92b42f4f9e..3b3c856c162 100644 --- a/common.openconsole.props +++ b/common.openconsole.props @@ -18,14 +18,14 @@ This version should be tracked in all project packages.config files for projects that depend on Xaml. --> - 2.7.2-prerelease.220406002 + 2.7.3-prerelease.220816001 - 2.7.1 + 2.7.3 diff --git a/dep/nuget/packages.config b/dep/nuget/packages.config index 09b288183b3..ffa247ab5d9 100644 --- a/dep/nuget/packages.config +++ b/dep/nuget/packages.config @@ -10,7 +10,7 @@ - + diff --git a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj index b5274d09103..d287e564b8d 100644 --- a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj +++ b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj @@ -1,7 +1,12 @@ + + + true + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + diff --git a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj index fbf1e051fd5..81105a6e65a 100644 --- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj +++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj @@ -20,6 +20,7 @@ true true + true @@ -407,13 +408,6 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - diff --git a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj index 21184811d31..ec115c44984 100644 --- a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj +++ b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj @@ -14,6 +14,7 @@ true true + true @@ -274,13 +275,6 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - diff --git a/src/cascadia/TerminalSettingsModel/dll/Microsoft.Terminal.Settings.Model.vcxproj b/src/cascadia/TerminalSettingsModel/dll/Microsoft.Terminal.Settings.Model.vcxproj index 4986ae29bd8..54096753eed 100644 --- a/src/cascadia/TerminalSettingsModel/dll/Microsoft.Terminal.Settings.Model.vcxproj +++ b/src/cascadia/TerminalSettingsModel/dll/Microsoft.Terminal.Settings.Model.vcxproj @@ -14,6 +14,7 @@ true + true @@ -105,14 +106,6 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - $(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories); diff --git a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj index e4e6186e799..48e8a55aa30 100644 --- a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj +++ b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj @@ -21,6 +21,7 @@ true true true + true @@ -141,14 +142,6 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + @@ -95,6 +98,9 @@ + + +