From 52774f5c3c7b8ca7d864368f00a69f7c4b9500e4 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Wed, 2 Jul 2025 09:56:26 +0200
Subject: [PATCH 1/2] Update Microsoft.NET.Test.Sdk.targets

---
 .../netcoreapp/Microsoft.NET.Test.Sdk.targets | 46 +------------------
 1 file changed, 2 insertions(+), 44 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 575fd6be00..6bbe169197 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
@@ -10,52 +10,10 @@
  ***********************************************************************************************
 -->
 
-<Project InitialTargets="GenerateProgramFile" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <!--
-    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 WinUI and UWP apps, as they must use 'WinExe'.
-  -->
   <PropertyGroup>
-    <OutputType Condition="'$(UseWinUI)' != 'true' AND '$(UseUwpTools)' != 'true'">Exe</OutputType>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </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). 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 ('$(UseWinUI)' == 'true' OR '$(UseUwpTools)' == 'true')">false</GenerateProgramFile>
-    <GenerateProgramFile Condition="'$(GenerateProgramFile)' == ''">true</GenerateProgramFile>
-  </PropertyGroup>
-
-  <!--
-    ============================================================
-    GenerateProgramFile
-    Generates Program file which contains the Main entry point
-    ============================================================
-  -->
-  <Target Name="GenerateProgramFile"
-          Condition="'$(GenerateProgramFile)' == 'true'">
-
-    <ItemGroup Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'">
-      <RemoveExistingMicrosoftNETTestSdkProgram Include="@(Compile)" Condition="'%(FileName)' == 'Microsoft.NET.Test.Sdk.Program'" />
-      <Compile Remove="@(RemoveExistingMicrosoftNETTestSdkProgram)" />
-      <Compile Include="$(GeneratedProgramFile)"/>
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(Language)' == 'F#'">
-      <ProgramCompiles Include="@(Compile)" Condition="'%(Identity)' == 'Program.fs'" />
-      <CompileAfter Include="$(GeneratedProgramFile)" Condition="@(ProgramCompiles-&gt;Count()) == 0" />
-    </ItemGroup>
-
-    <Warning Condition="@(ProgramCompiles-&gt;Count()) != 0" Text="A 'Program.fs' file can be automatically generated for F# .NET Core test projects. To fix this warning, either delete the file from the project, or set the &lt;GenerateProgramFile&gt; property to 'false'." />
-
-  </Target>
-
 </Project>

From 9c65e49659c364d54e59203b85e55d97c69600a5 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Wed, 2 Jul 2025 18:49:46 +0200
Subject: [PATCH 2/2] Update Microsoft.NET.Test.Sdk.targets

---
 .../netcoreapp/Microsoft.NET.Test.Sdk.targets | 46 ++++++++++++++++++-
 1 file changed, 45 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 6bbe169197..cd05e2747c 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
@@ -10,10 +10,54 @@
  ***********************************************************************************************
 -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project InitialTargets="GenerateProgramFile" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <!--
+    runtimeconfig.json is needed for .NET Core.
+    Historically, this was done by setting OutputType to Exe and generating a fake empty entry point.
+    We changed that to use GenerateRuntimeConfigurationFiles instead.
+    But we keep generating the empty entry point for backward compatibility reasons.
+    https://devdiv.visualstudio.com/DevDiv/_workitems?id=375688&_a=edit
+  -->
   <PropertyGroup>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </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). 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 ('$(UseWinUI)' == 'true' OR '$(UseUwpTools)' == 'true')">false</GenerateProgramFile>
+    <GenerateProgramFile Condition="'$(GenerateProgramFile)' == ''">true</GenerateProgramFile>
+  </PropertyGroup>
+
+  <!--
+    ============================================================
+    GenerateProgramFile
+    Generates Program file which contains the Main entry point
+    ============================================================
+  -->
+  <Target Name="GenerateProgramFile"
+          Condition="'$(GenerateProgramFile)' == 'true'">
+
+    <ItemGroup Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'">
+      <RemoveExistingMicrosoftNETTestSdkProgram Include="@(Compile)" Condition="'%(FileName)' == 'Microsoft.NET.Test.Sdk.Program'" />
+      <Compile Remove="@(RemoveExistingMicrosoftNETTestSdkProgram)" />
+      <Compile Include="$(GeneratedProgramFile)"/>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(Language)' == 'F#'">
+      <ProgramCompiles Include="@(Compile)" Condition="'%(Identity)' == 'Program.fs'" />
+      <CompileAfter Include="$(GeneratedProgramFile)" Condition="@(ProgramCompiles-&gt;Count()) == 0" />
+    </ItemGroup>
+
+    <Warning Condition="@(ProgramCompiles-&gt;Count()) != 0" Text="A 'Program.fs' file can be automatically generated for F# .NET Core test projects. To fix this warning, either delete the file from the project, or set the &lt;GenerateProgramFile&gt; property to 'false'." />
+
+  </Target>
+
 </Project>