From 83a0366b6070764d3c456ac3eacc8e149536defc Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Fri, 11 Apr 2025 09:24:45 -0700
Subject: [PATCH 1/3] Use NormalizeDirectory consistently in SiteExtensions
 D.B.P

---
 src/SiteExtensions/Directory.Build.props | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/SiteExtensions/Directory.Build.props b/src/SiteExtensions/Directory.Build.props
index 5a0a6b0be0a2..eba83a13d99c 100644
--- a/src/SiteExtensions/Directory.Build.props
+++ b/src/SiteExtensions/Directory.Build.props
@@ -2,11 +2,21 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
-    <MicrosoftWebXdtExtensionsPath>$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
-    <MicrosoftWebXdtExtensionsPath Condition="'$(DotNetBuildPass)' == '2'">$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(TargetArchitecture)\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
-    <BaseIntermediateOutputPath Condition="'$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetArchitecture)'))</BaseIntermediateOutputPath>
-    <IntermediateOutputPath Condition="'$(PlatformName)' == 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
-    <IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\</IntermediateOutputPath>
+    <MicrosoftWebXdtExtensionsPath>
+      $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(Configuration)', 'net462', 'Microsoft.Web.Xdt.Extensions.dll'))
+    </MicrosoftWebXdtExtensionsPath>
+    <MicrosoftWebXdtExtensionsPath Condition="'$(DotNetBuildPass)' == '2'">
+      $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(TargetArchitecture)', '$(Configuration)', 'net462', 'Microsoft.Web.Xdt.Extensions.dll'))
+    </MicrosoftWebXdtExtensionsPath>
+    <BaseIntermediateOutputPath Condition="'$(DotNetBuildPass)' == '2'">
+      $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetArchitecture)'))
+    </BaseIntermediateOutputPath>
+    <IntermediateOutputPath Condition="'$(PlatformName)' == 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">
+      $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(Configuration)'))
+    </IntermediateOutputPath>
+    <IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">
+      $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(PlatformName)', '$(Configuration)'))
+    </IntermediateOutputPath>
   </PropertyGroup>
 
-</Project>
\ No newline at end of file
+</Project>

From d01d7941ec6fd28ca3a146b7417218a8e4c2eb34 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Fri, 11 Apr 2025 09:35:10 -0700
Subject: [PATCH 2/3] Refactor MSBuild property definitions

---
 src/SiteExtensions/Directory.Build.props | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/SiteExtensions/Directory.Build.props b/src/SiteExtensions/Directory.Build.props
index eba83a13d99c..0e70feb40ad0 100644
--- a/src/SiteExtensions/Directory.Build.props
+++ b/src/SiteExtensions/Directory.Build.props
@@ -2,21 +2,11 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
-    <MicrosoftWebXdtExtensionsPath>
-      $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(Configuration)', 'net462', 'Microsoft.Web.Xdt.Extensions.dll'))
-    </MicrosoftWebXdtExtensionsPath>
-    <MicrosoftWebXdtExtensionsPath Condition="'$(DotNetBuildPass)' == '2'">
-      $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(TargetArchitecture)', '$(Configuration)', 'net462', 'Microsoft.Web.Xdt.Extensions.dll'))
-    </MicrosoftWebXdtExtensionsPath>
-    <BaseIntermediateOutputPath Condition="'$(DotNetBuildPass)' == '2'">
-      $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetArchitecture)'))
-    </BaseIntermediateOutputPath>
-    <IntermediateOutputPath Condition="'$(PlatformName)' == 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">
-      $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(Configuration)'))
-    </IntermediateOutputPath>
-    <IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">
-      $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(PlatformName)', '$(Configuration)'))
-    </IntermediateOutputPath>
+    <MicrosoftWebXdtExtensionsPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(Configuration)', 'net462', 'Microsoft.Web.Xdt.Extensions.dll'))</MicrosoftWebXdtExtensionsPath>
+    <MicrosoftWebXdtExtensionsPath Condition="'$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(TargetArchitecture)', '$(Configuration)', 'net462', 'Microsoft.Web.Xdt.Extensions.dll'))</MicrosoftWebXdtExtensionsPath>
+    <BaseIntermediateOutputPath Condition="'$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetArchitecture)'))</BaseIntermediateOutputPath>
+    <IntermediateOutputPath Condition="'$(PlatformName)' == 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(Configuration)'))</IntermediateOutputPath>
+    <IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(PlatformName)', '$(Configuration)'))</IntermediateOutputPath>
   </PropertyGroup>
 
 </Project>

From 4e52d11ea0e3b19fb1faa47a0cdb0baaeeb85aab Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Fri, 11 Apr 2025 10:21:00 -0700
Subject: [PATCH 3/3] Refactor MicrosoftWebXdtExtensionsPath property
 definitions

---
 src/SiteExtensions/Directory.Build.props | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/SiteExtensions/Directory.Build.props b/src/SiteExtensions/Directory.Build.props
index 0e70feb40ad0..8dc226bb2c7a 100644
--- a/src/SiteExtensions/Directory.Build.props
+++ b/src/SiteExtensions/Directory.Build.props
@@ -2,8 +2,9 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
-    <MicrosoftWebXdtExtensionsPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(Configuration)', 'net462', 'Microsoft.Web.Xdt.Extensions.dll'))</MicrosoftWebXdtExtensionsPath>
-    <MicrosoftWebXdtExtensionsPath Condition="'$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(TargetArchitecture)', '$(Configuration)', 'net462', 'Microsoft.Web.Xdt.Extensions.dll'))</MicrosoftWebXdtExtensionsPath>
+    <MicrosoftWebXdtExtensionsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(Configuration)', 'net462'))</MicrosoftWebXdtExtensionsDir>
+    <MicrosoftWebXdtExtensionsDir Condition="'$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(TargetArchitecture)', '$(Configuration)', 'net462'))</MicrosoftWebXdtExtensionsDir>
+    <MicrosoftWebXdtExtensionsPath>$(MicrosoftWebXdtExtensionsDir)Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
     <BaseIntermediateOutputPath Condition="'$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetArchitecture)'))</BaseIntermediateOutputPath>
     <IntermediateOutputPath Condition="'$(PlatformName)' == 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(Configuration)'))</IntermediateOutputPath>
     <IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(PlatformName)', '$(Configuration)'))</IntermediateOutputPath>