diff --git a/src/package/nuspec/netcoreapp/Microsoft.NET.Test.Sdk.targets b/src/package/nuspec/netcoreapp/Microsoft.NET.Test.Sdk.targets
index 8b26baf3e5..e033294c28 100644
--- a/src/package/nuspec/netcoreapp/Microsoft.NET.Test.Sdk.targets
+++ b/src/package/nuspec/netcoreapp/Microsoft.NET.Test.Sdk.targets
@@ -10,7 +10,7 @@
  ***********************************************************************************************
 -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project InitialTargets="GenerateProgramFile" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
@@ -24,26 +24,31 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
-  <!--
-     ============================================================
-     GenerateProgramFile
-     Generates Program file which contains the Main entry point
-     ============================================================
-  -->
   <PropertyGroup>
     <GeneratedProgramFile Condition="'$(GeneratedProgramFile)' == ''">$(MSBuildThisFileDirectory)Microsoft.NET.Test.Sdk.Program$(DefaultLanguageSourceExtension)</GeneratedProgramFile>
     <GenerateProgramFile Condition="'$(GenerateProgramFile)' == ''">true</GenerateProgramFile>
   </PropertyGroup>
 
-  <ItemGroup Condition="('$(GenerateProgramFile)' == 'true') and ('$(Language)' == 'VB' or '$(Language)' == 'C#')">
-    <Compile Include="$(GeneratedProgramFile)"/>
-  </ItemGroup>
+  <!--
+    ============================================================
+    GenerateProgramFile
+    Generates Program file which contains the Main entry point
+    ============================================================
+  -->
+  <Target Name="GenerateProgramFile"
+          Condition="'$(GenerateProgramFile)' == 'true'">
+
+    <ItemGroup Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'">
+      <Compile Include="$(GeneratedProgramFile)"/>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(Language)' == 'F#'">
+      <ProgramCompiles Include="@(Compile)" Condition="'%(Identity)' == 'Program.fs'" />
+      <CompileAfter Include="$(GeneratedProgramFile)" Condition="@(ProgramCompiles-&gt;Count()) == 0" />
+    </ItemGroup>
 
-  <ItemGroup Condition="'$(GenerateProgramFile)' == 'true' and '$(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'." />
 
-  <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>