From 4a1d4d54d28fc419edd9e7fce81548a85215f3bf Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 19 Jan 2024 23:02:39 +0200
Subject: [PATCH] Enable building WASDK Self-Contained packaged apps

---
 Directory.Build.targets                       |  2 +-
 .../buildTransitive/WinUI.Unpackaged.targets  | 39 -------------------
 .../src/nuget/buildTransitive/WinUI.targets   | 32 ++++++++++++++-
 .../TemplateTests.cs                          | 30 ++++++++++++++
 4 files changed, 62 insertions(+), 41 deletions(-)
 delete mode 100644 src/Core/src/nuget/buildTransitive/WinUI.Unpackaged.targets

diff --git a/Directory.Build.targets b/Directory.Build.targets
index b6c48d5223eb..5feebecca537 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -76,7 +76,7 @@
   <!--
     Workaround for https://github.com/microsoft/WindowsAppSDK/issues/2684
   -->
-  <Import Project="src\Core\src\nuget\buildTransitive\WinUI.Unpackaged.targets" Condition=" '$(WindowsPackageType)' == 'None' and '$(_MauiTargetPlatformIsWindows)' == 'True' " />
+  <Import Project="src\Core\src\nuget\buildTransitive\WinUI.targets" Condition=" '$(WindowsPackageType)' == 'None' and '$(_MauiTargetPlatformIsWindows)' == 'True' " />
 
   <!-- NuGet package information -->
   <PropertyGroup Condition="'$(IsPackable)' == 'true'">
diff --git a/src/Core/src/nuget/buildTransitive/WinUI.Unpackaged.targets b/src/Core/src/nuget/buildTransitive/WinUI.Unpackaged.targets
deleted file mode 100644
index 6ea3566ce2bc..000000000000
--- a/src/Core/src/nuget/buildTransitive/WinUI.Unpackaged.targets
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- Workarounds for WinUI -->
-<Project>
-
-  <!--
-    Workaround for https://github.com/microsoft/WindowsAppSDK/issues/2684
-    This replaces the error check target entirely as it is not needed.
-  -->
-  <Target Name="WindowsAppSDKSelfContainedVerifyConfiguration">
-  </Target>
-
-  <!--
-    Workaround for https://github.com/microsoft/WindowsAppSDK/issues/2684
-    This adjusts the items if we are still resolving to AnyCPU.
-  -->
-  <Target Name="_MAUIAfter_GetExtractMicrosoftWindowsAppSDKMsixFilesInputs"
-          AfterTargets="GetExtractMicrosoftWindowsAppSDKMsixFilesInputs"
-          Condition="'$(NativePlatform)' == 'AnyCPU'">
-    <PropertyGroup>
-      <NativePlatform>Invalid</NativePlatform>
-      <NativePlatform Condition="'$(Platform)' == 'x86'">x86</NativePlatform>
-      <NativePlatform Condition="'$(Platform)' == 'Win32'">x86</NativePlatform>
-      <NativePlatform Condition="'$(Platform)' == 'x64'">x64</NativePlatform>
-      <NativePlatform Condition="'$(Platform)' == 'arm'">arm</NativePlatform>
-      <NativePlatform Condition="'$(Platform)' == 'arm64'">arm64</NativePlatform>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Platform)' == 'AnyCPU'">
-      <NativePlatform>neutral</NativePlatform>
-      <NativePlatform Condition="'$(RuntimeIdentifier)' == 'win10-x86'">x86</NativePlatform>
-      <NativePlatform Condition="'$(RuntimeIdentifier)' == 'win10-x64'">x64</NativePlatform>
-      <NativePlatform Condition="'$(RuntimeIdentifier)' == 'win10-arm'">arm</NativePlatform>
-      <NativePlatform Condition="'$(RuntimeIdentifier)' == 'win10-arm64'">arm64</NativePlatform>
-    </PropertyGroup>
-    <ItemGroup>
-      <MicrosoftWindowsAppSDKMsix Include="$([MSBuild]::NormalizeDirectory('$(MicrosoftWindowsAppSDKPackageDir)','tools\Msix\win10-$(NativePlatform)'))Microsoft.WindowsAppRuntime.?.?.Msix"/>
-      <MicrosoftWindowsAppSDKMsix Include="$([MSBuild]::NormalizeDirectory('$(MicrosoftWindowsAppSDKPackageDir)','tools\Msix\win10-$(NativePlatform)'))Microsoft.WindowsAppRuntime.?.?-*.Msix"/>
-    </ItemGroup>
-  </Target>
-
-</Project>
diff --git a/src/Core/src/nuget/buildTransitive/WinUI.targets b/src/Core/src/nuget/buildTransitive/WinUI.targets
index e6a9d3e59b13..84feb7671501 100644
--- a/src/Core/src/nuget/buildTransitive/WinUI.targets
+++ b/src/Core/src/nuget/buildTransitive/WinUI.targets
@@ -28,7 +28,37 @@
 
   <!--
     Workaround for https://github.com/microsoft/WindowsAppSDK/issues/2684
+    This replaces the error check target entirely as it is not needed.
   -->
-  <Import Project="WinUI.Unpackaged.targets" Condition=" '$(WindowsPackageType)' == 'None' " />
+  <Target Name="WindowsAppSDKSelfContainedVerifyConfiguration">
+  </Target>
+
+  <!--
+    Workaround for https://github.com/microsoft/WindowsAppSDK/issues/2684
+    This adjusts the items if we are still resolving to AnyCPU.
+  -->
+  <Target Name="_MAUIAfter_GetExtractMicrosoftWindowsAppSDKMsixFilesInputs"
+          AfterTargets="GetExtractMicrosoftWindowsAppSDKMsixFilesInputs"
+          Condition="'$(NativePlatform)' == 'AnyCPU'">
+    <PropertyGroup>
+      <NativePlatform>Invalid</NativePlatform>
+      <NativePlatform Condition="'$(Platform)' == 'x86'">x86</NativePlatform>
+      <NativePlatform Condition="'$(Platform)' == 'Win32'">x86</NativePlatform>
+      <NativePlatform Condition="'$(Platform)' == 'x64'">x64</NativePlatform>
+      <NativePlatform Condition="'$(Platform)' == 'arm'">arm</NativePlatform>
+      <NativePlatform Condition="'$(Platform)' == 'arm64'">arm64</NativePlatform>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Platform)' == 'AnyCPU'">
+      <NativePlatform>neutral</NativePlatform>
+      <NativePlatform Condition="'$(RuntimeIdentifier)' == 'win10-x86'">x86</NativePlatform>
+      <NativePlatform Condition="'$(RuntimeIdentifier)' == 'win10-x64'">x64</NativePlatform>
+      <NativePlatform Condition="'$(RuntimeIdentifier)' == 'win10-arm'">arm</NativePlatform>
+      <NativePlatform Condition="'$(RuntimeIdentifier)' == 'win10-arm64'">arm64</NativePlatform>
+    </PropertyGroup>
+    <ItemGroup>
+      <MicrosoftWindowsAppSDKMsix Include="$([MSBuild]::NormalizeDirectory('$(MicrosoftWindowsAppSDKPackageDir)','tools\Msix\win10-$(NativePlatform)'))Microsoft.WindowsAppRuntime.?.?.Msix"/>
+      <MicrosoftWindowsAppSDKMsix Include="$([MSBuild]::NormalizeDirectory('$(MicrosoftWindowsAppSDKPackageDir)','tools\Msix\win10-$(NativePlatform)'))Microsoft.WindowsAppRuntime.?.?-*.Msix"/>
+    </ItemGroup>
+  </Target>
 
 </Project>
diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs
index 53b3087746ba..8deedb9d715a 100644
--- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs
+++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/TemplateTests.cs
@@ -113,6 +113,36 @@ public void BuildUnpackaged(string id, string framework, string config)
 				$"Project {Path.GetFileName(projectFile)} failed to build. Check test output/attachments for errors.");
 		}
 
+		[Test]
+		[TestCase("maui", true, true)]
+		[TestCase("maui", true, false)]
+		[TestCase("maui", false, true)]
+		public void BuildWindowsAppSDKSelfContained(string id, bool wasdkself, bool netself)
+		{
+			if (TestEnvironment.IsMacOS)
+				Assert.Ignore("This test is designed for testing a windows build.");
+
+			var projectDir = TestDirectory;
+			var projectFile = Path.Combine(projectDir, $"{Path.GetFileName(projectDir)}.csproj");
+
+			Assert.IsTrue(DotnetInternal.New(id, projectDir, DotNetCurrent),
+				$"Unable to create template {id}. Check test output for errors.");
+
+			FileUtilities.ReplaceInFile(projectFile,
+				"<UseMaui>true</UseMaui>",
+				$"""
+				<UseMaui>true</UseMaui>
+				<WindowsAppSDKSelfContained>{wasdkself}</WindowsAppSDKSelfContained>
+				<SelfContained>{netself}</SelfContained>
+				""");
+
+			var extendedBuildProps = BuildProps;
+			extendedBuildProps.Add($"TargetFramework={DotNetCurrent}-windows10.0.19041.0");
+
+			Assert.IsTrue(DotnetInternal.Build(projectFile, "Release", properties: extendedBuildProps, msbuildWarningsAsErrors: true),
+				$"Project {Path.GetFileName(projectFile)} failed to build. Check test output/attachments for errors.");
+		}
+
 		[Test]
 		[TestCase("maui", $"{DotNetCurrent}-ios", "ios-arm64")]
 		public void PublishNativeAOT(string id, string framework, string runtimeIdentifier)