diff --git a/scripts/build.ps1 b/scripts/build.ps1
index f71b0da3ac..1d23cc3b3b 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -78,7 +78,7 @@ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
 # Dotnet build doesn't support --packages yet. See https://github.com/dotnet/cli/issues/2712
 $env:NUGET_PACKAGES = $env:TP_PACKAGES_DIR
 $env:NUGET_EXE_Version = "3.4.3"
-$env:DOTNET_CLI_VERSION = "LATEST"
+$env:DOTNET_CLI_VERSION = "3.1.100-preview2-014569"
 # $env:DOTNET_RUNTIME_VERSION = "LATEST"
 $env:VSWHERE_VERSION = "2.0.2"
 $env:MSBUILD_VERSION = "15.0"
diff --git a/scripts/build.sh b/scripts/build.sh
index 2a04c38732..e27183e4ce 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -111,7 +111,7 @@ VERSION=$(test -z $VERSION && grep TPVersionPrefix $TP_ROOT_DIR/scripts/build/Te
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 # Dotnet build doesnt support --packages yet. See https://github.com/dotnet/cli/issues/2712
 export NUGET_PACKAGES=$TP_PACKAGES_DIR
-DOTNET_CLI_VERSION="LATEST"
+DOTNET_CLI_VERSION="3.1.100-preview2-014569"
 #DOTNET_RUNTIME_VERSION="LATEST"
 
 #
diff --git a/src/package/VSIXProject/TestPlatform.csproj b/src/package/VSIXProject/TestPlatform.csproj
index 80d1231f03..a830fb53bd 100644
--- a/src/package/VSIXProject/TestPlatform.csproj
+++ b/src/package/VSIXProject/TestPlatform.csproj
@@ -30,7 +30,7 @@
     <VsixInputFileLocation>$(TestPlatformRoot)artifacts\$(Configuration)\net451\win7-x64</VsixInputFileLocation>
     <OutputPath>$(TestPlatformRoot)artifacts\$(Configuration)\VSIX</OutputPath>
     <ExtensionInstallationFolder>TestPlatform</ExtensionInstallationFolder>
-    <ExtensionInstallationRelativeToVS>Common7\IDE\Extensions\TestPlatform</ExtensionInstallationRelativeToVS>
+    <ExtensionInstallationRelativeToVS>[installDir]\Common7\IDE\Extensions\TestPlatform</ExtensionInstallationRelativeToVS>
 
     <!-- Disable warning that there are no source files. It is intentional. -->
     <NoWarn>$(NoWarn);2008</NoWarn>