Skip to content

Commit 129aec5

Browse files
committed
Fix our overlay to update the redist-installer path as that gets copied right afterthis
1 parent de28e25 commit 129aec5

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/Layout/redist/targets/OverlaySdkOnLKG.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<_DotNetHiveRoot>$(DOTNET_INSTALL_DIR)</_DotNetHiveRoot>
66
<_DotNetHiveRoot Condition="'$(_DotNetHiveRoot)' == ''">$(RepoRoot).dotnet/</_DotNetHiveRoot>
77
<_DotNetHiveRoot Condition="!HasTrailingSlash('$(_DotNetHiveRoot)')">$(_DotNetHiveRoot)/</_DotNetHiveRoot>
8-
<SdkOutputDirectory>$(RedistLayoutPath)sdk\$(Version)</SdkOutputDirectory>
98
</PropertyGroup>
109

1110
<!-- Get stage 0 SDK version without having to duplicate the LKG SDK property between the global.json
@@ -35,7 +34,7 @@
3534
Stage0MicrosoftNETCoreAppRefPackageVersionPath="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/Microsoft.NETCoreSdk.BundledVersions.props"
3635
MicrosoftNETCoreAppRefPackageVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
3736
NewSDKVersion="$(Version)"
38-
OutputPath="$(TestHostDotNetRoot)/sdk/$(Version)/Microsoft.NETCoreSdk.BundledVersions.props"/>
37+
OutputPath="$(RedistInstallerLayoutPath)/sdk/$(Version)/Microsoft.NETCoreSdk.BundledVersions.props"/>
3938

4039
<!-- Copy artifacts to the testhost folder. -->
4140
<Copy DestinationFiles="@(InstallerOutputFile)"

0 commit comments

Comments
 (0)