use a more deterministic path for targets shims

brettfo · brettfo · commit f8897dda4802 · 2018-05-24T13:18:12.000-07:00
diff --git a/setup/resources/Microsoft.FSharp.NetSdk.Shim.props b/setup/resources/Microsoft.FSharp.NetSdk.Shim.props
@@ -1,5 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\Microsoft.FSharp.NetSdk.props" />
+  <Import Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\Microsoft.FSharp.NetSdk.props" />
 
 </Project>
diff --git a/setup/resources/Microsoft.FSharp.NetSdk.Shim.targets b/setup/resources/Microsoft.FSharp.NetSdk.Shim.targets
@@ -1,5 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\Microsoft.FSharp.NetSdk.targets" />
+  <Import Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\Microsoft.FSharp.NetSdk.targets" />
 
 </Project>
diff --git a/setup/resources/Microsoft.FSharp.Overrides.NetSdk.Shim.targets b/setup/resources/Microsoft.FSharp.Overrides.NetSdk.Shim.targets
@@ -1,5 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\Microsoft.FSharp.Overrides.NetSdk.targets" />
+  <Import Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\Microsoft.FSharp.Overrides.NetSdk.targets" />
 
 </Project>
diff --git a/setup/resources/Microsoft.FSharp.Shim.targets b/setup/resources/Microsoft.FSharp.Shim.targets
@@ -1,5 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\Microsoft.FSharp.targets" />
+  <Import Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\Microsoft.FSharp.targets" />
   
 </Project>
diff --git a/setup/resources/Microsoft.Portable.FSharp.Shim.targets b/setup/resources/Microsoft.Portable.FSharp.Shim.targets
@@ -1,5 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\Microsoft.Portable.FSharp.targets" />
+  <Import Project="$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\Microsoft.Portable.FSharp.targets" />
   
 </Project>
