diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
index b0af70a3a2..40fbd85c6f 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,15 @@
       <Line Include="End Sub"/>
       <Line Include="End Module"/>
     </ItemGroup>
+
+    <ItemGroup Condition="'$(Language)'=='F#'">
+      <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>
+
     <WriteLinesToFile
       File="$(GeneratedProgramFile)" Lines="@(Line)" Overwrite="true" Encoding="Unicode">
     </WriteLinesToFile>
@@ -83,8 +92,15 @@
     <!--
     Compile Include the generated Program File
     -->
-    <ItemGroup>
+    <ItemGroup Condition="'$(Language)'!='F#'">
       <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>