From 71deecf9f7aa3c6f1a968253555fcee6ba6474fc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 13 Nov 2025 13:28:04 +0000
Subject: [PATCH 1/6] Initial plan


From 9992e0b6af519a3c755a25f176a3bb0de051f06e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 13 Nov 2025 13:41:10 +0000
Subject: [PATCH 2/6] Add VSIX MSBuild props file to override F# compiler path

Co-authored-by: T-Gro <46543583+T-Gro@users.noreply.github.com>
---
 ...icrosoft.FSharp.VSIX.Debug.Overrides.props | 20 +++++++++++++++++++
 .../Source.extension.vsixmanifest             |  3 +++
 .../VisualFSharpFull/VisualFSharpDebug.csproj |  9 +++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props

diff --git a/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props b/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props
new file mode 100644
index 00000000000..39871498805
--- /dev/null
+++ b/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  
+  <PropertyGroup>
+    <!-- Override FSharpCompilerPath to point to VSIX Tools directory -->
+    <!-- This props file is deployed alongside the Tools directory in the VSIX -->
+    <!-- Calculate path from this file's location to Tools -->
+    <_FSharpDebugVsixPropsDir>$(MSBuildThisFileDirectory)</_FSharpDebugVsixPropsDir>
+    <_FSharpDebugVsixToolsPath>$(_FSharpDebugVsixPropsDir)Tools\</_FSharpDebugVsixToolsPath>
+    
+    <!-- Override only if not already set and compiler exists -->
+    <FSharpCompilerPath Condition="'$(FSharpCompilerPath)' == '' and Exists('$(_FSharpDebugVsixToolsPath)fscAnyCpu.exe')">$(_FSharpDebugVsixToolsPath)</FSharpCompilerPath>
+  </PropertyGroup>
+  
+  <Target Name="WarnAboutDebugVsixCompiler" BeforeTargets="BeforeBuild" Condition="'$(FSharpCompilerPath)' == '$(_FSharpDebugVsixToolsPath)'">
+    <Warning Text="🔧 [F# Debug VSIX] Using custom F# compiler from: $(FSharpCompilerPath)" />
+  </Target>
+
+</Project>
diff --git a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
index f805558824b..590b1ef1b57 100644
--- a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
@@ -60,6 +60,9 @@
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|TextFile;TemplateProjectOutputGroup|" d:ProjectName="TextFile" d:VsixSubPath="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|XMLFile;TemplateProjectOutputGroup|" d:ProjectName="XMLFile" d:VsixSubPath="ItemTemplates" />
 
+    <Asset Type="Microsoft.VisualStudio.MsBuildProps" 
+           d:Source="File" 
+           Path="Microsoft.FSharp.VSIX.Debug.Overrides.props" />
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[|%CurrentProject%;GetVSGeneralVersion|,)" DisplayName="Visual Studio core editor" />
diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpDebug.csproj b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpDebug.csproj
index 5a6671c4d24..1f2f53362e7 100644
--- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpDebug.csproj
+++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpDebug.csproj
@@ -84,4 +84,13 @@
       </Content>
     </ItemGroup>
   </Target>
+
+  <ItemGroup>
+    <!-- Deploy the override props file as an MSBuild asset -->
+    <Content Include="Microsoft.FSharp.VSIX.Debug.Overrides.props">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <VSixSubPath>.</VSixSubPath>
+    </Content>
+  </ItemGroup>
 </Project>

From db2fa09398c3a1a3f3a2da7a86f9180c72b4e630 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 26 Nov 2025 12:17:16 +0000
Subject: [PATCH 3/6] Add comprehensive documentation and verification steps
 for props file

Co-authored-by: T-Gro <46543583+T-Gro@users.noreply.github.com>
---
 ...icrosoft.FSharp.VSIX.Debug.Overrides.props | 47 +++++++++++++++++--
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props b/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props
index 39871498805..4031806bf3a 100644
--- a/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props
+++ b/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props
@@ -1,20 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
+<!--
+  =====================================================================================
+  F# Debug VSIX Compiler Override Props File
+  =====================================================================================
+  
+  PURPOSE:
+    This props file overrides FSharpCompilerPath to point to the VSIX Tools directory,
+    enabling use of locally-built F# compilers from the Debug VSIX.
+  
+  IMPORTANT - MANUAL IMPORT REQUIRED:
+    This file is NOT automatically imported by MSBuild. The Microsoft.VisualStudio.MsBuildProps
+    asset type only deploys the file to the VSIX package - it does NOT auto-import.
+    
+    To use this override, you must MANUALLY import this file in your project or 
+    Directory.Build.props:
+    
+    <Import Project="[VSIX_INSTALL_PATH]\Microsoft.FSharp.VSIX.Debug.Overrides.props" 
+            Condition="Exists('[VSIX_INSTALL_PATH]\Microsoft.FSharp.VSIX.Debug.Overrides.props')" />
+    
+    Typical VSIX install path (replace <version> and <random>):
+    %LOCALAPPDATA%\Microsoft\VisualStudio\<version>\Extensions\<random>\Microsoft.FSharp.VSIX.Debug.Overrides.props
+  
+  VERIFICATION STEPS:
+    1. Build VisualFSharpDebug project in Debug configuration
+    2. Check artifacts\bin\VisualFSharpDebug\Debug\ for this file
+    3. After F5/install, find VSIX at:
+       %LOCALAPPDATA%\Microsoft\VisualStudio\<version>\Extensions\
+    4. Search for "Microsoft.FSharp.VSIX.Debug.Overrides.props" in that directory
+    5. Manually import in your test project's Directory.Build.props
+    6. Build your F# project - look for warning: "[F# Debug VSIX] Using custom F# compiler from: ..."
+  
+  TROUBLESHOOTING:
+    - If no warning appears: props file is not imported (see above)
+    - If warning shows wrong path: check the VSIX install location
+    - To verify compiler is used: add /v:d to MSBuild and search for FSharpCompilerPath
+-->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   
   <PropertyGroup>
-    <!-- Override FSharpCompilerPath to point to VSIX Tools directory -->
-    <!-- This props file is deployed alongside the Tools directory in the VSIX -->
-    <!-- Calculate path from this file's location to Tools -->
+    <!-- Calculate path from this file's location to Tools directory -->
     <_FSharpDebugVsixPropsDir>$(MSBuildThisFileDirectory)</_FSharpDebugVsixPropsDir>
     <_FSharpDebugVsixToolsPath>$(_FSharpDebugVsixPropsDir)Tools\</_FSharpDebugVsixToolsPath>
     
-    <!-- Override only if not already set and compiler exists -->
+    <!-- Override FSharpCompilerPath only if:
+         1. Not already set by user/project
+         2. The compiler actually exists in the Tools directory -->
     <FSharpCompilerPath Condition="'$(FSharpCompilerPath)' == '' and Exists('$(_FSharpDebugVsixToolsPath)fscAnyCpu.exe')">$(_FSharpDebugVsixToolsPath)</FSharpCompilerPath>
   </PropertyGroup>
   
+  <!-- Show a warning during build to indicate custom compiler is in use -->
   <Target Name="WarnAboutDebugVsixCompiler" BeforeTargets="BeforeBuild" Condition="'$(FSharpCompilerPath)' == '$(_FSharpDebugVsixToolsPath)'">
-    <Warning Text="🔧 [F# Debug VSIX] Using custom F# compiler from: $(FSharpCompilerPath)" />
+    <Warning Text="[F# Debug VSIX] Using custom F# compiler from: $(FSharpCompilerPath)" />
   </Target>
 
 </Project>

From 1cda09fe609f6ac56ffe9a886f18bfbf5392153f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 27 Nov 2025 12:21:31 +0000
Subject: [PATCH 4/6] Simplify compiler override approach with clearer
 documentation

Co-authored-by: T-Gro <46543583+T-Gro@users.noreply.github.com>
---
 ...icrosoft.FSharp.VSIX.Debug.Overrides.props | 47 +++++--------------
 1 file changed, 12 insertions(+), 35 deletions(-)

diff --git a/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props b/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props
index 4031806bf3a..c2981d40897 100644
--- a/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props
+++ b/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props
@@ -1,55 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
 <!--
-  =====================================================================================
   F# Debug VSIX Compiler Override Props File
-  =====================================================================================
   
-  PURPOSE:
-    This props file overrides FSharpCompilerPath to point to the VSIX Tools directory,
-    enabling use of locally-built F# compilers from the Debug VSIX.
+  HOW TO USE THE LOCAL COMPILER WHEN DEBUGGING:
   
-  IMPORTANT - MANUAL IMPORT REQUIRED:
-    This file is NOT automatically imported by MSBuild. The Microsoft.VisualStudio.MsBuildProps
-    asset type only deploys the file to the VSIX package - it does NOT auto-import.
-    
-    To use this override, you must MANUALLY import this file in your project or 
-    Directory.Build.props:
-    
-    <Import Project="[VSIX_INSTALL_PATH]\Microsoft.FSharp.VSIX.Debug.Overrides.props" 
-            Condition="Exists('[VSIX_INSTALL_PATH]\Microsoft.FSharp.VSIX.Debug.Overrides.props')" />
-    
-    Typical VSIX install path (replace <version> and <random>):
-    %LOCALAPPDATA%\Microsoft\VisualStudio\<version>\Extensions\<random>\Microsoft.FSharp.VSIX.Debug.Overrides.props
+  OPTION 1 (Recommended): Set FSharpCompilerPath environment variable before launching VS
+    - Windows: set FSharpCompilerPath=C:/path/to/fsharp/artifacts/bin/fsc/Debug/net472/
+    - Then launch VS or use F5 from command line
   
-  VERIFICATION STEPS:
-    1. Build VisualFSharpDebug project in Debug configuration
-    2. Check artifacts\bin\VisualFSharpDebug\Debug\ for this file
-    3. After F5/install, find VSIX at:
-       %LOCALAPPDATA%\Microsoft\VisualStudio\<version>\Extensions\
-    4. Search for "Microsoft.FSharp.VSIX.Debug.Overrides.props" in that directory
-    5. Manually import in your test project's Directory.Build.props
-    6. Build your F# project - look for warning: "[F# Debug VSIX] Using custom F# compiler from: ..."
-  
-  TROUBLESHOOTING:
-    - If no warning appears: props file is not imported (see above)
-    - If warning shows wrong path: check the VSIX install location
-    - To verify compiler is used: add /v:d to MSBuild and search for FSharpCompilerPath
+  OPTION 2: Import this file in your test project's Directory.Build.props
+    <Import Project="[VSIX_PATH]/Microsoft.FSharp.VSIX.Debug.Overrides.props" 
+            Condition="Exists('[VSIX_PATH]/Microsoft.FSharp.VSIX.Debug.Overrides.props')" />
+    
+  VERIFICATION:
+    - Build output should show: "[F# Debug VSIX] Using custom F# compiler from: ..."
+    - Or use MSBuild /v:d and search for FSharpCompilerPath
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   
   <PropertyGroup>
-    <!-- Calculate path from this file's location to Tools directory -->
     <_FSharpDebugVsixPropsDir>$(MSBuildThisFileDirectory)</_FSharpDebugVsixPropsDir>
     <_FSharpDebugVsixToolsPath>$(_FSharpDebugVsixPropsDir)Tools\</_FSharpDebugVsixToolsPath>
     
-    <!-- Override FSharpCompilerPath only if:
-         1. Not already set by user/project
-         2. The compiler actually exists in the Tools directory -->
+    <!-- Override FSharpCompilerPath only if not already set and compiler exists -->
     <FSharpCompilerPath Condition="'$(FSharpCompilerPath)' == '' and Exists('$(_FSharpDebugVsixToolsPath)fscAnyCpu.exe')">$(_FSharpDebugVsixToolsPath)</FSharpCompilerPath>
   </PropertyGroup>
   
-  <!-- Show a warning during build to indicate custom compiler is in use -->
   <Target Name="WarnAboutDebugVsixCompiler" BeforeTargets="BeforeBuild" Condition="'$(FSharpCompilerPath)' == '$(_FSharpDebugVsixToolsPath)'">
     <Warning Text="[F# Debug VSIX] Using custom F# compiler from: $(FSharpCompilerPath)" />
   </Target>

From 59d23ba2aff9d2d8362f2b732d108de2c08d397b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 27 Nov 2025 14:12:10 +0000
Subject: [PATCH 5/6] Auto-set FSharpCompilerPath via launchSettings.json when
 debugging VSIX

Co-authored-by: T-Gro <46543583+T-Gro@users.noreply.github.com>
---
 vsintegration/Vsix/Directory.Build.props      |  2 ++
 ...icrosoft.FSharp.VSIX.Debug.Overrides.props | 34 -------------------
 .../Properties/launchSettings.json            |  5 ++-
 .../Source.extension.vsixmanifest             |  3 --
 .../VisualFSharpFull/VisualFSharpDebug.csproj |  9 -----
 5 files changed, 6 insertions(+), 47 deletions(-)
 delete mode 100644 vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props

diff --git a/vsintegration/Vsix/Directory.Build.props b/vsintegration/Vsix/Directory.Build.props
index e286ec2d2ce..4fe1c320477 100644
--- a/vsintegration/Vsix/Directory.Build.props
+++ b/vsintegration/Vsix/Directory.Build.props
@@ -6,6 +6,8 @@
     <VisualStudioInsertionComponent>Microsoft.FSharp</VisualStudioInsertionComponent>
     <VSRootSuffix>RoslynDev</VSRootSuffix>
     <VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
+    <!-- Path to the locally built F# compiler for use during VSIX debugging -->
+    <FSharpCompilerPath>$(ArtifactsDir)bin/fsc/$(Configuration)/net472/</FSharpCompilerPath>
     <CreateVsixContainer>true</CreateVsixContainer>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
diff --git a/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props b/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props
deleted file mode 100644
index c2981d40897..00000000000
--- a/vsintegration/Vsix/VisualFSharpFull/Microsoft.FSharp.VSIX.Debug.Overrides.props
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<!--
-  F# Debug VSIX Compiler Override Props File
-  
-  HOW TO USE THE LOCAL COMPILER WHEN DEBUGGING:
-  
-  OPTION 1 (Recommended): Set FSharpCompilerPath environment variable before launching VS
-    - Windows: set FSharpCompilerPath=C:/path/to/fsharp/artifacts/bin/fsc/Debug/net472/
-    - Then launch VS or use F5 from command line
-  
-  OPTION 2: Import this file in your test project's Directory.Build.props
-    <Import Project="[VSIX_PATH]/Microsoft.FSharp.VSIX.Debug.Overrides.props" 
-            Condition="Exists('[VSIX_PATH]/Microsoft.FSharp.VSIX.Debug.Overrides.props')" />
-    
-  VERIFICATION:
-    - Build output should show: "[F# Debug VSIX] Using custom F# compiler from: ..."
-    - Or use MSBuild /v:d and search for FSharpCompilerPath
--->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_FSharpDebugVsixPropsDir>$(MSBuildThisFileDirectory)</_FSharpDebugVsixPropsDir>
-    <_FSharpDebugVsixToolsPath>$(_FSharpDebugVsixPropsDir)Tools\</_FSharpDebugVsixToolsPath>
-    
-    <!-- Override FSharpCompilerPath only if not already set and compiler exists -->
-    <FSharpCompilerPath Condition="'$(FSharpCompilerPath)' == '' and Exists('$(_FSharpDebugVsixToolsPath)fscAnyCpu.exe')">$(_FSharpDebugVsixToolsPath)</FSharpCompilerPath>
-  </PropertyGroup>
-  
-  <Target Name="WarnAboutDebugVsixCompiler" BeforeTargets="BeforeBuild" Condition="'$(FSharpCompilerPath)' == '$(_FSharpDebugVsixToolsPath)'">
-    <Warning Text="[F# Debug VSIX] Using custom F# compiler from: $(FSharpCompilerPath)" />
-  </Target>
-
-</Project>
diff --git a/vsintegration/Vsix/VisualFSharpFull/Properties/launchSettings.json b/vsintegration/Vsix/VisualFSharpFull/Properties/launchSettings.json
index a3e00ad6bec..e1271063ea9 100644
--- a/vsintegration/Vsix/VisualFSharpFull/Properties/launchSettings.json
+++ b/vsintegration/Vsix/VisualFSharpFull/Properties/launchSettings.json
@@ -3,7 +3,10 @@
     "VisualFSharpDebug": {
       "commandName": "Executable",
       "executablePath": "$(DevEnvDir)devenv.exe",
-      "commandLineArgs": "/rootsuffix $(VSSDKTargetPlatformRegRootSuffix) /log"
+      "commandLineArgs": "/rootsuffix $(VSSDKTargetPlatformRegRootSuffix) /log",
+      "environmentVariables": {
+        "FSharpCompilerPath": "$(FSharpCompilerPath)"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
index 590b1ef1b57..f805558824b 100644
--- a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
+++ b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
@@ -60,9 +60,6 @@
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|TextFile;TemplateProjectOutputGroup|" d:ProjectName="TextFile" d:VsixSubPath="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|XMLFile;TemplateProjectOutputGroup|" d:ProjectName="XMLFile" d:VsixSubPath="ItemTemplates" />
 
-    <Asset Type="Microsoft.VisualStudio.MsBuildProps" 
-           d:Source="File" 
-           Path="Microsoft.FSharp.VSIX.Debug.Overrides.props" />
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[|%CurrentProject%;GetVSGeneralVersion|,)" DisplayName="Visual Studio core editor" />
diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpDebug.csproj b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpDebug.csproj
index 1f2f53362e7..5a6671c4d24 100644
--- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpDebug.csproj
+++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpDebug.csproj
@@ -84,13 +84,4 @@
       </Content>
     </ItemGroup>
   </Target>
-
-  <ItemGroup>
-    <!-- Deploy the override props file as an MSBuild asset -->
-    <Content Include="Microsoft.FSharp.VSIX.Debug.Overrides.props">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <VSixSubPath>.</VSixSubPath>
-    </Content>
-  </ItemGroup>
 </Project>

From 9c41851394123f7e2d024ba22d690b1255b6ccb6 Mon Sep 17 00:00:00 2001
From: Tomas Grosup <tomasgrosup@microsoft.com>
Date: Fri, 28 Nov 2025 12:58:33 +0100
Subject: [PATCH 6/6] Solve debug launch via env vars

---
 vsintegration/Vsix/Directory.Build.props                  | 2 +-
 .../Vsix/VisualFSharpFull/Properties/launchSettings.json  | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/vsintegration/Vsix/Directory.Build.props b/vsintegration/Vsix/Directory.Build.props
index 4fe1c320477..66b95cf6e1a 100644
--- a/vsintegration/Vsix/Directory.Build.props
+++ b/vsintegration/Vsix/Directory.Build.props
@@ -7,7 +7,7 @@
     <VSRootSuffix>RoslynDev</VSRootSuffix>
     <VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
     <!-- Path to the locally built F# compiler for use during VSIX debugging -->
-    <FSharpCompilerPath>$(ArtifactsDir)bin/fsc/$(Configuration)/net472/</FSharpCompilerPath>
+    <FSharpCompilerPathForDebuggingLocally>$(ArtifactsDir)bin\fscAnyCpu\$(Configuration)\net472\</FSharpCompilerPathForDebuggingLocally>
     <CreateVsixContainer>true</CreateVsixContainer>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
diff --git a/vsintegration/Vsix/VisualFSharpFull/Properties/launchSettings.json b/vsintegration/Vsix/VisualFSharpFull/Properties/launchSettings.json
index e1271063ea9..5731d86cdd6 100644
--- a/vsintegration/Vsix/VisualFSharpFull/Properties/launchSettings.json
+++ b/vsintegration/Vsix/VisualFSharpFull/Properties/launchSettings.json
@@ -5,7 +5,13 @@
       "executablePath": "$(DevEnvDir)devenv.exe",
       "commandLineArgs": "/rootsuffix $(VSSDKTargetPlatformRegRootSuffix) /log",
       "environmentVariables": {
-        "FSharpCompilerPath": "$(FSharpCompilerPath)"
+        "FSharpCompilerPath": "$(FSharpCompilerPathForDebuggingLocally)",
+        "DisableAutoSetFscCompilerPath": "true",
+        "FSharpPreferNetFrameworkTools": "true",
+        "FSharp_Shim_Present": "true",
+        "FSharpPreferAnyCpuTools": "true",
+        "Fsc_NetFramework_ToolPath": "$(FSharpCompilerPathForDebuggingLocally)",
+        "Fsc_NetFramework_AnyCpu_ToolExe": "fscAnyCpu.exe"
       }
     }
   }