Skip to content

Commit fed5dc2

Browse files
committed
fix GitVersion.MsBuild packaging
1 parent 11613ea commit fed5dc2

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
<GitVersionAssemblyFile>$(MSBuildThisFileDirectory)netcoreapp3.1/GitVersion.MsBuild.dll</GitVersionAssemblyFile>
2727
</PropertyGroup>
2828

29+
<PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
30+
<GitVersionFileExe>dotnet $(MSBuildThisFileDirectory)net5.0/gitversion.dll</GitVersionFileExe>
31+
<GitVersionAssemblyFile>$(MSBuildThisFileDirectory)net5.0/GitVersion.MsBuild.dll</GitVersionAssemblyFile>
32+
</PropertyGroup>
33+
2934
<PropertyGroup>
3035
<DisableGitVersionTask Condition=" '$(DisableGitVersionTask)' == '' ">false</DisableGitVersionTask>
3136

src/GitVersion.MsBuild/nuget-files.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
<PropertyGroup>
44
<PublishTask_net48>../GitVersionExe/bin/$(Configuration)/net48</PublishTask_net48>
55
<PublishTask_netcore31>../GitVersionExe/bin/$(Configuration)/netcoreapp3.1/publish</PublishTask_netcore31>
6+
<PublishTask_net50>../GitVersionExe/bin/$(Configuration)/net5.0/publish</PublishTask_net50>
67
<Target_net48>tools/net48</Target_net48>
78
<Target_netcore31>tools/netcoreapp3.1</Target_netcore31>
9+
<Target_net50>tools/net5.0</Target_net50>
810
</PropertyGroup>
911
<ItemGroup Condition="$(IsPackaging) != ''">
1012
<None Include="msbuild/tools/*.*" Pack="true" PackagePath="tools" />
@@ -13,8 +15,10 @@
1315

1416
<None Include="$(PublishTask_net48)/**/*" Pack="true" PackagePath="$(Target_net48)" />
1517
<None Include="$(PublishTask_netcore31)/**/*" Pack="true" PackagePath="$(Target_netcore31)" />
18+
<None Include="$(PublishTask_net50)/**/*" Pack="true" PackagePath="$(Target_net50)" />
1619

1720
<None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net48)" />
1821
<None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_netcore31)" />
22+
<None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net50)" />
1923
</ItemGroup>
2024
</Project>

0 commit comments

Comments
 (0)