From 7b810d75f0d3c67cea4252e620eeb00089373789 Mon Sep 17 00:00:00 2001
From: Don Syme <dsyme@users.noreply.github.com>
Date: Tue, 21 May 2019 19:32:34 +0100
Subject: [PATCH 1/3] fix incremental build (#6795)

---
 FSharpBuild.Directory.Build.targets | 4 ++--
 fcs/Directory.Build.targets         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets
index 742f43fb3f5..d87d68d36c7 100644
--- a/FSharpBuild.Directory.Build.targets
+++ b/FSharpBuild.Directory.Build.targets
@@ -22,7 +22,7 @@
     <MakeDir
       Directories="$(IntermediateOutputPath)"
       Condition="!Exists('$(IntermediateOutputPath)')" />
-    <WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" />
+    <WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" WriteOnlyWhenDifferent="true" />
 
     <!-- Make sure it will get cleaned  -->
     <ItemGroup >
@@ -51,7 +51,7 @@
     <MakeDir
       Directories="$(IntermediateOutputPath)"
       Condition="!Exists('$(IntermediateOutputPath)')" />
-    <WriteLinesToFile File="$(IntermediateOutputPath)buildproperties.fs" Lines="@(_BuildPropertyLines)" Overwrite="true" />
+    <WriteLinesToFile File="$(IntermediateOutputPath)buildproperties.fs" Lines="@(_BuildPropertyLines)" Overwrite="true" WriteOnlyWhenDifferent="true" />
 
     <!-- Make sure it will get cleaned  -->
     <ItemGroup>
diff --git a/fcs/Directory.Build.targets b/fcs/Directory.Build.targets
index ea3d9bd8c42..19b6fcd667d 100644
--- a/fcs/Directory.Build.targets
+++ b/fcs/Directory.Build.targets
@@ -17,7 +17,7 @@
     <MakeDir
       Directories="$(IntermediateOutputPath)"
       Condition="!Exists('$(IntermediateOutputPath)')" />
-    <WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" />
+    <WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" WriteOnlyWhenDifferent="true" />
 
     <!-- Make sure it will get cleaned  -->
     <ItemGroup >
@@ -46,7 +46,7 @@
     <MakeDir
       Directories="$(IntermediateOutputPath)$(ProjectName)"
       Condition="!Exists('$(IntermediateOutputPath)$(ProjectName)')" />
-    <WriteLinesToFile File="$(IntermediateOutputPath)$(ProjectName)\buildproperties.fs" Lines="@(_BuildPropertyLines)" Overwrite="true" />
+    <WriteLinesToFile File="$(IntermediateOutputPath)$(ProjectName)\buildproperties.fs" Lines="@(_BuildPropertyLines)" Overwrite="true"  WriteOnlyWhenDifferent="true" />
 
     <!-- Make sure it will get cleaned  -->
     <ItemGroup>

From 8e399d0d8630b58a13653c836679f5b6d0b50e71 Mon Sep 17 00:00:00 2001
From: Phillip Carter <pcarter@fastmail.com>
Date: Tue, 21 May 2019 11:54:25 -0700
Subject: [PATCH 2/3] Trim vsconfig (#6789)

sqlclr, liveshare, and Just in time debugging aren't necessary
---
 .vsconfig | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.vsconfig b/.vsconfig
index 0be88d0ab81..302d9808902 100644
--- a/.vsconfig
+++ b/.vsconfig
@@ -15,16 +15,13 @@
     "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
     "Microsoft.Component.MSBuild",
     "Microsoft.VisualStudio.Component.TextTemplating",
-    "Microsoft.VisualStudio.Component.SQL.CLR",
     "Microsoft.VisualStudio.Component.ManagedDesktop.Core",
     "Microsoft.Net.Component.4.6.TargetingPack",
-    "Component.Microsoft.VisualStudio.LiveShare",
     "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
-    "Microsoft.VisualStudio.Component.Debugger.JustInTime",
     "Microsoft.VisualStudio.Component.FSharp.Desktop",
     "Microsoft.VisualStudio.Workload.ManagedDesktop",
     "Microsoft.VisualStudio.Component.VSSDK",
     "Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites",
     "Microsoft.VisualStudio.Workload.VisualStudioExtension"
   ]
-}
\ No newline at end of file
+}

From d7ebc4a114b19f6e476ae621757e91f66fb4d5d3 Mon Sep 17 00:00:00 2001
From: "Brett V. Forsgren" <brettfo@microsoft.com>
Date: Tue, 21 May 2019 15:27:34 -0700
Subject: [PATCH 3/3] update CI/PR triggers

---
 azure-pipelines.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3e8ff5a8dc9..6e956cbed3f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,14 +2,12 @@
 trigger:
 - master
 - dev16.1
-- fsharp47
-- fsharp5
+- feature/*
 - release/*
 pr:
 - master
 - dev16.1
-- fsharp47
-- fsharp5
+- feature/*
 - release/*
 
 variables: