From 1d7f6147b65f77ede86e2b1777fc12f2540005bd Mon Sep 17 00:00:00 2001
From: Kevin Ransom <codecutter@hotmail.com>
Date: Sat, 4 Jan 2020 13:45:56 -0800
Subject: [PATCH 1/3] Parameterize Product details

---
 FSharpBuild.Directory.Build.targets           | 56 ++++++++++-
 src/fsharp/FSharp.Build/FSharp.Build.fsproj   |  1 +
 .../FSharp.Build/Microsoft.FSharp.Targets     |  1 +
 src/fsharp/FSharp.Build/SubstituteText.fs     | 92 +++++++++++++++++++
 .../Vsix/RegisterFsharpPackage.pkgdef         |  2 +-
 .../VisualFSharpFull/VisualFSharpFull.csproj  | 15 ++-
 .../ProjectSystem.fsproj                      |  9 ++
 .../VSPackage.resx                            |  6 +-
 .../xlf/VSPackage.cs.xlf                      | 12 +--
 .../xlf/VSPackage.de.xlf                      | 12 +--
 .../xlf/VSPackage.es.xlf                      | 12 +--
 .../xlf/VSPackage.fr.xlf                      | 12 +--
 .../xlf/VSPackage.it.xlf                      | 12 +--
 .../xlf/VSPackage.ja.xlf                      | 12 +--
 .../xlf/VSPackage.ko.xlf                      | 12 +--
 .../xlf/VSPackage.pl.xlf                      | 12 +--
 .../xlf/VSPackage.pt-BR.xlf                   | 12 +--
 .../xlf/VSPackage.ru.xlf                      | 12 +--
 .../xlf/VSPackage.tr.xlf                      | 12 +--
 .../xlf/VSPackage.zh-Hans.xlf                 | 12 +--
 .../xlf/VSPackage.zh-Hant.xlf                 | 12 +--
 21 files changed, 249 insertions(+), 89 deletions(-)
 create mode 100644 src/fsharp/FSharp.Build/SubstituteText.fs

diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets
index 7548cef7acf..c2f8fa6d7c4 100644
--- a/FSharpBuild.Directory.Build.targets
+++ b/FSharpBuild.Directory.Build.targets
@@ -1,14 +1,43 @@
 <Project>
+
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
   <Import Project="eng\targets\Imports.targets" />
   <Import Project="eng\targets\NuGet.targets" />
   <Import Project="eng\targets\NGenBinaries.targets" />
   <Import Project="FSharp.Profiles.props" />
 
+  <Target Name="_GenerateBuildPropertiesFile"
+          Outputs="$(IntermediateOutputPath)buildproperties.fs"
+          BeforeTargets="BeforeBuild"
+          Condition="'$(Language)'=='F#'">
+
+    <ItemGroup>
+      <_BuildPropertyLines Remove="@(_BuildPropertyLines)" />
+      <_BuildPropertyLines Include="//  &lt;auto-generated &gt;" />
+      <_BuildPropertyLines Include="//    &lt;Generated by the FSharp WriteCodeFragment class./&gt;" />
+      <_BuildPropertyLines Include="//  &lt;/auto-generated/&gt;" />
+      <_BuildPropertyLines Include="//" />
+      <_BuildPropertyLines Include="module internal FSharp.BuildProperties" />
+      <_BuildPropertyLines Include="let fsProductVersion = &quot;$(FSPRODUCTVERSION)&quot;" />
+      <_BuildPropertyLines Include="let fsLanguageVersion = &quot;$(FSLANGUAGEVERSION)&quot;" />
+    </ItemGroup>
+
+    <MakeDir
+      Directories="$(IntermediateOutputPath)"
+      Condition="!Exists('$(IntermediateOutputPath)')" />
+    <WriteLinesToFile File="$(IntermediateOutputPath)buildproperties.fs" Lines="@(_BuildPropertyLines)" Overwrite="true" WriteOnlyWhenDifferent="true" />
+
+    <!-- Make sure it will get cleaned  -->
+    <ItemGroup>
+      <FileWrites Include="$(IntermediateOutputPath)buildproperties.fs" />
+      <CompileBefore Include="$(IntermediateOutputPath)buildproperties.fs" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="NoneSubstituteTextFiles"
           Inputs="@(NoneSubstituteText)"
           Outputs="@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
-          BeforeTargets="AssignTargetPaths;BeforeBuild">
+          BeforeTargets="AssignTargetPaths;BeforeBuild;GenerateFSharpTextResources">
 
     <PropertyGroup>
       <__TargetFilePath>@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
@@ -27,7 +56,7 @@
     <WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" WriteOnlyWhenDifferent="true" />
 
     <!-- Make sure it will get cleaned  -->
-    <ItemGroup >
+    <ItemGroup>
       <None Include="$(__TargetFilePath)" CopyToOutputDirectory="$(_CopyToOutputDirectory)" />
       <FileWrites Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" />
     </ItemGroup>
@@ -61,4 +90,27 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="BeforeResGen"
+          Inputs="@(EmbeddedResource->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
+          Outputs="@(EmbeddedResource->'$(IntermediateOutputPath)resources\%(Filename)%(Extension)')"
+          DependsOnTargets="CopyVsixResources"
+          Condition="'$(Configuration)' != 'Proto' and '$(Language)'=='F#'">
+    <SubstituteText EmbeddedResources="@(EmbeddedResource)">
+      <Output TaskParameter="CopiedFiles" ItemName="CopiedFiles" />
+    </SubstituteText>
+
+    <Message Text="CopiedFiles: '@(CopiedFiles)'" />
+    <ItemGroup>
+        <EmbeddedResource Remove="@(EmbeddedResource)"/>
+        <EmbeddedResource Include="@(CopiedFiles)"/>
+    </ItemGroup>
+
+    <MakeDir Directories="$(IntermediateOutputPath)" Condition="!Exists('$(IntermediateOutputPath)')" />
+    <MakeDir Directories="$(IntermediateOutputPath)resources\" Condition="!Exists('$(IntermediateOutputPath)resources\')" />
+  </Target>
+
+  <Target Name="CopyVsixResources">
+    <Copy SourceFiles="@(CopyVsixResources)" DestinationFolder="$(IntermediateOutputPath)\resources\Resources" />
+  </Target>
+
 </Project>
diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
index 76b9c7043e9..f427453df99 100644
--- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj
+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
@@ -26,6 +26,7 @@
     <Compile Include="FSharpEmbedResXSource.fs" />
     <Compile Include="WriteCodeFragment.fs" />
     <Compile Include="CreateFSharpManifestResourceName.fs" />
+    <Compile Include="SubstituteText.fs" />
     <None Include="Microsoft.FSharp.Targets" CopyToOutputDirectory="PreserveNewest" />
     <None Include="Microsoft.Portable.FSharp.Targets" CopyToOutputDirectory="PreserveNewest" />
     <None Include="Microsoft.FSharp.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
index 8421c8ea504..0b51d7204f6 100644
--- a/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
+++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
@@ -29,6 +29,7 @@ this file.
     <UsingTask TaskName="CreateFSharpManifestResourceName" AssemblyFile="$(FSharpBuildAssemblyFile)" />
     <UsingTask TaskName="WriteCodeFragment" AssemblyFile="$(FSharpBuildAssemblyFile)" />
     <UsingTask TaskName="FSharpPlatformInformation" AssemblyFile="$(FSharpBuildAssemblyFile)" />
+    <UsingTask TaskName="SubstituteText" AssemblyFile="$(FSharpBuildAssemblyFile)" />
 
     <PropertyGroup>
         <ImportByWildcardBeforeMicrosoftFSharpTargets Condition="'$(ImportByWildcardBeforeMicrosoftFSharpTargets)' == ''">true</ImportByWildcardBeforeMicrosoftFSharpTargets>
diff --git a/src/fsharp/FSharp.Build/SubstituteText.fs b/src/fsharp/FSharp.Build/SubstituteText.fs
new file mode 100644
index 00000000000..16b8eab5245
--- /dev/null
+++ b/src/fsharp/FSharp.Build/SubstituteText.fs
@@ -0,0 +1,92 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+namespace FSharp.Build
+
+open System
+open System.Collections
+open System.IO
+open Microsoft.Build.Framework
+open Microsoft.Build.Utilities
+
+type SubstituteText () =
+
+    let mutable _buildEngine : IBuildEngine = null
+    let mutable _hostObject : ITaskHost = null
+
+    let mutable copiedFiles = new ResizeArray<ITaskItem>()
+    let mutable embeddedResources : ITaskItem[] = [||]
+
+    [<Required>]
+    member this.EmbeddedResources
+        with get() = embeddedResources
+         and set(value) = embeddedResources <- value
+
+    [<Output>]
+    member this.CopiedFiles
+        with get() = copiedFiles.ToArray()
+
+    interface ITask with
+        member this.BuildEngine
+            with get() = _buildEngine
+             and set(value) = _buildEngine <- value
+
+        member this.HostObject
+            with get() = _hostObject
+             and set(value) = _hostObject <- value
+
+        member this.Execute() =
+            copiedFiles.Clear()
+            if not(isNull embeddedResources) then
+                for item in embeddedResources do
+                    // Update ITaskItem metadata to point to new location
+                    let sourcePath = item.GetMetadata("FullPath")
+
+                    let pattern1 = item.GetMetadata("Pattern1")
+                    let pattern2 = item.GetMetadata("Pattern2")
+
+                    // Is there any replacement to do?
+                    if not (String.IsNullOrWhiteSpace(pattern1) && String.IsNullOrWhiteSpace(pattern2)) then
+                        if not(String.IsNullOrWhiteSpace(sourcePath)) then
+                            try
+                                let getTargetPathFrom key =
+                                    let md = item.GetMetadata(key)
+                                    let path = Path.GetDirectoryName(md)
+                                    let filename = Path.GetFileName(md)
+                                    let target = Path.Combine(path, @"..\resources", filename)
+                                    target
+
+                                // Copy from the location specified in Identity
+                                let sourcePath=item.GetMetadata("Identity")
+
+                                // Copy to the location specified in TargetPath unless no TargetPath is provided, then use Identity
+                                let targetPath=
+                                    let identityPath = getTargetPathFrom "Identity"
+                                    let intermediateTargetPath = item.GetMetadata("IntermediateTargetPath")
+                                    if not (String.IsNullOrWhiteSpace(intermediateTargetPath)) then
+                                        let filename = Path.GetFileName(identityPath)
+                                        let target = Path.Combine(intermediateTargetPath, filename)
+                                        target
+                                    else
+                                        identityPath
+
+                                item.ItemSpec <- targetPath
+
+                                // Transform file
+                                let mutable contents = File.ReadAllText(sourcePath)
+                                if not (String.IsNullOrWhiteSpace(pattern1)) then
+                                    let replacement = item.GetMetadata("Replacement1")
+                                    contents <- contents.Replace(pattern1, replacement)
+                                if not (String.IsNullOrWhiteSpace(pattern2)) then
+                                    let replacement = item.GetMetadata("Replacement2")
+                                    contents <- contents.Replace(pattern2, replacement)
+
+                                let directory = Path.GetDirectoryName(targetPath)
+                                if not(Directory.Exists(directory)) then
+                                    Directory.CreateDirectory(directory) |>ignore
+
+                                File.WriteAllText(targetPath, contents)
+                            with
+                            | _ -> ()
+
+                    copiedFiles.Add(item)
+            true
diff --git a/vsintegration/Vsix/RegisterFsharpPackage.pkgdef b/vsintegration/Vsix/RegisterFsharpPackage.pkgdef
index c4a9de29e24..3c029f496cf 100644
--- a/vsintegration/Vsix/RegisterFsharpPackage.pkgdef
+++ b/vsintegration/Vsix/RegisterFsharpPackage.pkgdef
@@ -55,7 +55,7 @@
 "1"="{92EF0900-2251-11D2-B72E-0000F87572EF}" 
 
 [$RootKey$\Packages\{91a04a73-4f2c-4e7c-ad38-c1a68e7da05c}]
-"ProductVersion"="10.4"
+"ProductVersion"="{{FSProductVersion}}"
 "ProductName"="Visual F#"
 "CompanyName"="Microsoft Corp."
 
diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
index 68b8b5e1122..f672cedc206 100644
--- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
+++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
@@ -14,16 +14,21 @@
     <None Include="Source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
-    <Content Include="..\RegisterFsharpPackage.pkgdef">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <Link>RegisterFsharpPackage.pkgdef</Link>
-    </Content>
+
+    <NoneSubstituteText Include="..\RegisterFsharpPackage.pkgdef" CopyToOutputDirectory="PreserveNewest">
+      <TargetFileName>RegisterFsharpPackage.pkgdef</TargetFileName>
+      <Pattern1>{{FSProductVersion}}</Pattern1>
+      <Replacement1>$(FSProductVersion)</Replacement1>
+      <Pattern2>{{FSLanguageVersion}}</Pattern2>
+      <Replacement2>$(FSLanguageVersion)</Replacement2>
+    </NoneSubstituteText>
+
     <Content Include="$(FSharpSourcesRoot)\..\License.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>License.txt</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+
     <Content Include="$(NuGetPackageRoot)\Microsoft.VisualFSharp.Type.Providers.Redist\$(MicrosoftVisualFSharpTypeProvidersRedistVersion)\content\$(FSharpDataTypeProvidersVersion)\FSharp.Data.TypeProviders.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>FSharp.Data.TypeProviders.dll</Link>
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
index 7779a1a3f0e..8408b7a2989 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
@@ -24,13 +24,22 @@
       <ResourceName>Menus.ctmenu</ResourceName>
       <SubType>Designer</SubType>
     </VSCTCompile>
+
+    <!-- Copy resx file and transform product/language version -->
+    <CopyVsixResources Include="Resources/**" />
     <EmbeddedResource Include="VSPackage.resx">
       <GenerateSource>true</GenerateSource>
       <GeneratedModuleName>Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpSR</GeneratedModuleName>
       <MergeWithCTO>true</MergeWithCTO>
       <ManifestResourceName>VSPackage</ManifestResourceName>
       <SubType>Designer</SubType>
+      <IntermediateTargetPath>$(IntermediateOutputPath)resources\</IntermediateTargetPath>
+      <Pattern1>{{FSProductVersion}}</Pattern1>
+      <Replacement1>$(FSProductVersion)</Replacement1>
+      <Pattern2>{{FSLanguageVersion}}</Pattern2>
+      <Replacement2>$(FSLanguageVersion)</Replacement2>
     </EmbeddedResource>
+
     <Compile Include="ProjectPrelude.fs" />
     <Compile Include="WaitDialog.fs" />
     <Compile Include="MSBuildUtilities.fs" />
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx b/vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx
index 0e636602e52..f29e74b9ecb 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx
@@ -464,10 +464,10 @@
     <value>Customizes the environment to maximize code editor screen space and improve the visibility of F# commands and tool windows.</value>
   </data>
   <data name="ProductDetails" xml:space="preserve">
-    <value>Microsoft Visual F# Tools 10.4 for F# 4.6</value>
+    <value>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</value>
   </data>
   <data name="9002" xml:space="preserve">
-    <value>Microsoft Visual F# Tools 10.4 for F# 4.6</value>
+    <value>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</value>
   </data>
   <data name="ProductID" xml:space="preserve">
     <value>1.0</value>
@@ -476,7 +476,7 @@
     <value>Microsoft Visual F# Tools</value>
   </data>
   <data name="9001" xml:space="preserve">
-    <value>Visual F# Tools 10.4 for F# 4.6</value>
+    <value>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</value>
   </data>
   <data name="9027" xml:space="preserve">
     <value>F# Interactive</value>
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.cs.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.cs.xlf
index e27841feae2..f047f0cf58d 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.cs.xlf
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.cs.xlf
@@ -433,13 +433,13 @@
         <note />
       </trans-unit>
       <trans-unit id="ProductDetails">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Nástroje Microsoft Visual F# 10.4 pro F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Nástroje Microsoft Visual F# {{FSProductVersion}} pro F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9002">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Nástroje Microsoft Visual F# 10.4 pro F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Nástroje Microsoft Visual F# {{FSProductVersion}} pro F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="ProductID">
@@ -453,8 +453,8 @@
         <note />
       </trans-unit>
       <trans-unit id="9001">
-        <source>Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Nástroje Visual F# 10.4 pro F# 4.6</target>
+        <source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Nástroje Visual F# {{FSProductVersion}} pro F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9027">
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.de.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.de.xlf
index 57e31224de5..cd550b54944 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.de.xlf
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.de.xlf
@@ -433,13 +433,13 @@
         <note />
       </trans-unit>
       <trans-unit id="ProductDetails">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 für f# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} für f# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9002">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 für f# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} für f# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="ProductID">
@@ -453,8 +453,8 @@
         <note />
       </trans-unit>
       <trans-unit id="9001">
-        <source>Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Visual F# Tools 10.4 für F# 4.6</target>
+        <source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Visual F# Tools {{FSProductVersion}} für F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9027">
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.es.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.es.xlf
index 2ff3a9663bf..2204dcdc7d1 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.es.xlf
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.es.xlf
@@ -433,13 +433,13 @@
         <note />
       </trans-unit>
       <trans-unit id="ProductDetails">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Herramientas de Microsoft Visual F# 10.4 para F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Herramientas de Microsoft Visual F# {{FSProductVersion}} para F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9002">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Herramientas de Microsoft Visual F# 10.4 para F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Herramientas de Microsoft Visual F# {{FSProductVersion}} para F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="ProductID">
@@ -453,8 +453,8 @@
         <note />
       </trans-unit>
       <trans-unit id="9001">
-        <source>Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Visual F# Tools 10.4 para F# 4.6</target>
+        <source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Visual F# Tools {{FSProductVersion}} para F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9027">
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.fr.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.fr.xlf
index 0e5d733739b..a7bedb7cc55 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.fr.xlf
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.fr.xlf
@@ -433,13 +433,13 @@
         <note />
       </trans-unit>
       <trans-unit id="ProductDetails">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 pour F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} pour F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9002">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 pour F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} pour F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="ProductID">
@@ -453,8 +453,8 @@
         <note />
       </trans-unit>
       <trans-unit id="9001">
-        <source>Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Visual F# Tools 10.4 pour F# 4.6</target>
+        <source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Visual F# Tools {{FSProductVersion}} pour F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9027">
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.it.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.it.xlf
index 6e93bc28a74..ba72bff02e0 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.it.xlf
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.it.xlf
@@ -433,13 +433,13 @@
         <note />
       </trans-unit>
       <trans-unit id="ProductDetails">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 per F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} per F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9002">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 per F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} per F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="ProductID">
@@ -453,8 +453,8 @@
         <note />
       </trans-unit>
       <trans-unit id="9001">
-        <source>Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Visual F# Tools 10.4 per F# 4.6</target>
+        <source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Visual F# Tools {{FSProductVersion}} per F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9027">
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ja.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ja.xlf
index e0c79c4a2bf..710b54d5b70 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ja.xlf
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ja.xlf
@@ -433,13 +433,13 @@
         <note />
       </trans-unit>
       <trans-unit id="ProductDetails">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">F# 4.6 用 Microsoft Visual F# Tools 10.4</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">F# {{FSLanguageVersion}} 用 Microsoft Visual F# Tools {{FSProductVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9002">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">F# 4.6 用 Microsoft Visual F# Tools 10.4</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">F# {{FSLanguageVersion}} 用 Microsoft Visual F# Tools {{FSProductVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="ProductID">
@@ -453,8 +453,8 @@
         <note />
       </trans-unit>
       <trans-unit id="9001">
-        <source>Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">F# 4.6 用 Visual F# Tools 10.4</target>
+        <source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">F# {{FSLanguageVersion}} 用 Visual F# Tools {{FSProductVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9027">
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ko.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ko.xlf
index 4133f5ea293..588d5e014b9 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ko.xlf
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ko.xlf
@@ -433,13 +433,13 @@
         <note />
       </trans-unit>
       <trans-unit id="ProductDetails">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">F# 4.6용 Microsoft Visual F# Tools 10.4</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">F# {{FSLanguageVersion}}용 Microsoft Visual F# Tools {{FSProductVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9002">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">F# 4.6용 Microsoft Visual F# Tools 10.4</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">F# {{FSLanguageVersion}}용 Microsoft Visual F# Tools {{FSProductVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="ProductID">
@@ -453,8 +453,8 @@
         <note />
       </trans-unit>
       <trans-unit id="9001">
-        <source>Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">F# 4.6용 Visual F# Tools 10.4</target>
+        <source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">F# {{FSLanguageVersion}}용 Visual F# Tools {{FSProductVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9027">
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pl.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pl.xlf
index 5ae72d11dc8..08a4b45dfb4 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pl.xlf
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pl.xlf
@@ -433,13 +433,13 @@
         <note />
       </trans-unit>
       <trans-unit id="ProductDetails">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 dla języka F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} dla języka F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9002">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 dla języka F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} dla języka F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="ProductID">
@@ -453,8 +453,8 @@
         <note />
       </trans-unit>
       <trans-unit id="9001">
-        <source>Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Visual F# Tools 10.4 dla języka F# 4.6</target>
+        <source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Visual F# Tools {{FSProductVersion}} dla języka F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9027">
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pt-BR.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pt-BR.xlf
index eb0221892ad..6ae72d28fde 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pt-BR.xlf
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pt-BR.xlf
@@ -433,13 +433,13 @@
         <note />
       </trans-unit>
       <trans-unit id="ProductDetails">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 para F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} para F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9002">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 para F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} para F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="ProductID">
@@ -453,8 +453,8 @@
         <note />
       </trans-unit>
       <trans-unit id="9001">
-        <source>Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Visual F# Tools 10.4 para F# 4.6</target>
+        <source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Visual F# Tools {{FSProductVersion}} para F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9027">
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ru.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ru.xlf
index 897d2db04fc..418494b459f 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ru.xlf
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ru.xlf
@@ -433,13 +433,13 @@
         <note />
       </trans-unit>
       <trans-unit id="ProductDetails">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 для F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} для F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9002">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 для F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} для F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="ProductID">
@@ -453,8 +453,8 @@
         <note />
       </trans-unit>
       <trans-unit id="9001">
-        <source>Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Visual F# Tools 10.4 для F# 4.6</target>
+        <source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Visual F# Tools {{FSProductVersion}} для F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9027">
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.tr.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.tr.xlf
index b435f62c817..53643a6ae2a 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.tr.xlf
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.tr.xlf
@@ -433,13 +433,13 @@
         <note />
       </trans-unit>
       <trans-unit id="ProductDetails">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">F# 4.6 için Microsoft Visual F# Tools 10.4</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">F# {{FSLanguageVersion}} için Microsoft Visual F# Tools {{FSProductVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9002">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">F# 4.6 için Microsoft Visual F# Tools 10.4</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">F# {{FSLanguageVersion}} için Microsoft Visual F# Tools {{FSProductVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="ProductID">
@@ -453,8 +453,8 @@
         <note />
       </trans-unit>
       <trans-unit id="9001">
-        <source>Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">F# 4.6 için Visual F# Araçları 10.4</target>
+        <source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">F# {{FSLanguageVersion}} için Visual F# Araçları {{FSProductVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9027">
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hans.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hans.xlf
index 24e4048ae2e..4e3108b778f 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hans.xlf
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hans.xlf
@@ -433,13 +433,13 @@
         <note />
       </trans-unit>
       <trans-unit id="ProductDetails">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 for F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9002">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Microsoft Visual F# Tools 10.4 for F# 4.6</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="ProductID">
@@ -453,8 +453,8 @@
         <note />
       </trans-unit>
       <trans-unit id="9001">
-        <source>Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">Visual F# Tools 10.4 for F# 4.6</target>
+        <source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9027">
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hant.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hant.xlf
index 326a36bb813..7eb95bad0aa 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hant.xlf
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hant.xlf
@@ -433,13 +433,13 @@
         <note />
       </trans-unit>
       <trans-unit id="ProductDetails">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">適用於 F# 4.6 的 Microsoft Visual F# Tools 10.4</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">適用於 F# {{FSLanguageVersion}} 的 Microsoft Visual F# Tools {{FSProductVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9002">
-        <source>Microsoft Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">適用於 F# 4.6 的 Microsoft Visual F# Tools 10.4</target>
+        <source>Microsoft Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">適用於 F# {{FSLanguageVersion}} 的 Microsoft Visual F# Tools {{FSProductVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="ProductID">
@@ -453,8 +453,8 @@
         <note />
       </trans-unit>
       <trans-unit id="9001">
-        <source>Visual F# Tools 10.4 for F# 4.6</source>
-        <target state="translated">適用於 F# 4.6 的 Visual F# Tools 10.4</target>
+        <source>Visual F# Tools {{FSProductVersion}} for F# {{FSLanguageVersion}}</source>
+        <target state="needs-review-translation">適用於 F# {{FSLanguageVersion}} 的 Visual F# Tools {{FSProductVersion}}</target>
         <note />
       </trans-unit>
       <trans-unit id="9027">

From d69d9f2f085f7077bbe7f90b1fa46f34153a7fec Mon Sep 17 00:00:00 2001
From: Kevin Ransom <codecutter@hotmail.com>
Date: Sat, 4 Jan 2020 16:51:00 -0800
Subject: [PATCH 2/3] fcs

---
 FSharpBuild.Directory.Build.targets | 32 ++---------------------------
 fcs/build.fsx                       |  6 +++---
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets
index c2f8fa6d7c4..131eba8356f 100644
--- a/FSharpBuild.Directory.Build.targets
+++ b/FSharpBuild.Directory.Build.targets
@@ -6,34 +6,6 @@
   <Import Project="eng\targets\NGenBinaries.targets" />
   <Import Project="FSharp.Profiles.props" />
 
-  <Target Name="_GenerateBuildPropertiesFile"
-          Outputs="$(IntermediateOutputPath)buildproperties.fs"
-          BeforeTargets="BeforeBuild"
-          Condition="'$(Language)'=='F#'">
-
-    <ItemGroup>
-      <_BuildPropertyLines Remove="@(_BuildPropertyLines)" />
-      <_BuildPropertyLines Include="//  &lt;auto-generated &gt;" />
-      <_BuildPropertyLines Include="//    &lt;Generated by the FSharp WriteCodeFragment class./&gt;" />
-      <_BuildPropertyLines Include="//  &lt;/auto-generated/&gt;" />
-      <_BuildPropertyLines Include="//" />
-      <_BuildPropertyLines Include="module internal FSharp.BuildProperties" />
-      <_BuildPropertyLines Include="let fsProductVersion = &quot;$(FSPRODUCTVERSION)&quot;" />
-      <_BuildPropertyLines Include="let fsLanguageVersion = &quot;$(FSLANGUAGEVERSION)&quot;" />
-    </ItemGroup>
-
-    <MakeDir
-      Directories="$(IntermediateOutputPath)"
-      Condition="!Exists('$(IntermediateOutputPath)')" />
-    <WriteLinesToFile File="$(IntermediateOutputPath)buildproperties.fs" Lines="@(_BuildPropertyLines)" Overwrite="true" WriteOnlyWhenDifferent="true" />
-
-    <!-- Make sure it will get cleaned  -->
-    <ItemGroup>
-      <FileWrites Include="$(IntermediateOutputPath)buildproperties.fs" />
-      <CompileBefore Include="$(IntermediateOutputPath)buildproperties.fs" />
-    </ItemGroup>
-  </Target>
-
   <Target Name="NoneSubstituteTextFiles"
           Inputs="@(NoneSubstituteText)"
           Outputs="@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
@@ -94,12 +66,12 @@
           Inputs="@(EmbeddedResource->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
           Outputs="@(EmbeddedResource->'$(IntermediateOutputPath)resources\%(Filename)%(Extension)')"
           DependsOnTargets="CopyVsixResources"
-          Condition="'$(Configuration)' != 'Proto' and '$(Language)'=='F#'">
+          Condition="'$(Configuration)' != 'Proto' and '$(Language)'=='F#' and '$(DisableCompilerRedirection)' != 'true' ">
+
     <SubstituteText EmbeddedResources="@(EmbeddedResource)">
       <Output TaskParameter="CopiedFiles" ItemName="CopiedFiles" />
     </SubstituteText>
 
-    <Message Text="CopiedFiles: '@(CopiedFiles)'" />
     <ItemGroup>
         <EmbeddedResource Remove="@(EmbeddedResource)"/>
         <EmbeddedResource Include="@(CopiedFiles)"/>
diff --git a/fcs/build.fsx b/fcs/build.fsx
index 1c2528dd2e0..af21298e7ab 100644
--- a/fcs/build.fsx
+++ b/fcs/build.fsx
@@ -66,16 +66,16 @@ Target.create "Build" (fun _ ->
     runDotnet __SOURCE_DIRECTORY__ "build" "../src/buildtools/buildtools.proj -v n -c Proto"
     let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/netcoreapp2.1/fslex.dll"
     let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/netcoreapp2.1/fsyacc.dll"
-    runDotnet __SOURCE_DIRECTORY__ "build" (sprintf "FSharp.Compiler.Service.sln -v n -c Release /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath)
+    runDotnet __SOURCE_DIRECTORY__ "build" (sprintf "FSharp.Compiler.Service.sln -nodereuse:false -v n -c Release /p:DisableCompilerRedirection=true /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath)
 )
 
 Target.create "Test" (fun _ ->
     // This project file is used for the netcoreapp2.0 tests to work out reference sets
-    runDotnet __SOURCE_DIRECTORY__ "build" "../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -v n /restore /p:DisableCompilerRedirection=true"
+    runDotnet __SOURCE_DIRECTORY__ "build" "../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -nodereuse:false -v n /restore /p:DisableCompilerRedirection=true"
 
     // Now run the tests
     let logFilePath = Path.Combine(__SOURCE_DIRECTORY__, "..", "artifacts", "TestResults", "Release", "FSharp.Compiler.Service.Test.xml")
-    runDotnet __SOURCE_DIRECTORY__ "test" (sprintf "FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj --no-restore --no-build -v n -c Release --test-adapter-path . --logger \"nunit;LogFilePath=%s\"" logFilePath)
+    runDotnet __SOURCE_DIRECTORY__ "test" (sprintf "FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj --no-restore --no-build -nodereuse:false -v n -c Release --test-adapter-path . --logger \"nunit;LogFilePath=%s\"" logFilePath)
 )
 
 Target.create "NuGet" (fun _ ->

From 510bea6e53fe86d8f676e63dc228c39fec0fff2d Mon Sep 17 00:00:00 2001
From: Kevin Ransom <codecutter@hotmail.com>
Date: Sat, 4 Jan 2020 19:38:16 -0800
Subject: [PATCH 3/3] Repack pkgdef

---
 FSharpBuild.Directory.Build.targets                         | 5 ++++-
 vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets
index 131eba8356f..3132ba1c970 100644
--- a/FSharpBuild.Directory.Build.targets
+++ b/FSharpBuild.Directory.Build.targets
@@ -21,16 +21,19 @@
 
       <_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' != ''">%(NoneSubstituteText.CopyToOutputDirectory)</_CopyToOutputDirectory>
       <_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' == ''">Never</_CopyToOutputDirectory>
+
+      <_IncludeInVsix>false</_IncludeInVsix>
+      <_IncludeInVsix Condition="'%(NoneSubstituteText.IncludeInVsix)' == 'true'">true</_IncludeInVsix>
     </PropertyGroup>
 
     <MakeDir Directories="$(IntermediateOutputPath)"
              Condition="!Exists('$(IntermediateOutputPath)')" />
     <WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" WriteOnlyWhenDifferent="true" />
 
-    <!-- Make sure it will get cleaned  -->
     <ItemGroup>
       <None Include="$(__TargetFilePath)" CopyToOutputDirectory="$(_CopyToOutputDirectory)" />
       <FileWrites Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" />
+      <Content Include="$(__TargetFilePath)" CopyToOutputDirectory="Always" IncludeInVsix="true" />
     </ItemGroup>
   </Target>
 
diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
index f672cedc206..44554938774 100644
--- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
+++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
@@ -21,6 +21,7 @@
       <Replacement1>$(FSProductVersion)</Replacement1>
       <Pattern2>{{FSLanguageVersion}}</Pattern2>
       <Replacement2>$(FSLanguageVersion)</Replacement2>
+      <IncludeInVSix>true</IncludeInVSix>
     </NoneSubstituteText>
 
     <Content Include="$(FSharpSourcesRoot)\..\License.txt">