disable proto compiler for fslex/fsyacc

Author: dsyme

FSharpBuild.Directory.Build.props

@@ -80,7 +80,7 @@
   </PropertyGroup>
 
   <!-- SDK targets override -->
-  <PropertyGroup Condition="'$(Configuration)' != 'Proto' AND '$(DisableCompilerRedirection)'!='true'">
+  <PropertyGroup Condition="'$(Configuration)' != 'Proto' AND '$(DisableProtoCompiler)'!='true'">
     <FSharpTargetsPath>$(ProtoOutputPath)\Microsoft.FSharp.Targets</FSharpTargetsPath>
     <FSharpPropsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
     <FSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>

eng/build.sh

@@ -209,18 +209,19 @@ function BuildSolution {
 
   # build bootstrap tools
   bootstrap_config=Proto
-  MSBuild "$repo_root/src/buildtools/buildtools.proj" \
-    /restore \
-    /v:$verbosity \
-    /p:Configuration=$bootstrap_config \
-    /t:Build
-
   bootstrap_dir=$artifacts_dir/Bootstrap
-  if [ ! -d "$bootstrap_dir" ]; then
+  if [ ! -d "$bootstrap_dir/fslex.dll" ]; then
+    MSBuild "$repo_root/src/buildtools/buildtools.proj" \
+      /restore \
+      /v:$verbosity \
+      /p:Configuration=$bootstrap_config \
+      /t:Build
+
     mkdir -p "$bootstrap_dir"
     cp $artifacts_dir/bin/fslex/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir
     cp $artifacts_dir/bin/fsyacc/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir
-
+  fi
+  if [ ! -d "$bootstrap_dir/fsc.exe" ]; then
     MSBuild "$repo_root/proto.proj" \
       /restore \
       /v:$verbosity \

fcs/Directory.Build.props

@@ -17,7 +17,7 @@
     <ArtifactsObjDir>$(ArtifactsDir)\obj</ArtifactsObjDir>
     <OutputPath>$(ArtifactsBinDir)\fcs</OutputPath>
     <IntermediateOutputPath>$(ArtifactsObjDir)\fcs</IntermediateOutputPath>
-    <DisableCompilerRedirection>true</DisableCompilerRedirection>
+    <DisableProtoCompiler>true</DisableProtoCompiler>
   </PropertyGroup>
 
 </Project>

fcs/build.fsx

@@ -24,7 +24,7 @@ let isMono = false
 // Utilities
 // --------------------------------------------------------------------------------------
 
-let coreclrTargetFramework = "netcoreapp2.0"
+let fslexyaccTargetFramework = "netcoreapp2.0"
 
 let dotnetExePath =
     // Build.cmd normally downloads a dotnet cli to: <repo-root>\artifacts\toolset\dotnet
@@ -94,14 +94,14 @@ Target "BuildVersion" (fun _ ->
 
 Target "Build" (fun _ ->
     runDotnet __SOURCE_DIRECTORY__ "build ../src/buildtools/buildtools.proj -v n -c Proto"
-    let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/" + coreclrTargetFramework + "/fslex.dll"
-    let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/" + coreclrTargetFramework + "/fsyacc.dll"
+    let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/" + fslexyaccTargetFramework + "/fslex.dll"
+    let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/" + fslexyaccTargetFramework + "/fsyacc.dll"
     runDotnet __SOURCE_DIRECTORY__ (sprintf "build FSharp.Compiler.Service.sln -v n -c Release /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath)
 )
 
 Target "Test" (fun _ ->
     // This project file is used for the 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 -v n /restore /p:DisableProtoCompiler=true"
 
     // Now run the tests
     let logFilePath = Path.Combine(__SOURCE_DIRECTORY__, "..", "artifacts", "TestResults", "Release", "FSharp.Compiler.Service.Test.xml")

src/buildtools/buildtools.proj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+    <DisableProtoCompiler>true</DisableProtoCompiler>
   </PropertyGroup>
 
   <ItemGroup>