Skip to content

Commit fbfbf5f

Browse files
committed
!fixup! Normalize paths for Helix
- use `$(ArtifactsShippingPackagesDir)` in Helix.targets - use `[MSBuild]::NormalizeDirectory(...)` and `$([System.IO.Path]::Combine(...)` in helix.proj
1 parent edfd9e6 commit fbfbf5f

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

eng/helix/helix.proj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
<DotNetCliChannel>Current</DotNetCliChannel>
3636

3737
<!-- Similar to ProjectLayout.props in the Arcade SDK. The Helix SDK contains nothing similar. -->
38-
<OutputPath Condition=" '$(OutputPath)' == '' ">$(RepoRoot)artifacts\bin\$(MSBuildProjectName)\</OutputPath>
38+
<OutputPath Condition=" '$(OutputPath)' == '' "
39+
>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', '$(MSBuildProjectName)'))</OutputPath>
3940
</PropertyGroup>
4041

4142
<!-- Specify the .NET runtime we need which will be included as a correlation payload. -->
@@ -97,10 +98,10 @@
9798

9899
<PropertyGroup>
99100
<SharedFxVersion>@(_ResolvedProductVersionInfo->'%(PackageVersion)')</SharedFxVersion>
100-
<_AppRefSubPath>packs\Microsoft.AspNetCore.App.Ref\$(SharedFxVersion)</_AppRefSubPath>
101-
<_AppRuntimeSubPath>shared\Microsoft.AspNetCore.App\$(SharedFxVersion)</_AppRuntimeSubPath>
102-
<_AppRefPath>$(RepoRoot).dotnet\$(_AppRefSubPath)</_AppRefPath>
103-
<_AppRuntimePath>$(RepoRoot).dotnet\$(_AppRuntimeSubPath)</_AppRuntimePath>
101+
<_AppRefSubPath>$([System.IO.Path]::Combine('packs', 'Microsoft.AspNetCore.App.Ref', '$(SharedFxVersion)'))</_AppRefSubPath>
102+
<_AppRuntimeSubPath>$([System.IO.Path]::Combine('shared', 'Microsoft.AspNetCore.App', '$(SharedFxVersion)'))</_AppRuntimeSubPath>
103+
<_AppRefPath>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', '.dotnet', '$(_AppRefSubPath)'))</_AppRefPath>
104+
<_AppRuntimePath>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', '.dotnet', '$(_AppRuntimeSubPath)'))</_AppRuntimePath>
104105

105106
<!--
106107
Don't bother checking for App.Runtime layout because we want both and App.Ref project depends on the

eng/targets/Helix.targets

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,10 @@
6060
-->
6161
<ItemGroup>
6262
<!-- Grab all shipping packages. -->
63-
<HelixContent
64-
Include="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\*$(SharedFxVersion).nupkg"
63+
<HelixContent Include="$(ArtifactsShippingPackagesDir)*$(SharedFxVersion).nupkg"
6564
Condition=" $(TestDependsOnAspNetPackages) "/>
6665
<!-- Grab just the App.Ref and App.Runtime packages. -->
67-
<HelixContent
68-
Include="$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.*$(SharedFxVersion).nupkg"
66+
<HelixContent Include="$(ArtifactsShippingPackagesDir)Microsoft.AspNetCore.App.*$(SharedFxVersion).nupkg"
6967
Condition=" $(TestDependsOnAspNetAppPackages) "/>
7068
</ItemGroup>
7169

0 commit comments

Comments
 (0)