[vcxproj] Explicitly specify intermediate and output directories

Avoids case-sensitivity issues, flattens the layout, no Win32 but x86 instead
Issue #4586

7 files changed, 71 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index bc83e2959..befc51d8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -284,6 +284,10 @@ __pycache__/
 /packages/
 /scripts/buildsystems/tmp/
 /toolsrc/build.rel/
+/toolsrc/msbuild.x86.debug/
+/toolsrc/msbuild.x86.release/
+/toolsrc/msbuild.x64.debug/
+/toolsrc/msbuild.x64.release/
 #ignore custom triplets
 /triplets/*
 #add vcpkg-designed triplets back in
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 7ebbb2930..216e3fb09 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -328,7 +328,7 @@ if ($disableMetrics)
 }
 
 $platform = "x86"
-$vcpkgReleaseDir = "$vcpkgSourcesPath\release"
+$vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x86.release"
 
 if ($win64)
 {
@@ -339,7 +339,7 @@ if ($win64)
     }
 
     $platform = "x64"
-    $vcpkgReleaseDir = "$vcpkgSourcesPath\x64\release"
+    $vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x64.release"
 }
 
 $arguments = (
diff --git a/toolsrc/dirs.proj b/toolsrc/dirs.proj
index 17d9fa1b0..7729c9897 100644
--- a/toolsrc/dirs.proj
+++ b/toolsrc/dirs.proj
@@ -3,8 +3,8 @@
     <SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectFile Include="vcpkg\vcpkg.vcxproj"/>
     <ProjectFile Include="vcpkglib\vcpkglib.vcxproj"/>
+    <ProjectFile Include="vcpkg\vcpkg.vcxproj"/>
     <ProjectFile Include="vcpkgmetricsuploader\vcpkgmetricsuploader.vcxproj"/>
   </ItemGroup>
 
diff --git a/toolsrc/vcpkg/vcpkg.vcxproj b/toolsrc/vcpkg/vcpkg.vcxproj
index 349f8fbf7..8edea2244 100644
--- a/toolsrc/vcpkg/vcpkg.vcxproj
+++ b/toolsrc/vcpkg/vcpkg.vcxproj
@@ -53,7 +53,22 @@
   <ImportGroup Label="Shared">

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

-  <PropertyGroup />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>

+    <OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>$(SolutionDir)msbuild.x86.release\</OutDir>

+    <IntDir>$(SolutionDir)msbuild.x86.release\$(ProjectName)\</IntDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <IntDir>$(SolutionDir)msbuild.x64.debug\$(ProjectName)\</IntDir>

+    <OutDir>$(SolutionDir)msbuild.x64.debug\</OutDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <IntDir>$(SolutionDir)msbuild.x64.release\$(ProjectName)\</IntDir>

+    <OutDir>$(SolutionDir)msbuild.x64.release\</OutDir>

+  </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <WarningLevel>Level4</WarningLevel>

diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj
index 0cd3a9d25..8df9b5b9d 100644
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj
+++ b/toolsrc/vcpkglib/vcpkglib.vcxproj
@@ -56,7 +56,22 @@
   <ImportGroup Label="Shared">

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

-  <PropertyGroup />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>

+    <OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>$(SolutionDir)msbuild.x86.release\</OutDir>

+    <IntDir>$(SolutionDir)msbuild.x86.release\$(ProjectName)\</IntDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <IntDir>$(SolutionDir)msbuild.x64.debug\$(ProjectName)\</IntDir>

+    <OutDir>$(SolutionDir)msbuild.x64.debug\</OutDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <IntDir>$(SolutionDir)msbuild.x64.release\$(ProjectName)\</IntDir>

+    <OutDir>$(SolutionDir)msbuild.x64.release\</OutDir>

+  </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <WarningLevel>Level3</WarningLevel>

diff --git a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj
index 26fed0ec2..e533d0e15 100644
--- a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj
+++ b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj
@@ -53,7 +53,22 @@
   <ImportGroup Label="Shared">

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

-  <PropertyGroup />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>

+    <OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>$(SolutionDir)msbuild.x86.release\</OutDir>

+    <IntDir>$(SolutionDir)msbuild.x86.release\$(ProjectName)\</IntDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <IntDir>$(SolutionDir)msbuild.x64.debug\$(ProjectName)\</IntDir>

+    <OutDir>$(SolutionDir)msbuild.x64.debug\</OutDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <IntDir>$(SolutionDir)msbuild.x64.release\$(ProjectName)\</IntDir>

+    <OutDir>$(SolutionDir)msbuild.x64.release\</OutDir>

+  </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <WarningLevel>Level3</WarningLevel>

diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj b/toolsrc/vcpkgtest/vcpkgtest.vcxproj
index 6bb0e8020..4cda29461 100644
--- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj
+++ b/toolsrc/vcpkgtest/vcpkgtest.vcxproj
@@ -84,6 +84,22 @@
   <ImportGroup Label="Shared">

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>

+    <OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>$(SolutionDir)msbuild.x86.release\</OutDir>

+    <IntDir>$(SolutionDir)msbuild.x86.release\$(ProjectName)\</IntDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <IntDir>$(SolutionDir)msbuild.x64.debug\$(ProjectName)\</IntDir>

+    <OutDir>$(SolutionDir)msbuild.x64.debug\</OutDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <IntDir>$(SolutionDir)msbuild.x64.release\$(ProjectName)\</IntDir>

+    <OutDir>$(SolutionDir)msbuild.x64.release\</OutDir>

+  </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>