From c419430017f89356dc93ee13ddff5184e3249304 Mon Sep 17 00:00:00 2001
From: "Michael Friesen (NETWORKING)"
 <3517159+mtfriesen@users.noreply.github.com>
Date: Mon, 30 Sep 2024 11:08:29 -0400
Subject: [PATCH 1/2] isolate nuget-generated props files into obj dir

---
 vs/windows.undocked.props | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/vs/windows.undocked.props b/vs/windows.undocked.props
index 45a1745..70c17e1 100644
--- a/vs/windows.undocked.props
+++ b/vs/windows.undocked.props
@@ -17,6 +17,9 @@
     <UndockedBuildArm64x Condition="'$(UndockedBuildArm64x)' == '' OR $(ARM64X_DISABLED) == '1'">false</UndockedBuildArm64x>
     <!-- Use the official LKG complier when available -->
     <UseInternalMSUniCrtPackage>true</UseInternalMSUniCrtPackage>
+    <UndockedPlatConfig Condition="'$(UndockedPlatConfig)' == ''">$(Platform)_$(Configuration)</UndockedPlatConfig>
+    <_IntDir>$(UndockedOut)obj\$(UndockedPlatConfig)\$(MSBuildProjectName)\</_IntDir>
+    <MSBuildProjectExtensionsPath Condition="'$(MSBuildProjectExtensionsPath)' == ''">$(_IntDir)</MSBuildProjectExtensionsPath>
   </PropertyGroup>
   <!-- The set of supported user mode configurations (x86,x64,arm,arm64) -->
   <ItemGroup Label="ProjectConfigurations" Condition="'$(UndockedType)' != 'sys'">
@@ -178,8 +181,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <!-- Official Windows compiler and linker settings -->
   <PropertyGroup>
-    <UndockedPlatConfig>$(Platform)_$(Configuration)</UndockedPlatConfig>
-    <IntDir>$(UndockedOut)obj\$(UndockedPlatConfig)\$(ProjectName)\</IntDir>
+    <IntDir>$(_IntDir)</IntDir>
     <OutDir>$(UndockedOut)bin\$(UndockedPlatConfig)\</OutDir>
     <UseDebugLibraries Condition="'$(Configuration)'=='Debug'">true</UseDebugLibraries>
     <UseDebugLibraries Condition="'$(Configuration)'=='Release'">false</UseDebugLibraries>

From eecc3b0f57afb31bca3fac3bc38a356c02df86f3 Mon Sep 17 00:00:00 2001
From: "Michael Friesen (NETWORKING)"
 <3517159+mtfriesen@users.noreply.github.com>
Date: Mon, 30 Sep 2024 12:57:21 -0400
Subject: [PATCH 2/2] relocate below explicit platform def

---
 vs/windows.undocked.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vs/windows.undocked.props b/vs/windows.undocked.props
index 70c17e1..9546ed1 100644
--- a/vs/windows.undocked.props
+++ b/vs/windows.undocked.props
@@ -17,9 +17,6 @@
     <UndockedBuildArm64x Condition="'$(UndockedBuildArm64x)' == '' OR $(ARM64X_DISABLED) == '1'">false</UndockedBuildArm64x>
     <!-- Use the official LKG complier when available -->
     <UseInternalMSUniCrtPackage>true</UseInternalMSUniCrtPackage>
-    <UndockedPlatConfig Condition="'$(UndockedPlatConfig)' == ''">$(Platform)_$(Configuration)</UndockedPlatConfig>
-    <_IntDir>$(UndockedOut)obj\$(UndockedPlatConfig)\$(MSBuildProjectName)\</_IntDir>
-    <MSBuildProjectExtensionsPath Condition="'$(MSBuildProjectExtensionsPath)' == ''">$(_IntDir)</MSBuildProjectExtensionsPath>
   </PropertyGroup>
   <!-- The set of supported user mode configurations (x86,x64,arm,arm64) -->
   <ItemGroup Label="ProjectConfigurations" Condition="'$(UndockedType)' != 'sys'">
@@ -105,6 +102,9 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
     <Keyword>Win32Proj</Keyword>
+    <UndockedPlatConfig Condition="'$(UndockedPlatConfig)' == ''">$(Platform)_$(Configuration)</UndockedPlatConfig>
+    <_IntDir>$(UndockedOut)obj\$(UndockedPlatConfig)\$(MSBuildProjectName)\</_IntDir>
+    <MSBuildProjectExtensionsPath Condition="'$(MSBuildProjectExtensionsPath)' == ''">$(_IntDir)</MSBuildProjectExtensionsPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(UndockedUseDriverToolset)' == 'false'">
     <PlatformToolset>v143</PlatformToolset>