Commitb64c645

authored

Use NormalizeDirectory instead of Path.Combine for PackagedShimOutputDirectory (#49858)

1 parent45a7a38 commitb64c645Copy full SHA for b64c645

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ NOTE: This file is imported from the following contexts, so be aware when writin`
`295`	`295`	`ApphostsForShimRuntimeIdentifiers="@(_ApphostsForShimRuntimeIdentifiers)"`
`296`	`296`	`IntermediateAssembly="@(IntermediateAssembly->'%(FullPath)')"`
`297`	`297`	`OutputType="$(OutputType)"`
`298`		`-PackagedShimOutputDirectory="$([System.IO.Path]::Combine($(PackagedShimOutputRootDirectory), 'shims', $(_ToolPackShortTargetFrameworkName)))"`
	`298`	`+PackagedShimOutputDirectory="$([MSBuild]::NormalizeDirectory($(PackagedShimOutputRootDirectory), 'shims', $(_ToolPackShortTargetFrameworkName)))"`
`299`	`299`	`PackageId="$(PackageId)"`
`300`	`300`	`PackageVersion="$(PackageVersion)"`
`301`	`301`	`ShimRuntimeIdentifiers="@(_PackAsToolShimRuntimeIdentifiers)"`
`@@ -324,7 +324,7 @@ NOTE: This file is imported from the following contexts, so be aware when writin`
`324`	`324`
`325`	`325`	`<TargetName="_ComputeExpectedEmbeddedApphostPaths">`
`326`	`326`	`<GetEmbeddedApphostPaths`
`327`		`-PackagedShimOutputDirectory="$([System.IO.Path]::Combine($(PackagedShimOutputRootDirectory), 'shims', $(_ToolPackShortTargetFrameworkName)))"`
	`327`	`+PackagedShimOutputDirectory="$([MSBuild]::NormalizeDirectory($(PackagedShimOutputRootDirectory), 'shims', $(_ToolPackShortTargetFrameworkName)))"`
`328`	`328`	`ShimRuntimeIdentifiers="@(_PackAsToolShimRuntimeIdentifiers)"`
`329`	`329`	`ToolCommandName="$(ToolCommandName)">`
`330`	`330`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1289,7 +1289,7 @@ Copyright (c) .NET Foundation. All rights reserved.`
`1289`	`1289`	`</ItemGroup>`
`1290`	`1290`
`1291`	`1291`	`<GetEmbeddedApphostPaths`
`1292`		`-PackagedShimOutputDirectory="$([System.IO.Path]::Combine($(PackagedShimOutputRootDirectory), 'shims', $(TargetFramework)))"`
	`1292`	`+PackagedShimOutputDirectory="$([MSBuild]::NormalizeDirectory($(PackagedShimOutputRootDirectory), 'shims', $(TargetFramework)))"`
`1293`	`1293`	`ShimRuntimeIdentifiers="@(_PackAsToolShimRuntimeIdentifiers)"`
`1294`	`1294`	`ToolCommandName="$(ToolCommandName)"`
`1295`	`1295`	`>`

Comments

(0)