Skip to content

Commit bcb4f55

Browse files
authored
Merge pull request #4206 from samtrion/main
Normalization of GitVersionTargetFramework and fallback scenario
2 parents d2954bc + b389378 commit bcb4f55

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
<UpdateAssemblyInfo Condition=" '$(UpdateAssemblyInfo)' == 'true' And '$(GenerateGitVersionFiles)' == 'true' ">true</UpdateAssemblyInfo>
99
<GenerateGitVersionInformation Condition=" '$(GenerateGitVersionInformation)' == '' And '$(GenerateGitVersionFiles)' == 'true' ">true</GenerateGitVersionInformation>
1010

11-
<GitVersionTargetFramework Condition="'$(GitVersionTargetFramework)' == ''">$(TargetFramework)</GitVersionTargetFramework>
11+
<!-- Validates the target framework and sets the GitVersionTargetFramework property to the target framework that is compatible with the target framework of the project -->
12+
<GitVersionTargetFramework Condition="'$(GitVersionTargetFramework)' == '' and $([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net8.0')) == 'true'">net8.0</GitVersionTargetFramework>
13+
<GitVersionTargetFramework Condition="'$(GitVersionTargetFramework)' == '' and $([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net6.0')) == 'true'">net6.0</GitVersionTargetFramework>
14+
<!-- Fall back to net8.0 if the target framework is not compatible with net6.0 and net8.0 -->
15+
<GitVersionTargetFramework Condition="'$(GitVersionTargetFramework)' == ''">net8.0</GitVersionTargetFramework>
1216
<GitVersionFileExe Condition="'$(GitVersionFileExe)' == ''">dotnet --roll-forward Major &quot;$([MSBuild]::EnsureTrailingSlash($(MSBuildThisFileDirectory)$(GitVersionTargetFramework)))gitversion.dll&quot;</GitVersionFileExe>
1317
<GitVersionAssemblyFile Condition="'$(GitVersionAssemblyFile)' == ''">$([MSBuild]::EnsureTrailingSlash($(MSBuildThisFileDirectory)$(GitVersionTargetFramework)))GitVersion.MsBuild.dll</GitVersionAssemblyFile>
1418
</PropertyGroup>

0 commit comments

Comments
 (0)