From 0ecb274e430a73accc730887ca949de9d6505f6f Mon Sep 17 00:00:00 2001
From: Nick Randolph <nick@builttoroam.com>
Date: Sat, 16 Mar 2024 00:13:13 +1100
Subject: [PATCH] fix: Moving windows/webview2 workaround to auth MSAL library
 targets

---
 .../build/Package.targets                     | 37 +++++++++++++++++--
 .../TestHarness.Windows.csproj                | 30 +--------------
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/Uno.Extensions.Authentication.MSAL/build/Package.targets b/src/Uno.Extensions.Authentication.MSAL/build/Package.targets
index 4206aaa394..f2226f16ea 100644
--- a/src/Uno.Extensions.Authentication.MSAL/build/Package.targets
+++ b/src/Uno.Extensions.Authentication.MSAL/build/Package.targets
@@ -1,5 +1,34 @@
 <Project>
-  <ItemGroup Condition=" '$(ImplicitUsings)' == 'true' OR '$(ImplicitUsings)' == 'enable' ">
-    <Using Include="Uno.Extensions.Authentication.MSAL" />
- </ItemGroup>
-</Project>
\ No newline at end of file
+	<ItemGroup Condition=" '$(ImplicitUsings)' == 'true' OR '$(ImplicitUsings)' == 'enable' ">
+		<Using Include="Uno.Extensions.Authentication.MSAL" />
+	</ItemGroup>
+
+	<!--
+  This is a temporary workaround to avoid error "NETSDK1152: Found multiple publish output files with the same relative path:"
+  for Microsoft.Web.WebView2.Core.dll, with one coming from MsixContent and the other from the Microsoft.Web.Webview2 Nuget package.
+  If both are present, we only keep the one from the NuGet package. See https://github.com/unoplatform/uno/issues/14555.
+-->
+	<Target Name="ResolveWebView2CoreDuplicates1" BeforeTargets="_ComputeResolvedFilesToPublishTypes" AfterTargets="ComputeFilesToPublish">
+		<Message Importance="high" Text ="Applying workaround to resolve Microsoft.Web.WebView2.Core.dll duplication in package (1)" />
+		<ItemGroup>
+			<_WebView2CoreFilesToExclude Include="@(ResolvedFileToPublish)" Condition="'%(Filename)' == 'Microsoft.Web.WebView2.Core'"/>
+		</ItemGroup>
+		<ItemGroup Condition="'@(_WebView2CoreFilesToExclude->Count())' &gt; 1">
+			<_WebView2CoreFilesToExclude Remove="@(_WebView2CoreFilesToExclude)" Condition="$([System.String]::Copy(%(FullPath)).Contains('.nuget'))"/>
+			<ResolvedFileToPublish Remove="@(_WebView2CoreFilesToExclude)" />
+		</ItemGroup>
+		<Message Importance="high" Text ="Removed: @(_WebView2CoreFilesToExclude)" />
+	</Target>
+
+	<Target Name="ResolveWebView2CoreDuplicates2" BeforeTargets="_ComputeAppxPackagePayload" AfterTargets="GetPackagingOutputs">
+		<Message Importance="high" Text ="Applying workaround to resolve Microsoft.Web.WebView2.Core.dll duplication in package (2)" />
+		<ItemGroup >
+			<_WebView2CoreOutputsToExclude Include="@(PackagingOutputs)" Condition="'%(Filename)' == 'Microsoft.Web.WebView2.Core'"/>
+		</ItemGroup>
+		<ItemGroup Condition="'@(_WebView2CoreOutputsToExclude->Count())' &gt; 1">
+			<_WebView2CoreOutputsToExclude Remove="@(_WebView2CoreOutputsToExclude)" Condition="$([System.String]::Copy(%(FullPath)).Contains('.nuget'))"/>
+			<PackagingOutputs Remove="@(_WebView2CoreOutputsToExclude)" />
+		</ItemGroup>
+		<Message Importance="high" Text ="Removed: @(_WebView2CoreOutputsToExclude)" />
+	</Target>
+</Project>
diff --git a/testing/TestHarness/TestHarness.Windows/TestHarness.Windows.csproj b/testing/TestHarness/TestHarness.Windows/TestHarness.Windows.csproj
index 1eab469d02..19d37a9f38 100644
--- a/testing/TestHarness/TestHarness.Windows/TestHarness.Windows.csproj
+++ b/testing/TestHarness/TestHarness.Windows/TestHarness.Windows.csproj
@@ -94,34 +94,6 @@
 	</ItemGroup>
 
 	<Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
+	<Import Project="..\..\..\src\Uno.Extensions.Authentication.MSAL\build\Package.targets" />
 	<Import Project="..\TestHarness.Shared\TestHarness.Shared.projitems" Label="Shared" Condition="Exists('..\TestHarness.Shared\TestHarness.Shared.projitems')" />
-
-	<!--
-  This is a temporary workaround to avoid error "NETSDK1152: Found multiple publish output files with the same relative path:"
-  for Microsoft.Web.WebView2.Core.dll, with one coming from MsixContent and the other from the Microsoft.Web.Webview2 Nuget package.
-  If both are present, we only keep the one from the NuGet package. See https://github.com/unoplatform/uno/issues/14555.
--->
-	<Target Name="ResolveWebView2CoreDuplicates1" BeforeTargets="_ComputeResolvedFilesToPublishTypes" AfterTargets="ComputeFilesToPublish">
-		<Message Importance="high" Text ="Applying workaround to resolve Microsoft.Web.WebView2.Core.dll duplication in package (1)" />
-		<ItemGroup>
-			<_WebView2CoreFilesToExclude Include="@(ResolvedFileToPublish)" Condition="'%(Filename)' == 'Microsoft.Web.WebView2.Core'"/>
-		</ItemGroup>
-		<ItemGroup Condition="'@(_WebView2CoreFilesToExclude->Count())' &gt; 1">
-			<_WebView2CoreFilesToExclude Remove="@(_WebView2CoreFilesToExclude)" Condition="$([System.String]::Copy(%(FullPath)).Contains('.nuget'))"/>
-			<ResolvedFileToPublish Remove="@(_WebView2CoreFilesToExclude)" />
-		</ItemGroup>
-		<Message Importance="high" Text ="Removed: @(_WebView2CoreFilesToExclude)" />
-	</Target>
-
-	<Target Name="ResolveWebView2CoreDuplicates2" BeforeTargets="_ComputeAppxPackagePayload" AfterTargets="GetPackagingOutputs">
-		<Message Importance="high" Text ="Applying workaround to resolve Microsoft.Web.WebView2.Core.dll duplication in package (2)" />
-		<ItemGroup >
-			<_WebView2CoreOutputsToExclude Include="@(PackagingOutputs)" Condition="'%(Filename)' == 'Microsoft.Web.WebView2.Core'"/>
-		</ItemGroup>
-		<ItemGroup Condition="'@(_WebView2CoreOutputsToExclude->Count())' &gt; 1">
-			<_WebView2CoreOutputsToExclude Remove="@(_WebView2CoreOutputsToExclude)" Condition="$([System.String]::Copy(%(FullPath)).Contains('.nuget'))"/>
-			<PackagingOutputs Remove="@(_WebView2CoreOutputsToExclude)" />
-		</ItemGroup>
-		<Message Importance="high" Text ="Removed: @(_WebView2CoreOutputsToExclude)" />
-	</Target>
 </Project>