From 72cdfdc80cc568a5e5262ed285d5fe9e634ea974 Mon Sep 17 00:00:00 2001
From: Saul Rennison <saul@users.noreply.github.com>
Date: Fri, 29 Jun 2018 22:29:36 +0100
Subject: [PATCH 1/4] Auto-generate F# program file

---
 src/package/nuspec/Microsoft.NET.Test.Sdk.targets | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
index b0af70a3a2..8b0385ca1f 100644
--- a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
+++ b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
@@ -56,7 +56,7 @@
           Condition="'$(GenerateProgramFile)' == 'true'" />
 
   <Target Name="CoreGenerateProgramFile"
-          Condition="'$(Language)'=='VB' or '$(Language)'=='C#'"
+          Condition="'$(Language)'=='VB' or '$(Language)'=='C#' or '$(Language)'=='F#'"
           Inputs="$(MSBuildAllProjects)"
           Outputs="$(GeneratedProgramFile)">
 
@@ -76,6 +76,13 @@
       <Line Include="End Sub"/>
       <Line Include="End Module"/>
     </ItemGroup>
+
+    <ItemGroup Condition="'$(Language)'=='F#'">
+      <Line Include="module Program"/>
+      <Line Include="[&lt;EntryPoint&gt;]"/>
+      <Line Include="let main _ = 0"/>
+    </ItemGroup>
+
     <WriteLinesToFile
       File="$(GeneratedProgramFile)" Lines="@(Line)" Overwrite="true" Encoding="Unicode">
     </WriteLinesToFile>

From 4e681102b062d15a9ae2cf0af1ed3fc08d5ce92f Mon Sep 17 00:00:00 2001
From: Saul Rennison <saul@users.noreply.github.com>
Date: Fri, 29 Jun 2018 22:36:42 +0100
Subject: [PATCH 2/4] Update Microsoft.NET.Test.Sdk.targets

---
 src/package/nuspec/Microsoft.NET.Test.Sdk.targets | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
index 8b0385ca1f..fad414e452 100644
--- a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
+++ b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
@@ -90,8 +90,12 @@
     <!--
     Compile Include the generated Program File
     -->
-    <ItemGroup>
+    <ItemGroup Condition="'$(Language)'!='F#'">
       <Compile Include="$(GeneratedProgramFile)"/>
     </ItemGroup>
+
+    <ItemGroup Condition="'$(Language)'=='F#'">
+      <CompileAfter Include="$(GeneratedProgramFile)"/>
+    </ItemGroup>
   </Target>
 </Project>

From 13f4d46582dd0408aa8cb3744b2a2522e2576ba6 Mon Sep 17 00:00:00 2001
From: Saul Rennison <saul@users.noreply.github.com>
Date: Fri, 29 Jun 2018 23:07:25 +0100
Subject: [PATCH 3/4] Update Microsoft.NET.Test.Sdk.targets

---
 src/package/nuspec/Microsoft.NET.Test.Sdk.targets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
index fad414e452..e0e4405b99 100644
--- a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
+++ b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
@@ -78,8 +78,10 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(Language)'=='F#'">
-      <Line Include="module Program"/>
+      <Line Include="// &lt;auto-generated&gt; This file has been auto generated. &lt;/auto-generated&gt;"/>
+      <Line Include="module AutoGeneratedProgram"/>
       <Line Include="[&lt;EntryPoint&gt;]"/>
+      <Line Include="[&lt;Microsoft.VisualStudio.TestPlatform.TestSDKAutoGeneratedCode&gt;]"/>
       <Line Include="let main _ = 0"/>
     </ItemGroup>
 

From ba470a5a09174a67611feb57ec51af926f409b83 Mon Sep 17 00:00:00 2001
From: Saul Rennison <saul.rennison@gmail.com>
Date: Wed, 4 Jul 2018 19:30:53 +0100
Subject: [PATCH 4/4] Don't generate a Program.fs if one already exists.

---
 src/package/nuspec/Microsoft.NET.Test.Sdk.targets | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
index e0e4405b99..40fbd85c6f 100644
--- a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
+++ b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
@@ -97,7 +97,10 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(Language)'=='F#'">
-      <CompileAfter Include="$(GeneratedProgramFile)"/>
+      <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>