From ef998f8de58629b29e86fd2a371ddc508e86e341 Mon Sep 17 00:00:00 2001
From: Ryan Wintle <ryan.wintle@nventive.com>
Date: Tue, 31 Oct 2023 10:50:35 -0400
Subject: [PATCH] feat: implemented workaround for Uno.Toolkit.UI error

---
 .../DynamicMvvm.Uno.WinUI.csproj              |  1 +
 .../winappsdk-workaround.targets              | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 src/DynamicMvvm.Uno.WinUI/winappsdk-workaround.targets

diff --git a/src/DynamicMvvm.Uno.WinUI/DynamicMvvm.Uno.WinUI.csproj b/src/DynamicMvvm.Uno.WinUI/DynamicMvvm.Uno.WinUI.csproj
index 75c731b..c3f4305 100644
--- a/src/DynamicMvvm.Uno.WinUI/DynamicMvvm.Uno.WinUI.csproj
+++ b/src/DynamicMvvm.Uno.WinUI/DynamicMvvm.Uno.WinUI.csproj
@@ -56,4 +56,5 @@
 	</ItemGroup>
 	
 	<Import Project="..\DynamicMvvm.Shared\DynamicMvvm.Shared.projitems" Label="Shared" />
+	<Import Project="winappsdk-workaround.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/DynamicMvvm.Uno.WinUI/winappsdk-workaround.targets b/src/DynamicMvvm.Uno.WinUI/winappsdk-workaround.targets
new file mode 100644
index 0000000..aabc9c5
--- /dev/null
+++ b/src/DynamicMvvm.Uno.WinUI/winappsdk-workaround.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\net7.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>
\ No newline at end of file