From 5d62890ddce0aedfea0aa0927c5edaa93161a8bc Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Thu, 6 Feb 2025 22:37:56 -0800
Subject: [PATCH 1/2] Fix builds on UWP .NET 9 projects

---
 .../netcoreapp/Microsoft.NET.Test.Sdk.targets          | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.targets b/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.targets
index 7769237ada..3bfa3e9ae3 100644
--- a/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.targets
+++ b/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.targets
@@ -15,13 +15,21 @@
   <!--
     Output type for .NET Core test projects should be exe.
     https://devdiv.visualstudio.com/DevDiv/_workitems?id=375688&_a=edit
+    Note: we skip this for UWP apps on .NET 9, as they must use 'WinExe'.
   -->
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType Condition="'$(UseUwpTools)' != 'true'">Exe</OutputType>
   </PropertyGroup>
 
   <PropertyGroup>
     <GeneratedProgramFile Condition="'$(GeneratedProgramFile)' == ''">$(MSBuildThisFileDirectory)Microsoft.NET.Test.Sdk.Program$(DefaultLanguageSourceExtension)</GeneratedProgramFile>
+
+    <!--
+      We always skip the generated entry point for UWP apps on .NET 9, as those need a separate entry point
+      to initialize the 'CoreApplication' app, which is handled separately. That is, it will either be in
+      the project template, or generated by the XAML compiler (for UWP XAML apps).
+  -->
+    <GenerateProgramFile Condition="'$(GenerateProgramFile)' == '' AND '$(UseUwpTools)' == 'true'">false</GenerateProgramFile>
     <GenerateProgramFile Condition="'$(GenerateProgramFile)' == ''">true</GenerateProgramFile>
   </PropertyGroup>
 

From 388049bb271559e6e57fc60ffbef03df244356af Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Fri, 7 Feb 2025 09:22:08 -0800
Subject: [PATCH 2/2] Fix builds for WinUI as well

---
 .../netcoreapp/Microsoft.NET.Test.Sdk.targets            | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.targets b/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.targets
index 3bfa3e9ae3..575fd6be00 100644
--- a/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.targets
+++ b/src/package/Microsoft.NET.Test.Sdk/netcoreapp/Microsoft.NET.Test.Sdk.targets
@@ -15,10 +15,10 @@
   <!--
     Output type for .NET Core test projects should be exe.
     https://devdiv.visualstudio.com/DevDiv/_workitems?id=375688&_a=edit
-    Note: we skip this for UWP apps on .NET 9, as they must use 'WinExe'.
+    Note: we skip this for WinUI and UWP apps, as they must use 'WinExe'.
   -->
   <PropertyGroup>
-    <OutputType Condition="'$(UseUwpTools)' != 'true'">Exe</OutputType>
+    <OutputType Condition="'$(UseWinUI)' != 'true' AND '$(UseUwpTools)' != 'true'">Exe</OutputType>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -27,9 +27,10 @@
     <!--
       We always skip the generated entry point for UWP apps on .NET 9, as those need a separate entry point
       to initialize the 'CoreApplication' app, which is handled separately. That is, it will either be in
-      the project template, or generated by the XAML compiler (for UWP XAML apps).
+      the project template, or generated by the XAML compiler (for UWP XAML apps). We also do the same
+      for WinUI apps, since those also have a special entry point produced by the XAML compiler.
   -->
-    <GenerateProgramFile Condition="'$(GenerateProgramFile)' == '' AND '$(UseUwpTools)' == 'true'">false</GenerateProgramFile>
+    <GenerateProgramFile Condition="'$(GenerateProgramFile)' == '' AND ('$(UseWinUI)' == 'true' OR '$(UseUwpTools)' == 'true')">false</GenerateProgramFile>
     <GenerateProgramFile Condition="'$(GenerateProgramFile)' == ''">true</GenerateProgramFile>
   </PropertyGroup>