Merge branch 'v3.0'

dotnet · Jan 15, 2020 · a7d04e1 · a7d04e1
2 parents 35b087b + 054cb7f
commit a7d04e1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.2.402"
+    "version": "3.1.100"
   }
 }
diff --git a/src/Cake.GitVersioning/Cake.GitVersioning.csproj b/src/Cake.GitVersioning/Cake.GitVersioning.csproj
@@ -10,8 +10,8 @@
     <Copyright>Copyright © Andrew Arnott</Copyright>
     <PackageTags>git commit versioning version assemblyinfo</PackageTags>
     <PackageIconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png</PackageIconUrl>
+    <PackageIcon>cake-contrib-medium.png</PackageIcon>
     <PackageProjectUrl>http://github.com/aarnott/Nerdbank.GitVersioning</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <SignAssembly>false</SignAssembly>
     <!-- We include the whole OutputPath in this tools package. -->
     <IncludeBuildOutput>false</IncludeBuildOutput>
@@ -34,6 +34,10 @@
     <PackageReference Include="Nerdbank.GitVersioning.LKG" Version="1.6.20-beta-gfea83a8c9e" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="cake-contrib-medium.png" Pack="true" PackagePath="" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\NerdBank.GitVersioning\NerdBank.GitVersioning.csproj" />
   </ItemGroup>

diff --git a/src/Cake.GitVersioning/cake-contrib-medium.png b/src/Cake.GitVersioning/cake-contrib-medium.png
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -13,6 +13,7 @@
     <owners>aarnott</owners>
     <PackageTags>git commit versioning version assemblyinfo</PackageTags>
     <PackageProjectUrl>https://github.com/aarnott/Nerdbank.GitVersioning</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
 
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>