From 314ed5dda62b64f9cc196ff7c1ab3f14c59a547a Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Mon, 23 Oct 2023 14:08:32 -0600
Subject: [PATCH 1/2] fix: winappsdk pri duplication

---
 Directory.Build.targets       | 10 +---------
 winappsdk-workarounds.targets | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 winappsdk-workarounds.targets

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 52e3da3618..7b11db7a98 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="winappsdk-workarounds.targets" Condition=" $(IsUnoProject) == 'true' " />
   <PropertyGroup>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
   </PropertyGroup>
@@ -11,13 +12,4 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
-  <!-- <Choose>
-    <When Condition="$(IsUnoProject)">
-      <ItemGroup>
-        <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22621.28" />
-        <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22621.28" />
-      </ItemGroup>
-    </When>
-  </Choose> -->
-
 </Project>
diff --git a/winappsdk-workarounds.targets b/winappsdk-workarounds.targets
new file mode 100644
index 0000000000..8d1368af3c
--- /dev/null
+++ b/winappsdk-workarounds.targets
@@ -0,0 +1,27 @@
+<Project>
+  <!--
+    Workaround to avoid including Uno.Toolkit.UI XBFs in the PRI file:
+      > C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\Microsoft.Common.CurrentVersion.targets(5097,5):
+      > error MSB3030: Could not copy the file "D:\a\1\s\src\Uno.Toolkit.UI\obj\Uno.Toolkit.WinUI\Release\net5.0-windows10.0.19041\Controls\AutoLayout\AutoLayout.xbf" because it was not found.
+      > [D:\a\1\s\src\Uno.Toolkit.RuntimeTests\Uno.Toolkit.RuntimeTests.WinUI.csproj]
+    Just <Import /> this file into the winui project appearing in the `[]` bracket.
+  -->
+  <Target Name="AdjustGetPackagingOutput1" AfterTargets="GetMrtPackagingOutputs">
+    <Message Importance="high" Text="Applying NuGet packaging workaround for dependent PRI files exclusion" />
+    <ItemGroup>
+      <_OtherPriFiles Include="@(PackagingOutputs)" Condition="'%(Extension)' == '.pri' and ('%(PackagingOutputs.ReferenceSourceTarget)' == 'ProjectReference' or '%(PackagingOutputs.NugetSourceType)'=='Package')" />
+      <PackagingOutputs Remove="@(_OtherPriFiles)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="AdjustGetPackagingOutput2" BeforeTargets="AddPriPayloadFilesToCopyToOutputDirectoryItems">
+    <Message Importance="high" Text="Applying NuGet packaging workaround for dependent PRI files exclusion" />
+    <ItemGroup>
+      <_OtherPriFiles1 Include="@(_ReferenceRelatedPaths)" Condition="'%(Extension)' == '.pri' and ('%(_ReferenceRelatedPaths.ReferenceSourceTarget)' == 'ProjectReference' or '%(_ReferenceRelatedPaths.NugetSourceType)'=='Package')" />
+      <_ReferenceRelatedPaths Remove="@(_OtherPriFiles1)" />
+
+      <_OtherPriFiles2 Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.pri' and ('%(ReferenceCopyLocalPaths.ReferenceSourceTarget)' == 'ProjectReference' or '%(ReferenceCopyLocalPaths.NugetSourceType)'=='Package')" />
+      <ReferenceCopyLocalPaths Remove="@(_OtherPriFiles2)" />
+    </ItemGroup>
+  </Target>
+</Project>

From 4bd9b5011402460a64c0be55facfb9298995e220 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Mon, 23 Oct 2023 14:08:51 -0600
Subject: [PATCH 2/2] chore: cleanup unused namespace

---
 src/Uno/Prism.Uno/PrismApplicationBase.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Uno/Prism.Uno/PrismApplicationBase.cs b/src/Uno/Prism.Uno/PrismApplicationBase.cs
index 3e6951dbef..505874f264 100644
--- a/src/Uno/Prism.Uno/PrismApplicationBase.cs
+++ b/src/Uno/Prism.Uno/PrismApplicationBase.cs
@@ -5,7 +5,6 @@
 using Prism.Modularity;
 using Prism.Mvvm;
 using Prism.Navigation.Regions;
-using Uno.Toolkit;
 using Application = Microsoft.UI.Xaml.Application;
 
 #nullable enable