nuspec update, rework packaging GitVersionTask

Author: arturcic

build/pack.cake

@@ -138,10 +138,11 @@ Task("Pack-Nuget")
     };
 
     // GitVersionTask, & global tool
-    DotNetCorePack("./src/GitVersionTask", settings);
-
     settings.ArgumentCustomization = arg => arg.Append("/p:PackAsTool=true");
     DotNetCorePack("./src/GitVersionExe/GitVersionExe.csproj", settings);
+
+    settings.ArgumentCustomization = null;
+    DotNetCorePack("./src/GitVersionTask", settings);
 });
 
 Task("Pack-Chocolatey")

nuspec/GitVersion.CommandLine.nuspec

@@ -7,11 +7,11 @@
     <authors>GitTools and Contributors</authors>
     <owners>GitTools and Contributors</owners>
     <license type="expression">MIT</license>
+    <copyright>Copyright GitTools 2020.</copyright>
     <projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
     <iconUrl>https://raw.githubusercontent.com/GitTools/graphics/master/GitVersion/icon_100x100.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Derives SemVer information from a repository following GitFlow or GitHubFlow.</description>
-    <language>en-AU</language>
     <tags>Git Versioning GitVersion GitFlowVersion GitFlow GitHubFlow SemVer</tags>
     <developmentDependency>true</developmentDependency>
     <releaseNotes>https://github.com/GitTools/GitVersion/releases</releaseNotes>

nuspec/GitVersion.Portable.nuspec

@@ -6,12 +6,12 @@
     <title>GitVersion</title>
     <authors>GitTools and Contributors</authors>
     <owners>GitTools and Contributors</owners>
+    <copyright>Copyright GitTools 2020.</copyright>
     <licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
     <projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
     <iconUrl>https://raw.githubusercontent.com/GitTools/graphics/master/GitVersion/icon_100x100.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Derives SemVer information from a repository following GitFlow or GitHubFlow.</description>
-    <language>en-AU</language>
     <tags>Git Versioning GitVersion GitFlowVersion GitFlow GitHubFlow SemVer</tags>
     <releaseNotes>https://github.com/GitTools/GitVersion/releases</releaseNotes>
   </metadata>

src/Directory.Build.props

@@ -6,7 +6,7 @@
         <PackageProjectUrl>https://github.com/GitTools/GitVersion</PackageProjectUrl>
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
         <PackageTags>Git;Versioning;GitVersion;GitFlowVersion;GitFlow;GitHubFlow;SemVer</PackageTags>
-        <Copyright>Copyright GitTools 2019.</Copyright>
+        <Copyright>Copyright GitTools 2020.</Copyright>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageIcon>package_icon.png</PackageIcon>
         <PackageReleaseNotes>https://github.com/GitTools/GitVersion/releases</PackageReleaseNotes>

src/GitVersionTask/GitVersionTask.csproj

@@ -13,15 +13,8 @@
         <LangVersion>8.0</LangVersion>
     </PropertyGroup>
 
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1" PrivateAssets="All" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1" />
-    </ItemGroup>
-
     <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" PrivateAssets="All" />
         <PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" PrivateAssets="All" />
     </ItemGroup>
 

src/GitVersionTask/nuget-files.props

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <FullPublish>bin/$(Configuration)/net472</FullPublish>
-        <CorePublish>bin/$(Configuration)/netcoreapp2.1/publish</CorePublish>
+        <RootPublish>../GitVersionExe</RootPublish>
+        <FullPublish>$(RootPublish)/bin/$(Configuration)/net472</FullPublish>
+        <CorePublish>$(RootPublish)/bin/$(Configuration)/netcoreapp2.1/publish</CorePublish>
+        <FullPublishTask>bin/$(Configuration)/net472</FullPublishTask>
+        <CorePublishTask>bin/$(Configuration)/netcoreapp2.1/publish</CorePublishTask>
         <FullTarget>tools/net472</FullTarget>
         <CoreTarget>tools/netstandard2.0</CoreTarget>
     </PropertyGroup>
@@ -15,7 +18,7 @@
         <None Include="$(CorePublish)/runtimes/win-x86/native/*.dll" Pack="true" PackagePath="$(CoreTarget)/runtimes/win-x86/native" />
         <None Include="$(CorePublish)/runtimes/win-x64/native/*.dll" Pack="true" PackagePath="$(CoreTarget)/runtimes/win-x64/native" />
 
-        <None Include="$(CorePublish)/GitVersion*"                   Pack="true" PackagePath="$(CoreTarget)" />
+        <None Include="$(CorePublishTask)/GitVersion*"               Pack="true" PackagePath="$(CoreTarget)" />
         <None Include="$(CorePublish)/LibGit2Sharp.dll"              Pack="true" PackagePath="$(CoreTarget)" />
         <None Include="$(CorePublish)/YamlDotNet.dll"                Pack="true" PackagePath="$(CoreTarget)" />
         <None Include="$(CorePublish)/Microsoft.Extensions*"         Pack="true" PackagePath="$(CoreTarget)" />
@@ -24,7 +27,7 @@
         <None Include="$(FullPublish)/lib/osx/*.dylib"               Pack="true" PackagePath="$(FullTarget)/lib/osx" />
         <None Include="$(FullPublish)/lib/win32/**/*.dll"            Pack="true" PackagePath="$(FullTarget)/lib/win32" />
 
-        <None Include="$(FullPublish)/GitVersion*"                   Pack="true" PackagePath="$(FullTarget)" />
+        <None Include="$(FullPublishTask)/GitVersion*"               Pack="true" PackagePath="$(FullTarget)" />
         <None Include="$(FullPublish)/LibGit2Sharp.*"                Pack="true" PackagePath="$(FullTarget)" />
         <None Include="$(FullPublish)/YamlDotNet.dll"                Pack="true" PackagePath="$(FullTarget)" />
         <None Include="$(FullPublish)/Microsoft.Extensions*"         Pack="true" PackagePath="$(FullTarget)" />