From f2eecf8835bd41bda21d28634e8296b23592b278 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <codecutter.fsharp@hotmail.com>
Date: Wed, 17 Apr 2019 13:33:30 -0700
Subject: [PATCH 1/2] Change how proto acquires FSharp.Core

---
 .vsts-signed.yaml                                    |  9 +++++++++
 eng/build-utils.ps1                                  |  8 ++++----
 src/fsharp/Directory.Build.targets                   | 12 ++++++++++++
 src/fsharp/FSharp.Build/FSharp.Build.fsproj          |  2 +-
 .../FSharp.Compiler.Interactive.Settings.fsproj      |  4 ++--
 .../FSharp.Compiler.Private.fsproj                   |  2 +-
 .../FSharp.Compiler.Server.Shared.fsproj             |  4 ++--
 src/fsharp/fsc/fsc.fsproj                            |  5 ++++-
 src/fsharp/fsi/fsi.fsproj                            | 11 +++++++----
 src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj                |  8 ++++----
 10 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/.vsts-signed.yaml b/.vsts-signed.yaml
index 153f57ec849..ee6305ee100 100644
--- a/.vsts-signed.yaml
+++ b/.vsts-signed.yaml
@@ -98,6 +98,15 @@ jobs:
     continueOnError: true
     condition: succeeded()
 
+  # Publish Proto Compiler
+  - task: PublishBuildArtifacts@1
+    displayName: Push Proto
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)/artifacts/bin/fsc/Proto'
+      ArtifactName: Proto Compiler
+    continueOnError: true
+    condition: succeeded()
+
   # Execute cleanup tasks
   - task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
     displayName: Execute cleanup tasks
diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1
index d1e5dd85d55..ccfb4fb1c29 100644
--- a/eng/build-utils.ps1
+++ b/eng/build-utils.ps1
@@ -242,14 +242,14 @@ function Make-BootstrapBuild() {
 
     # prepare FsLex and Fsyacc
     Run-MSBuild "$RepoRoot\src\buildtools\buildtools.proj" "/restore /t:Build" -logFileName "BuildTools" -configuration $bootstrapConfiguration
-    Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp2.1\*" -Destination $dir
-    Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp2.1\*" -Destination $dir
+    Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp2.1\*" -Destination $dir -force
+    Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp2.1\*" -Destination $dir -force
 
     # prepare compiler
     $projectPath = "$RepoRoot\proto.proj"
     Run-MSBuild $projectPath "/restore /t:Build" -logFileName "Bootstrap" -configuration $bootstrapConfiguration
-    Copy-Item "$ArtifactsDir\bin\fsc\$bootstrapConfiguration\$bootstrapTfm\*" -Destination $dir
-    Copy-Item "$ArtifactsDir\bin\fsi\$bootstrapConfiguration\$bootstrapTfm\*" -Destination $dir
+    Copy-Item "$ArtifactsDir\bin\fsc\$bootstrapConfiguration\$bootstrapTfm\*" -Destination $dir -force
+    Copy-Item "$ArtifactsDir\bin\fsi\$bootstrapConfiguration\$bootstrapTfm\*" -Destination $dir -force
 
     return $dir
 }
diff --git a/src/fsharp/Directory.Build.targets b/src/fsharp/Directory.Build.targets
index 068f4dc3c51..d966c0bb309 100644
--- a/src/fsharp/Directory.Build.targets
+++ b/src/fsharp/Directory.Build.targets
@@ -1,4 +1,16 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
   <Import Project="..\buildtools\buildtools.targets" />
+
+  <!--  Proto Build use package or compiler fsharp.core -->
+  <ItemGroup Condition="'$(Configuration)' == 'Proto'">
+    <!-- When building building locally we go to nuget and use the Version number that matches the LKG tools in use -->
+    <PackageReference Include="FSharp.Core" Version="$(FSharpCoreImplicitPackageVersion)" Condition="'$(DotNetBuildFromSource)' != 'true' or '$(FSharpSourceBuild)' != 'true'" />
+
+    <!-- When building building from source we use the fsharp.core alongside the compiler.  Frankly this is awfull -->
+    <Reference Include="FSharp.Core" Condition="'$(DotNetBuildFromSource)' == 'true' and '$(FSharpSourceBuild)' == 'true'">
+        <HintPath>$(_DotNetRoot)sdk\$(NETCoreSdkVersion)\FSharp\FSharp.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
 </Project>
diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
index 0dad55058b0..9544c57f3fa 100644
--- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj
+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
@@ -32,7 +32,7 @@
     <None Include="Microsoft.FSharp.Overrides.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(Configuration)' != 'Proto'">
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
   </ItemGroup>
 
diff --git a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
index 6307f17baf3..22e27f40674 100644
--- a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
+++ b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
@@ -27,8 +27,8 @@
     <Compile Include="..\fsiaux.fs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj" />
+  <ItemGroup Condition="'$(Configuration)' != 'Proto'">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
index 9fef6d27589..3df170dcd69 100644
--- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -674,7 +674,7 @@
     </Compile>
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(Configuration)' != 'Proto'">
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
   </ItemGroup>
 
diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
index 75a7353bb96..70a9078adcb 100644
--- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
+++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
@@ -20,8 +20,8 @@
     <Compile Include="FSharpInteractiveServer.fs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj" />
+  <ItemGroup Condition="'$(Configuration)' != 'Proto'">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj
index 8ddb082c56a..c191bbcf2bb 100644
--- a/src/fsharp/fsc/fsc.fsproj
+++ b/src/fsharp/fsc/fsc.fsproj
@@ -28,8 +28,11 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(Configuration)' != 'Proto'">
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Build\FSharp.Build.fsproj" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
   </ItemGroup>
diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj
index a7bafddfded..070820b57cf 100644
--- a/src/fsharp/fsi/fsi.fsproj
+++ b/src/fsharp/fsi/fsi.fsproj
@@ -25,13 +25,16 @@
     <None Include="app.config" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(Configuration)' != 'Proto'">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
+  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj" />
-    <ProjectReference Include="..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
-    <ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
 
     <!-- only used when '$(TargetFramework)' == 'net472' -->
-    <ProjectReference Include="..\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj" Condition="'$(TargetFramework)' == 'net472'" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj" Condition="'$(TargetFramework)' == 'net472'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
diff --git a/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj b/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj
index dbe31f6ec2a..2bffef998c9 100644
--- a/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj
+++ b/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj
@@ -26,10 +26,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj" />
-    <ProjectReference Include="..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
-    <ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
-    <ProjectReference Include="..\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj" />
   </ItemGroup>
 
   <ItemGroup>

From 322bffca1ce3e2d02322a370b9ba55c20b63bdcc Mon Sep 17 00:00:00 2001
From: Kevin Ransom <codecutter.fsharp@hotmail.com>
Date: Wed, 17 Apr 2019 13:54:35 -0700
Subject: [PATCH 2/2] typo

---
 src/fsharp/Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/Directory.Build.targets b/src/fsharp/Directory.Build.targets
index d966c0bb309..e1722c4cf4d 100644
--- a/src/fsharp/Directory.Build.targets
+++ b/src/fsharp/Directory.Build.targets
@@ -8,7 +8,7 @@
     <PackageReference Include="FSharp.Core" Version="$(FSharpCoreImplicitPackageVersion)" Condition="'$(DotNetBuildFromSource)' != 'true' or '$(FSharpSourceBuild)' != 'true'" />
 
     <!-- When building building from source we use the fsharp.core alongside the compiler.  Frankly this is awfull -->
-    <Reference Include="FSharp.Core" Condition="'$(DotNetBuildFromSource)' == 'true' and '$(FSharpSourceBuild)' == 'true'">
+    <Reference Include="FSharp.Core" Condition="'$(DotNetBuildFromSource)' == 'true' and '$(FSharpSourceBuild)' == 'true'">
         <HintPath>$(_DotNetRoot)sdk\$(NETCoreSdkVersion)\FSharp\FSharp.Core.dll</HintPath>
     </Reference>
   </ItemGroup>