Generalizing VS version to avoid build errors (#2518)

Added a new VsVersion parameter to build.yml to avoid hardcoding, used that on targets.

Author: joj

Nodejs/Product/TargetsVsix/TargetsVsix.csproj

@@ -3,7 +3,8 @@
   <Import Project="..\VsixProjectBefore.settings" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <VsVersion Condition="'$(VsVersion)' == ''">$(VisualStudioVersion)</VsVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualS/$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -53,13 +54,13 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
       <InstallRoot>MSBuild</InstallRoot>
-      <VSIXSubPath>Microsoft\VisualStudio\v17.0\Node.js Tools</VSIXSubPath>
+      <VSIXSubPath>Microsoft\VisualStudio\v$(VsVersion)\Node.js Tools</VSIXSubPath>
     </Content>
     <Content Include="Microsoft.NodejsToolsV2.targets">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
       <InstallRoot>MSBuild</InstallRoot>
-      <VSIXSubPath>Microsoft\VisualStudio\v17.0\Node.js Tools</VSIXSubPath>
+      <VSIXSubPath>Microsoft\VisualStudio\v$(VsVersion)\Node.js Tools</VSIXSubPath>
     </Content>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
@@ -73,7 +74,7 @@
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <InstallRoot>MSBuild</InstallRoot>
-      <VSIXSubPath>Microsoft\VisualStudio\v17.0\Node.js Tools</VSIXSubPath>
+      <VSIXSubPath>Microsoft\VisualStudio\v$(VsVersion)\Node.js Tools</VSIXSubPath>
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>

azure-pipelines/build.yml

@@ -32,6 +32,9 @@ parameters:
 - name: BuildConfiguration
   type: string
   default: Release
+- name: VisualStudioVersion
+  type: string
+  default: 17.0
 
 variables:
 - name: TeamName # Needed for MicroBuildSigningPlugin
@@ -120,7 +123,7 @@ extends:
           displayName: Build solution Nodejs/NodejsTools.sln
           inputs:
             solution: Nodejs/NodejsTools.sln
-            msbuildArgs: /p:SourceLinkCreate=true
+            msbuildArgs: /p:SourceLinkCreate=true /p:VsVersion=${{ parameters.VisualStudioVersion }} 
             configuration: ${{ parameters.BuildConfiguration }}
             clean: true
             maximumCpuCount: true
@@ -144,7 +147,7 @@ extends:
           displayName: Build solution Setup
           inputs:
             solution: Nodejs/Setup/NodejsSetup.sln
-            msbuildArgs: /p:SourceLinkCreate=true
+            msbuildArgs: /p:SourceLinkCreate=true /p:VsVersion=${{ parameters.VisualStudioVersion }}
             configuration: ${{ parameters.BuildConfiguration }}
             clean: true
             logProjectEvents: false