Skip to content

Commit d9c0bed

Browse files
authored
Use NormalizeDirectory consistently in SiteExtensions D.B.P (#61455)
* Use NormalizeDirectory consistently in SiteExtensions D.B.P * Refactor MSBuild property definitions
1 parent 590619a commit d9c0bed

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Diff for: src/SiteExtensions/Directory.Build.props

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
33

44
<PropertyGroup>
5-
<MicrosoftWebXdtExtensionsPath>$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
6-
<MicrosoftWebXdtExtensionsPath Condition="'$(DotNetBuildPass)' == '2'">$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(TargetArchitecture)\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
5+
<MicrosoftWebXdtExtensionsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(Configuration)', 'net462'))</MicrosoftWebXdtExtensionsDir>
6+
<MicrosoftWebXdtExtensionsDir Condition="'$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(TargetArchitecture)', '$(Configuration)', 'net462'))</MicrosoftWebXdtExtensionsDir>
7+
<MicrosoftWebXdtExtensionsPath>$(MicrosoftWebXdtExtensionsDir)Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
78
<BaseIntermediateOutputPath Condition="'$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetArchitecture)'))</BaseIntermediateOutputPath>
8-
<IntermediateOutputPath Condition="'$(PlatformName)' == 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
9-
<IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\</IntermediateOutputPath>
9+
<IntermediateOutputPath Condition="'$(PlatformName)' == 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(Configuration)'))</IntermediateOutputPath>
10+
<IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(PlatformName)', '$(Configuration)'))</IntermediateOutputPath>
1011
</PropertyGroup>
1112

12-
</Project>
13+
</Project>

0 commit comments

Comments
 (0)