Merge pull request #8103 from dotnet/merges/master-to-release/dev16.5

Merge master to release/dev16.5

Author: KevinRansom

FSharpBuild.Directory.Build.targets

@@ -1,4 +1,5 @@
 <Project>
+
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
   <Import Project="eng\targets\Imports.targets" />
   <Import Project="eng\targets\NuGet.targets" />
@@ -8,7 +9,7 @@
   <Target Name="NoneSubstituteTextFiles"
           Inputs="@(NoneSubstituteText)"
           Outputs="@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
-          BeforeTargets="AssignTargetPaths;BeforeBuild">
+          BeforeTargets="AssignTargetPaths;BeforeBuild;GenerateFSharpTextResources">
 
     <PropertyGroup>
       <__TargetFilePath>@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
@@ -20,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 >
+    <ItemGroup>
       <None Include="$(__TargetFilePath)" CopyToOutputDirectory="$(_CopyToOutputDirectory)" />
       <FileWrites Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" />
+      <Content Include="$(__TargetFilePath)" CopyToOutputDirectory="Always" IncludeInVsix="true" />
     </ItemGroup>
   </Target>
 
@@ -61,4 +65,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#' and '$(DisableCompilerRedirection)' != 'true' ">
+
+    <SubstituteText EmbeddedResources="@(EmbeddedResource)">
+      <Output TaskParameter="CopiedFiles" ItemName="CopiedFiles" />
+    </SubstituteText>
+
+    <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>

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 _ ->

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" />

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>

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