diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 758cd5ef1c2..0d31aa0f1da 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -23,4 +23,4 @@ RUN apt-get update \
 ENV DEBIAN_FRONTEND=dialog
 
 # Make sure we can build using plain dotnet
-ENV BUILDING_USING_DOTNET=true
\ No newline at end of file
+ENV BUILDING_USING_DOTNET="true"
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 07e0340d9de..cfba72ce23a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -15,9 +15,6 @@
         "storage": "32gb"
     },
 
-    // Default settings are set in .vscode/settings.json
-    "settings": {},
-
     // Add the IDs of extensions you want installed when the container is created.
     "extensions": [
         "ms-dotnettools.csharp",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0b6758aee1b..f1629c99e8d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -16,8 +16,8 @@
         "*.fs": "${capture}.fsi"
     },
     "FSharp.suggestGitignore": false,
-    "FSharp.enableMSBuildProjectGraph": true,
-    "FSharp.enableAdaptiveLspServer": false,
+    "FSharp.enableMSBuildProjectGraph": false,
+    "FSharp.enableAdaptiveLspServer": true,
     "FSharp.workspacePath": "FSharp.Compiler.Service.sln",
     "FSharp.workspaceModePeekDeepLevel": 1,
     "FSharp.enableBackgroundServices": false,
@@ -35,7 +35,7 @@
     "csharp.suppressDotnetInstallWarning": true,
     "csharp.suppressDotnetRestoreNotification": true,
     "csharp.suppressHiddenDiagnostics": true,
-    "omnisharp.autoStart": true,
+    "omnisharp.autoStart": false,
     "omnisharp.defaultLaunchSolution": "FSharp.Compiler.Service.sln",
     "omnisharp.enableMsBuildLoadProjectsOnDemand": true,
     "omnisharp.disableMSBuildDiagnosticWarning": true,
diff --git a/Directory.Build.props b/Directory.Build.props
index e77076d1425..7a398a0f13e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,7 +11,12 @@
    All settings below can be overriden via CLI switches if needed. -->
 
   <PropertyGroup Condition="'$(SolutionName)' == 'FSharp.Compiler.Service' and '$(BUILDING_USING_DOTNET)' != 'false'">
-      <BUILDING_USING_DOTNET Condition="'$(BUILDING_USING_DOTNET)' == ''">true</BUILDING_USING_DOTNET>
+      <BUILDING_USING_DOTNET>true</BUILDING_USING_DOTNET>
+  </PropertyGroup>
+
+  <!-- Temporary workaround if proj-info is used, allows Ionide's evaluation to work correctly. -->
+  <PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' != 'false' and '$(DotnetProjInfo)' == 'true'">
+      <BUILDING_USING_DOTNET>true</BUILDING_USING_DOTNET>
   </PropertyGroup>
 
   <Import Project="$(RepoRoot)/Directory.Build.props.user" Condition = "Exists('$(RepoRoot)/Directory.Build.props.user')" />
@@ -25,7 +30,6 @@
     <IntermediateOutputPath>$(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/</IntermediateOutputPath>
     <FsLexPath>$(ArtifactsDir)/bin/fslex/$(Configuration)/net7.0/fslex.dll</FsLexPath>
     <FsYaccPath>$(ArtifactsDir)/bin/fsyacc/$(Configuration)/net7.0/fsyacc.dll</FsYaccPath>
-    <OtherFlags>$(OtherFlags) --test:ParallelCheckingWithSignatureFilesOn</OtherFlags>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)/eng/Versions.props" Condition="'$(DISABLE_ARCADE)' == 'true'"/>
diff --git a/eng/Build.ps1 b/eng/Build.ps1
index b3053f02a4b..aff80d3cee0 100644
--- a/eng/Build.ps1
+++ b/eng/Build.ps1
@@ -243,6 +243,10 @@ function BuildSolution([string] $solutionName) {
     # Do not set the property to true explicitly, since that would override value projects might set.
     $suppressExtensionDeployment = if (!$deployExtensions) { "/p:DeployExtension=false" } else { "" }
 
+    $BUILDING_USING_DOTNET_ORIG = $env:BUILDING_USING_DOTNET
+
+    $env:BUILDING_USING_DOTNET="false"
+
     MSBuild $toolsetBuildProj `
         $bl `
         /p:Configuration=$configuration `
@@ -261,10 +265,11 @@ function BuildSolution([string] $solutionName) {
         /p:TestTargetFrameworks=$testTargetFrameworks `
         /p:DotNetBuildFromSource=$sourceBuild `
         /p:CompressAllMetadata=$CompressAllMetadata `
-        /p:BUILDING_USING_DOTNET=false `
         /v:$verbosity `
         $suppressExtensionDeployment `
         @properties
+        
+    $env:BUILDING_USING_DOTNET=$BUILDING_USING_DOTNET_ORIG
 }
 
 function TestAndAddToPath([string] $testPath) {
diff --git a/eng/build.sh b/eng/build.sh
index 510c1297fbd..d9818322e67 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -207,6 +207,7 @@ function TestUsingNUnit() {
 }
 
 function BuildSolution {
+  BUILDING_USING_DOTNET=false
   BuildCategory="Build"
   BuildMessage="Error preparing build"
   local solution="FSharp.sln"
@@ -295,7 +296,6 @@ function BuildSolution {
       /p:QuietRestore=$quiet_restore \
       /p:QuietRestoreBinaryLog="$binary_log" \
       /p:ArcadeBuildFromSource=$source_build \
-      /p:BUILDING_USING_DOTNET=false \
       $properties
   fi
 }
diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
index d6201c10647..f3f67a4020a 100644
--- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
+++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
@@ -249,7 +249,7 @@
 
   <ItemGroup>
     <None Include="**\*.cs;**\*.fs;**\*.fsx;**\*.fsi" Exclude="@(Compile)">
-      <Link>%(RelativeDir)\TestSource\%(Filename)%(Extension)</Link>
+      <Link>%(RelativeDir)TestSource\%(Filename)%(Extension)</Link>
     </None>
   </ItemGroup>