Replaced nuspec with csproj

Artees · Aug 19, 2018 · c060c78 · c060c78
1 parent 965288b
commit c060c78
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 34 deletions.
diff --git a/DocCover/Artees/Tools/DocCover/Program.cs b/DocCover/Artees/Tools/DocCover/Program.cs
@@ -50,7 +50,8 @@ private static void Fail(IEnumerable<Error> errors)
         {
             foreach (var error in errors)
             {
-                if (error.Tag == ErrorType.HelpRequestedError) continue;
+                if (error.Tag == ErrorType.HelpRequestedError ||
+                    error.Tag == ErrorType.VersionRequestedError) continue;
                 ShouldAssertions.Fail(error.ToString());
             }
         }
@@ -95,7 +96,6 @@ private class Options
             public string StyleValue { private get; set; }
 
             public string Style => StyleOption ?? StyleValue ?? "flat";
-            // ReSharper restore UnusedAutoPropertyAccessor.Local, MemberCanBePrivate.Local
         }
     }
 }
diff --git a/DocCover/DocCover.csproj b/DocCover/DocCover.csproj
@@ -1,4 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <Version>1.1.2</Version>
+        <Authors>Artees</Authors>
+        <Description>A .NET Core application that calculates the percentage of public members and
+            types in your .NET assembly that have XML comments.
+        </Description>
+        <Copyright>Copyright © Artees 2018</Copyright>
+        <PackageTags>xml;documentation;comments</PackageTags>
+        <PackageReleaseNotes>Fixed version requested error.</PackageReleaseNotes>
+        <PackageIconUrl>https://artees.games/img/icon.png</PackageIconUrl>
+        <PackageProjectUrl>https://github.com/Artees/DocCover</PackageProjectUrl>
+        <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
+        <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+        <RepositoryType>git</RepositoryType>
+        <RepositoryUrl>https://github.com/Artees/DocCover</RepositoryUrl>
+        <IsTool>true</IsTool>
+    </PropertyGroup>
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -28,19 +45,20 @@
         <Content Include="..\README.md" Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
             <Link>README.md</Link>
         </Content>
-        <Content Include="MemberTemplate.html">
+        <Content Include="MemberTemplate.html" PackagePath="tools/MemberTemplate.html">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         <None Remove="report.css"/>
-        <Content Include="report.css">
+        <Content Include="report.css" PackagePath="tools/report.css">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         <None Remove="ReportTemplate.html"/>
-        <Content Include="ReportTemplate.html">
+        <Content Include="ReportTemplate.html" PackagePath="tools/ReportTemplate.html">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
+        <Content Include="$(OutputPath)/*.dll" PackagePath="tools"/>
+        <Content Include="$(OutputPath)/*.json" PackagePath="tools"/>
         <None Remove="DocCover.nuspec"/>
-        <Content Include="DocCover.nuspec" Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "/>
         <None Remove="PackNuGet.bat"/>
         <Content Include="PackNuGet.bat" Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "/>
         <None Remove="PushNuGet.bat"/>

diff --git a/DocCover/DocCover.nuspec b/DocCover/DocCover.nuspec
diff --git a/DocCover/PackNuGet.bat b/DocCover/PackNuGet.bat
@@ -1,3 +1,3 @@
 cd /D "%~dp0"
-msbuild DocCover.csproj /t:rebuild /verbosity:quiet /p:Configuration=Pack
-msbuild -t:Pack DocCover.csproj -p:NuspecFile=DocCover.nuspec -p:PackageOutputPath=..\..\..\LocalNuGet -p:Configuration=Pack -p:IsTool=true
+msbuild DocCover.csproj -t:rebuild -verbosity:quiet -p:Configuration=Pack
+msbuild -t:Pack DocCover.csproj -p:PackageOutputPath=..\..\..\LocalNuGet -p:Configuration=Pack
diff --git a/DocCover/PushNuGet.bat b/DocCover/PushNuGet.bat
@@ -1,3 +1,3 @@
 cd /D "%~dp0"
 cd ..\..\..\LocalNuGet
-nuget push DocCover.1.1.1.nupkg -Source https://api.nuget.org/v3/index.json
+nuget push DocCover.1.1.2.nupkg -Source https://api.nuget.org/v3/index.json
diff --git a/report_example/index.html b/report_example/index.html
@@ -12,7 +12,7 @@ <h1>Summary</h1>
         <table class="overview table-fixed">
             <tr>
                 <th>Generated on:</th>
-                <td>2018-08-18 17:22:36</td>
+                <td>2018-08-19 13:58:51</td>
             </tr>
             <tr>
                 <th>Documented public members and types:</th>
@@ -35,7 +35,7 @@ <h1>Undocumented public members and types</h1>
     <td>T:DocCoverTestAssembly.PublicNotСoveredClass</td>
 </tr>
         </table>
-        <div class="footer">Generated by: DocCover 1.0.0.0<br/>2018-08-18 17:22:36<br/><a
+        <div class="footer">Generated by: DocCover 1.1.2.0<br/>2018-08-19 13:58:51<br/><a
                 href="https://github.com/Artees/DocCover">GitHub</a> | <a
                 href="http://artees.games/">www.artees.games</a></div>
     </div>