Fixing references for Building NTVS on VS15 (#1403)

* Fixing  BuildRelease Script for Vs15 Post Preview 3

Issue #1400

**Bug**
Build release script currently does not support building using vs15 post preview 3

**Fixes**
Add support for specifying install location for vs and picking up correct tools from the target vs15 instance.

Closes #1400

* revert assembly version change

* Fix TestAdapter References for Building on VS15

**Bug**
When building NTVS on a machine that only has VS15 post preview 3 installed, `DevEnvDir` is incorrect. The value is supposed to come from the registry, but the registry key does not exist in this case.

**Fix**
Optionally pass DevEnvDir in the buildscript itself insead of looking it up from the registry.

* Fixing for vs14

Author: mjbvz

Build/Common.Build.settings

@@ -97,7 +97,7 @@
 
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
 
-	<DevEnvDir>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\Software\Microsoft\VisualStudio\$(VSTarget)', 'InstallDir', null, RegistryView.Registry32))\</DevEnvDir> 
+    <DevEnvDir Condition="'$(DevEnvDir)' == ''">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\Software\Microsoft\VisualStudio\$(VSTarget)', 'InstallDir', null, RegistryView.Registry32))\</DevEnvDir> 
     <VSSDKDir>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\Software\Microsoft\VisualStudio\VSIP\$(VSTarget)', 'InstallDir', null, RegistryView.Registry32))\</VSSDKDir>
   </PropertyGroup>
 

Build/VisualStudioHelpers.psm1

@@ -24,7 +24,7 @@ function get_target_vs_versions($vstarget, $vsroot) {
                 $target_versions += @{
                     number=$target_vs.number;
                     name=$target_vs.name;
-                    vsroot=$vspath.InstallDir;
+                    vsroot="$($vspath.InstallDir)..\..\";
                     msbuildroot=$msbuildroot
                 }
             }

Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj

@@ -175,11 +175,4 @@
   </PropertyGroup>
   <Import Project="$(BuildRoot)\Common\Product\ReplWindow\ReplWindow.proj" />
   <Import Project="..\ProjectAfter.settings" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

Nodejs/Product/TestAdapter/TestAdapter.csproj

@@ -55,11 +55,11 @@
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel">
-      <HintPath>$(DevEnvDir)\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
+      <HintPath>$(DevEnvDir)CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces">
-      <HintPath>$(DevEnvDir)\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
+      <HintPath>$(DevEnvDir)CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Text.Data, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -92,7 +92,7 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
- <Choose>
+  <Choose>
     <When Condition="$(VSTarget) == '15.0'">
       <ItemGroup>
         <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -174,11 +174,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
   </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

Nodejs/Setup/BuildRelease.ps1

@@ -224,7 +224,8 @@ function msbuild-options($target) {
         "/p:CopyOutputsToPath=$($target.destdir)",
         "/p:Configuration=$($target.config)",
         "/p:MsiVersion=$($target.msi_version)",
-        "/p:ReleaseVersion=$($target.release_version)"
+        "/p:ReleaseVersion=$($target.release_version)",
+        "/p:DevEnvDir=$($target.vsroot)\Common7\IDE\\"
     )
 }