Fix NuGet packaging

ecoAPM · Nov 10, 2019 · 19556d7 · 19556d7
1 parent 147b673
commit 19556d7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/src/LibYear.Lib/LibYear.Lib.csproj b/src/LibYear.Lib/LibYear.Lib.csproj
@@ -9,10 +9,19 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>libyear-lib</PackageId>
     <Description>Library portion of libyear, for consumption by other applications</Description>
+    <PackageLicenseExpression></PackageLicenseExpression>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="NuGet.Protocol.Core.v3" Version="4.2.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/src/LibYear/LibYear.App.csproj b/src/LibYear/LibYear.App.csproj
@@ -8,11 +8,15 @@
     <Company>Steve Desmond Software Development</Company>
     <Description>Display projects' dependencies and their outdatedness</Description>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>3.0.0-rc1</Version>
+    <PackAsTool>true</PackAsTool>
+    <ToolCommandName>dotnet-libyear</ToolCommandName>
+    <Version>3.0.0-rc2</Version>
     <PackageId>libyear</PackageId>
     <Product>libyear</Product>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
+    <PackageLicenseExpression></PackageLicenseExpression>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -28,4 +32,11 @@
     <ProjectReference Include="..\LibYear.Lib\LibYear.Lib.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/src/LibYear/Runner.cs b/src/LibYear/Runner.cs
@@ -70,9 +70,10 @@ private string GetAllResultsTables(IDictionary<IProjectFile, IEnumerable<Result>
             if (!allResults.Any())
                 return string.Empty;
 
-            var namePad = Math.Max("Package".Length, allResults.Max(results => results.Value.Any() ? results.Value.Max(r => r.Name.Length) : 0));
-            var installedPad = Math.Max("Installed".Length, allResults.Max(results => results.Value.Any() ? results.Value.Max(r => r.Installed?.Version.ToString().Length ?? 0) : 0));
-            var latestPad = Math.Max("Latest".Length, allResults.Max(results => results.Value.Any() ? results.Value.Max(r => r.Latest?.Version.ToString().Length ?? 0) : 0));
+            int MaxLength(Func<Result, int> field) => allResults.Max(results => results.Value.Any() ? results.Value.Max(field) : 0);
+            var namePad = Math.Max("Package".Length, MaxLength(r => r.Name.Length));
+            var installedPad = Math.Max("Installed".Length, MaxLength(r => r.Installed?.Version.ToString().Length ?? 0));
+            var latestPad = Math.Max("Latest".Length, MaxLength(r => r.Latest?.Version.ToString().Length ?? 0));
 
             var msg = new StringBuilder();
             foreach (var results in allResults)