split GitVersion.MsBuild properties for .net full and core

Author: arturcic

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

@@ -4,12 +4,6 @@
     <PropertyGroup>
         <GitVersionOutputFile>$(MSBuildProjectDirectory)/gitversion.json</GitVersionOutputFile>
 
-        <GitVersionFileExe Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)net48/gitversion.exe</GitVersionFileExe>
-        <GitVersionFileExe Condition="'$(MSBuildRuntimeType)' == 'Core'">dotnet $(MSBuildThisFileDirectory)netstandard2.0/gitversion.dll</GitVersionFileExe>
-
-        <GitVersionAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)net48/GitVersion.MsBuild.dll</GitVersionAssemblyFile>
-        <GitVersionAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)netstandard2.0/GitVersion.MsBuild.dll</GitVersionAssemblyFile>
-
         <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)/../</SolutionDir>
         <GitVersionPath Condition="'$(GitVersionPath)' == '' And '$(GitVersionUseSolutionDir)' == 'true'">$(SolutionDir)</GitVersionPath>
         <GitVersionPath Condition="'$(GitVersionPath)' == ''">$(MSBuildProjectDirectory)</GitVersionPath>
@@ -22,6 +16,16 @@
         <GitVersion_ToolArgments Condition=" '$(GitVersion_NoNormalizeEnabled)' == 'true' ">$(GitVersion_ToolArgments) -nonormalize</GitVersion_ToolArgments>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(MSBuildRuntimeType)' == 'Full'">
+        <GitVersionFileExe>$(MSBuildThisFileDirectory)net48/gitversion.exe</GitVersionFileExe>
+        <GitVersionAssemblyFile>$(MSBuildThisFileDirectory)net48/GitVersion.MsBuild.dll</GitVersionAssemblyFile>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+        <GitVersionFileExe>dotnet $(MSBuildThisFileDirectory)netcoreapp3.1/gitversion.dll</GitVersionFileExe>
+        <GitVersionAssemblyFile>$(MSBuildThisFileDirectory)netcoreapp3.1/GitVersion.MsBuild.dll</GitVersionAssemblyFile>
+    </PropertyGroup>
+
     <PropertyGroup>
         <DisableGitVersionTask Condition=" '$(DisableGitVersionTask)' == '' ">false</DisableGitVersionTask>
 
@@ -52,7 +56,7 @@
 
         <GenerateGitVersionWixDefines Condition=" '$(DisableGitVersionTask)' == 'true' ">false</GenerateGitVersionWixDefines>
         <GenerateGitVersionWixDefines Condition=" '$(GenerateGitVersionWixDefines)' == '' ">true</GenerateGitVersionWixDefines>
-        
+
         <!-- Property that enables setting of Version -->
         <UpdateVersionProperties Condition=" '$(DisableGitVersionTask)' == 'true' ">false</UpdateVersionProperties>
         <UpdateVersionProperties Condition=" '$(UpdateVersionProperties)' == '' ">true</UpdateVersionProperties>

src/GitVersion.MsBuild/nuget-files.props

@@ -4,18 +4,16 @@
         <FullPublishTask>../GitVersionExe/bin/$(Configuration)/net48</FullPublishTask>
         <CorePublishTask>../GitVersionExe/bin/$(Configuration)/netcoreapp3.1/publish</CorePublishTask>
         <FullTarget>tools/net48</FullTarget>
-        <CoreTarget>tools/netstandard2.0</CoreTarget>
+        <CoreTarget>tools/netcoreapp3.1</CoreTarget>
     </PropertyGroup>
     <ItemGroup>
-        <None Include="msbuild/tools/*.*"                Pack="true" PackagePath="tools" />
-        <None Include="msbuild/build/*.*"                Pack="true" PackagePath="build" />
-        <None Include="msbuild/buildMultiTargeting/*.*"  Pack="true" PackagePath="buildMultiTargeting" />
-
-        <None Include="$(CorePublishTask)/**/*"  Pack="true" PackagePath="$(CoreTarget)" />
-        <None Include="$(FullPublishTask)/**/*"  Pack="true" PackagePath="$(FullTarget)" />
-
-        <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.dll"  Pack="true" PackagePath="$(FullTarget)" />
-        <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.dll"  Pack="true" PackagePath="$(CoreTarget)" />
+        <None Include="msbuild/tools/*.*"                                        Pack="true" PackagePath="tools" />
+        <None Include="msbuild/build/*.*"                                        Pack="true" PackagePath="build" />
+        <None Include="msbuild/buildMultiTargeting/*.*"                          Pack="true" PackagePath="buildMultiTargeting" />
 
+        <None Include="$(CorePublishTask)/**/*"                                  Pack="true" PackagePath="$(CoreTarget)" />
+        <None Include="$(FullPublishTask)/**/*"                                  Pack="true" PackagePath="$(FullTarget)" />
+        <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(FullTarget)" />
+        <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(CoreTarget)" />
     </ItemGroup>
 </Project>