Skip to content

Commit 360998b

Browse files
committed
Override tool runtime for own CI builds
1 parent ce34ba1 commit 360998b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/TurnerSoftware.BuildVersioning.Tool/TurnerSoftware.BuildVersioning.Tool.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
</PropertyGroup>
1919

2020
<PropertyGroup>
21+
<_BuildVersioningToolRuntime>$(TargetFramework)</_BuildVersioningToolRuntime>
2122
<BuildVersioningToolBasePath>$(MSBuildThisFileDirectory)bin/$(Configuration)</BuildVersioningToolBasePath>
2223
<SelfHostedBuildVersioning Condition="$(DesignTimeBuild) != 'true' AND $(SkipBuildVersioning) != 'true'">true</SelfHostedBuildVersioning>
2324
</PropertyGroup>

src/TurnerSoftware.BuildVersioning/build/TurnerSoftware.BuildVersioning.targets

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
<_BuildVersioningMessagePrefix>Build Versioning ($(BuildVersioningProjectReference))</_BuildVersioningMessagePrefix>
2626
</PropertyGroup>
2727

28-
<Target Name="DetectBuildVersioningToolRuntime" Condition="$(_BuildVersioningToolRuntime) == ''" BeforeTargets="BeforeBuild">
29-
<Exec Command="dotnet --info" ConsoleToMSBuild="true" StandardOutputImportance="Low" ContinueOnError="true">
28+
<Target Name="DetectBuildVersioningToolRuntime" BeforeTargets="BeforeBuild">
29+
<Exec Condition="$(_BuildVersioningToolRuntime) == ''" Command="dotnet --info" ConsoleToMSBuild="true" StandardOutputImportance="Low" ContinueOnError="true">
3030
<Output TaskParameter="ConsoleOutput" PropertyName="_DotnetInfo" />
3131
</Exec>
32-
<PropertyGroup>
32+
<PropertyGroup Condition="$(_DotnetInfo) != ''">
3333
<_BuildVersioningToolRuntime Condition="$(_DotnetInfo.Contains(&quot;NETCore.App 5.0&quot;))">net5.0</_BuildVersioningToolRuntime>
3434
<_BuildVersioningToolRuntime Condition="$(_DotnetInfo.Contains(&quot;NETCore.App 6.0&quot;))">net6.0</_BuildVersioningToolRuntime>
3535
</PropertyGroup>

0 commit comments

Comments
 (0)