Skip to content

Commit 2e20f0e

Browse files
authored
Remove need for passed in "ArcadeSdk" variable in source build (#15834)
Instead of using a passed in variable to determine where arcade lives, use a similar strategy of a few other repos (deployment tools, runtime, diagnostics) of using the parent directory of the tasks assembly, which is a property always available. This can then be used to find the release packages targets. Avoids the need to pass in the arcade SDK location as an env variable for FSharp.
1 parent 9df89d2 commit 2e20f0e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
</PropertyGroup>
2020

2121
<PropertyGroup>
22-
<ArcadeSdkDir Condition="'$(ArcadeSdkDir)' == ''">$(NuGetPackageRoot)microsoft.dotnet.arcade.sdk\$(ArcadeSdkVersion)\</ArcadeSdkDir>
23-
<_BuildReleasePackagesTargets>$(ArcadeSdkDir)tools\BuildReleasePackages.targets</_BuildReleasePackagesTargets>
22+
<_ArcadeSdkMSBuildProjectDir>$([System.IO.Path]::GetDirectoryName('$(ArcadeSdkBuildTasksAssembly)'))\..\</_ArcadeSdkMSBuildProjectDir>
23+
<_BuildReleasePackagesTargets>$(_ArcadeSdkMSBuildProjectDir)BuildReleasePackages.targets</_BuildReleasePackagesTargets>
2424
</PropertyGroup>
2525

2626
<Import Project="$(_BuildReleasePackagesTargets)" />

0 commit comments

Comments
 (0)