Fix the restore failure caused by pulling in two copies of Xaml (micr…

…osoft#12672) Closes microsoft#12671
dmachaj · Mar 11, 2022 · 15874d9 · 15874d9
1 parent a4a6dfc
commit 15874d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/build/packages.config b/build/packages.config
@@ -3,4 +3,6 @@
   <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
   <package id="Microsoft.Taef" version="10.60.210621002" targetFramework="native" />
   <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
+  <!-- This cannot be included in another project that depends on XAML (as it would be a duplicate package ID) -->
+  <package id="Microsoft.UI.Xaml" version="2.7.0" targetFramework="native" />
 </packages>
diff --git a/common.openconsole.props b/common.openconsole.props
@@ -15,11 +15,15 @@
     For the Windows 10 build, we're targeting the prerelease version of Microsoft.UI.Xaml.
     This version emits every XAML DLL directly into our package.
     This is a workaround for us not having deliverable MSFT-21242953 on this version of Windows.
+
+    This version should be tracked in all project packages.config files for projects that depend on Xaml.
     -->
     <TerminalMUXVersion>2.7.0-prerelease.210913003</TerminalMUXVersion>
     <!--
     For the Windows 11-specific build, we're targeting the public version of Microsoft.UI.Xaml.
     This version emits a package dependency instead of embedding the dependency in our own package.
+
+    This version should be tracked in build/packages.config.
     -->
     <TerminalMUXVersion Condition="'$(TerminalTargetWindowsVersion)'=='Win11'">2.7.0</TerminalMUXVersion>
   </PropertyGroup>

diff --git a/src/cascadia/TerminalApp/packages.config b/src/cascadia/TerminalApp/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Toolkit.Win32.UI.XamlApplication" version="6.1.3" targetFramework="native" />
-  <package id="Microsoft.UI.Xaml" version="2.7.0" targetFramework="native" />
   <package id="Microsoft.UI.Xaml" version="2.7.0-prerelease.210913003" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.210825.3" targetFramework="native" />
   <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />