Change paths for Vsix files

Author: Paul van Brenk

Nodejs/Product/NodejsToolsVsix/NodejsToolsVsix.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
-  <Import Project="..\ProjectBefore.settings" />
+  <Import Project="..\VsixProjectBefore.settings" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

Nodejs/Product/Targets/Targets.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\ProjectBefore.settings" />
+  <Import Project="..\VsixProjectBefore.settings" />
   <Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>

Nodejs/Product/TestAdapterVsix/TestAdapterVsix.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" />
-  <Import Project="..\ProjectBefore.settings" />
+  <Import Project="..\VsixProjectBefore.settings" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

Nodejs/Product/VsixProjectBefore.settings

@@ -0,0 +1,9 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <BuildRoot Condition="'$(BuildRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>
+    <OutputPathSuffix Condition="'$(OutputPathSuffix)' == ''">Setup\$(MSBuildProjectName)\</OutputPathSuffix>
+    <IntermediateOutputPathSuffix>obj\$(MSBuildProjectName)\</IntermediateOutputPathSuffix>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(BuildRoot)\Nodejs\</SolutionDir>
+  </PropertyGroup>
+  <Import Project="$(BuildRoot)\Build\Common.Build.settings" />
+</Project>

Nodejs/Setup/NodejsTools.vsmanproj

@@ -24,9 +24,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <MergeManifest Include="$(BuildOutputRoot)\Binaries\NodejsToolsVsix\Microsoft.VisualStudio.NodejsTools.NodejsTools.json" />
-        <MergeManifest Include="$(BuildOutputRoot)\Binaries\Targets\Microsoft.VisualStudio.NodejsTools.Targets.json" />
-        <MergeManifest Include="$(BuildOutputRoot)\Binaries\TestAdapterVsix\Microsoft.VisualStudio.NodejsTools.TestAdapter.json" />
+        <MergeManifest Include="$(BuildOutputRoot)\Setup\NodejsToolsVsix\Microsoft.VisualStudio.NodejsTools.NodejsTools.json" />
+        <MergeManifest Include="$(BuildOutputRoot)\Setup\Targets\Microsoft.VisualStudio.NodejsTools.Targets.json" />
+        <MergeManifest Include="$(BuildOutputRoot)\Setup\TestAdapterVsix\Microsoft.VisualStudio.NodejsTools.TestAdapter.json" />
         <Node Include="packages.config" />
     </ItemGroup>
 

Nodejs/Setup/SetupProjectBefore.settings

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <BuildRoot Condition="'$(BuildRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>
-    <OutputPathSuffix Condition="'$(OutputPathSuffix)' == ''">Binaries\$(MSBuildProjectName)\</OutputPathSuffix>
+    <OutputPathSuffix Condition="'$(OutputPathSuffix)' == ''">Setup\$(MSBuildProjectName)\</OutputPathSuffix>
     <IntermediateOutputPathSuffix>obj\$(MSBuildProjectName)\</IntermediateOutputPathSuffix>
   </PropertyGroup>
   <Import Project="$(BuildRoot)\Build\Common.Build.settings" />