diff --git a/src/coreclr/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json b/src/coreclr/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json
new file mode 100644
index 00000000000000..308f68dd8c5fa3
--- /dev/null
+++ b/src/coreclr/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json	
@@ -0,0 +1 @@
+{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
\ No newline at end of file
diff --git a/src/coreclr/out/build/x64-Debug (default)/VSInheritEnvironments.txt b/src/coreclr/out/build/x64-Debug (default)/VSInheritEnvironments.txt
new file mode 100644
index 00000000000000..f8cc9d8acececa
--- /dev/null
+++ b/src/coreclr/out/build/x64-Debug (default)/VSInheritEnvironments.txt	
@@ -0,0 +1 @@
+msvc_x64_x64
\ No newline at end of file
diff --git a/src/installer/corehost/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json b/src/installer/corehost/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json
new file mode 100644
index 00000000000000..308f68dd8c5fa3
--- /dev/null
+++ b/src/installer/corehost/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json	
@@ -0,0 +1 @@
+{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
\ No newline at end of file
diff --git a/src/installer/corehost/out/build/x64-Debug (default)/VSInheritEnvironments.txt b/src/installer/corehost/out/build/x64-Debug (default)/VSInheritEnvironments.txt
new file mode 100644
index 00000000000000..f8cc9d8acececa
--- /dev/null
+++ b/src/installer/corehost/out/build/x64-Debug (default)/VSInheritEnvironments.txt	
@@ -0,0 +1 @@
+msvc_x64_x64
\ No newline at end of file
diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.props b/src/installer/tests/Assets/TestUtils/TestProjects.props
index 72150d0f0b5239..9a4c0b052bdd9a 100644
--- a/src/installer/tests/Assets/TestUtils/TestProjects.props
+++ b/src/installer/tests/Assets/TestUtils/TestProjects.props
@@ -6,7 +6,7 @@
     in a different manner than using the $(RepositoryEngineeringDir) variable.
   -->
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),global.json))\eng\Configurations.props" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Configurations.props,$(MSBuildThisFileDirectory)))../../../../../eng/Configurations.props" />
 
   <PropertyGroup>
     <!--
diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/pkg/Microsoft.Bcl.AsyncInterfaces.pkgproj b/src/libraries/Microsoft.Bcl.AsyncInterfaces/pkg/Microsoft.Bcl.AsyncInterfaces.pkgproj
index f0630aaef6ecc1..71bd0902566ae0 100644
--- a/src/libraries/Microsoft.Bcl.AsyncInterfaces/pkg/Microsoft.Bcl.AsyncInterfaces.pkgproj
+++ b/src/libraries/Microsoft.Bcl.AsyncInterfaces/pkg/Microsoft.Bcl.AsyncInterfaces.pkgproj
@@ -1,9 +1,9 @@
 <Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
   <ItemGroup>
     <ProjectReference Include="..\src\Microsoft.Bcl.AsyncInterfaces.csproj">
       <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
+</Project>
diff --git a/src/libraries/Native/Unix/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json b/src/libraries/Native/Unix/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json
new file mode 100644
index 00000000000000..308f68dd8c5fa3
--- /dev/null
+++ b/src/libraries/Native/Unix/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json	
@@ -0,0 +1 @@
+{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
\ No newline at end of file
diff --git a/src/libraries/Native/Unix/out/build/x64-Debug (default)/VSInheritEnvironments.txt b/src/libraries/Native/Unix/out/build/x64-Debug (default)/VSInheritEnvironments.txt
new file mode 100644
index 00000000000000..f8cc9d8acececa
--- /dev/null
+++ b/src/libraries/Native/Unix/out/build/x64-Debug (default)/VSInheritEnvironments.txt	
@@ -0,0 +1 @@
+msvc_x64_x64
\ No newline at end of file
diff --git a/src/libraries/Native/Windows/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json b/src/libraries/Native/Windows/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json
new file mode 100644
index 00000000000000..308f68dd8c5fa3
--- /dev/null
+++ b/src/libraries/Native/Windows/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json	
@@ -0,0 +1 @@
+{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
\ No newline at end of file
diff --git a/src/libraries/Native/Windows/out/build/x64-Debug (default)/VSInheritEnvironments.txt b/src/libraries/Native/Windows/out/build/x64-Debug (default)/VSInheritEnvironments.txt
new file mode 100644
index 00000000000000..f8cc9d8acececa
--- /dev/null
+++ b/src/libraries/Native/Windows/out/build/x64-Debug (default)/VSInheritEnvironments.txt	
@@ -0,0 +1 @@
+msvc_x64_x64
\ No newline at end of file
diff --git a/src/libraries/pkg/test/project.csproj.template b/src/libraries/pkg/test/project.csproj.template
index 0eaabeb356c3ce..38640b446e3341 100644
--- a/src/libraries/pkg/test/project.csproj.template
+++ b/src/libraries/pkg/test/project.csproj.template
@@ -9,7 +9,7 @@
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <NETCoreAppMaximumVersion>99.0</NETCoreAppMaximumVersion>
 
-    <SupportFilesDir Condition="'$(SupportFilesDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\support</SupportFilesDir>
+    <SupportFilesDir Condition="'$(SupportFilesDir)' == ''">$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))</SupportFilesDir>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/mono/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json b/src/mono/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json
new file mode 100644
index 00000000000000..308f68dd8c5fa3
--- /dev/null
+++ b/src/mono/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json	
@@ -0,0 +1 @@
+{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
\ No newline at end of file
diff --git a/src/mono/out/build/x64-Debug (default)/VSInheritEnvironments.txt b/src/mono/out/build/x64-Debug (default)/VSInheritEnvironments.txt
new file mode 100644
index 00000000000000..f8cc9d8acececa
--- /dev/null
+++ b/src/mono/out/build/x64-Debug (default)/VSInheritEnvironments.txt	
@@ -0,0 +1 @@
+msvc_x64_x64
\ No newline at end of file
diff --git a/src/tests/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json b/src/tests/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json
new file mode 100644
index 00000000000000..308f68dd8c5fa3
--- /dev/null
+++ b/src/tests/out/build/x64-Debug (default)/.cmake/api/v1/query/client-MicrosoftVS/query.json	
@@ -0,0 +1 @@
+{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2}]}
\ No newline at end of file
diff --git a/src/tests/out/build/x64-Debug (default)/VSInheritEnvironments.txt b/src/tests/out/build/x64-Debug (default)/VSInheritEnvironments.txt
new file mode 100644
index 00000000000000..f8cc9d8acececa
--- /dev/null
+++ b/src/tests/out/build/x64-Debug (default)/VSInheritEnvironments.txt	
@@ -0,0 +1 @@
+msvc_x64_x64
\ No newline at end of file