Remove vstarget and build suffix for general case

Author: Paul van Brenk

Build/Common.Build.settings

@@ -47,7 +47,7 @@
     Rather than customizing OutputPath or IntermediateOutputPath in projects,
     $(OutputPathSuffix) and $(IntermediateOutputPathSuffix) should be set.
     -->
-    <BuildOutputRoot Condition="'$(BuildOutputRoot)' == ''">$(BuildRoot)\BuildOutput\$(Configuration)$(VSTarget)\</BuildOutputRoot>
+    <BuildOutputRoot Condition="'$(BuildOutputRoot)' == ''">$(BuildRoot)\BuildOutput\$(Configuration)\</BuildOutputRoot>
     <BuildOutputRoot Condition="!HasTrailingSlash($(BuildOutputRoot))">$(BuildOutputRoot)\</BuildOutputRoot>
 
     <OutputPathSuffix Condition="'$(OutputPathSuffix)' != '' and !HasTrailingSlash($(OutputPathSuffix))">$(OutputPathSuffix)\</OutputPathSuffix>

Nodejs/Setup/SetupProjectBefore.settings

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