From b8150dd0452786bf14ad0c2e01beb12663c04ddf Mon Sep 17 00:00:00 2001
From: Friedrich von Never <friedrich@fornever.me>
Date: Tue, 10 Dec 2019 22:21:00 +0300
Subject: [PATCH] Migrate package preparation to dotnet pack (#226)

---
 README.md                                  |  5 ++---
 WpfMath.nuspec                             | 24 ----------------------
 WpfMath.sln                                |  7 -------
 appveyor.yml                               |  2 ++
 scripts/nuget-pack.ps1                     | 14 -------------
 src/WpfMath.Example/WpfMath.Example.csproj |  1 +
 src/WpfMath/WpfMath.csproj                 | 10 ++++++++-
 7 files changed, 14 insertions(+), 49 deletions(-)
 delete mode 100644 WpfMath.nuspec
 delete mode 100644 scripts/nuget-pack.ps1

diff --git a/README.md b/README.md
index 434dcd40..dd3b8a33 100644
--- a/README.md
+++ b/README.md
@@ -105,10 +105,10 @@ $ dotnet test
 
 To approve the test results if they differ from the existing ones, execute the `scripts/approve-all.ps1` script using PowerShell or PowerShell Core.
 
-To publish the package, execute the following command with [PowerShell][pwsh]:
+To publish the package, execute the following command:
 
 ```console
-$ pwsh scripts/nuget-pack.ps1
+$ dotnet pack --configuration Release
 ```
 
 History
@@ -147,7 +147,6 @@ We're very grateful to JMathTeX authors for their work and allowing to redistrib
 [launchpad]: https://launchpad.net/wpf-math
 [msbuild]: https://github.com/Microsoft/msbuild
 [nuget]: https://www.nuget.org/packages/WpfMath/
-[pwsh]: https://github.com/PowerShell/PowerShell
 
 [badge-appveyor]: https://ci.appveyor.com/api/projects/status/b26m3rpfcgb91gdg/branch/master?svg=true
 [badge-nuget]: https://img.shields.io/nuget/v/WpfMath.svg
diff --git a/WpfMath.nuspec b/WpfMath.nuspec
deleted file mode 100644
index 9c8570ce..00000000
--- a/WpfMath.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<package>
-    <metadata>
-        <id>WpfMath</id>
-        <version>0.7.0</version>
-        <title>WPF-Math</title>
-        <authors>ForNeVeR</authors>
-        <owners>ForNeVeR</owners>
-        <license type="expression">MIT</license>
-        <projectUrl>https://github.com/ForNeVeR/wpf-math</projectUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>.NET library for rendering mathematical formulae using the LaTeX typsetting style, for the WPF framework.</description>
-        <releaseNotes>Migrated to .NET 4.5.2; added matrix support; fixed some bugs.</releaseNotes>
-        <copyright>Copyright © Alex Regueiro 2010; Copyright © WPF-Math Contributors 2019</copyright>
-        <tags>wpf latex formula</tags>
-        <dependencies>
-            <dependency id="System.ValueTuple" version="4.5.0" />
-        </dependencies>
-    </metadata>
-    <files>
-        <file src="src\WpfMath\bin\Release\net452\WpfMath.???" target="lib\net452"/>
-    </files>
-</package>
diff --git a/WpfMath.sln b/WpfMath.sln
index 93f20f15..ae8d8bd9 100644
--- a/WpfMath.sln
+++ b/WpfMath.sln
@@ -15,12 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		LICENSE.md = LICENSE.md
 		README.md = README.md
 		RELEASES.md = RELEASES.md
-		WpfMath.nuspec = WpfMath.nuspec
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{853A4436-C44F-4A61-878D-1B85CE43DB31}"
-	ProjectSection(SolutionItems) = preProject
-		scripts\nuget-pack.ps1 = scripts\nuget-pack.ps1
 	EndProjectSection
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WpfMath.Tests", "src\WpfMath.Tests\WpfMath.Tests.fsproj", "{F19E5FB1-EE6B-4A48-A522-41F30676BE41}"
@@ -61,7 +55,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{853A4436-C44F-4A61-878D-1B85CE43DB31} = {D9341AA3-BF7C-4CC1-8E11-82258967B82F}
 		{39669369-C4F6-4AC6-9D35-B4B6086FF172} = {D9341AA3-BF7C-4CC1-8E11-82258967B82F}
 	EndGlobalSection
 EndGlobal
diff --git a/appveyor.yml b/appveyor.yml
index 503d6e9b..28987d39 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,5 +3,7 @@
                                  # VS2019
 build_script:
     - dotnet build
+after_build:
+    - dotnet pack
 test_script:
     - dotnet test
diff --git a/scripts/nuget-pack.ps1 b/scripts/nuget-pack.ps1
deleted file mode 100644
index 7163104f..00000000
--- a/scripts/nuget-pack.ps1
+++ /dev/null
@@ -1,14 +0,0 @@
-param (
-    $SourceDirectory = "$PSScriptRoot/..",
-    $msbuild = 'msbuild',
-    $nuget = 'nuget'
-)
-
-$ErrorActionPreference = 'Stop'
-
-& $msbuild /m "$SourceDirectory/WpfMath.sln" /p:Configuration=Release /p:Platform="Any CPU" '/t:Clean;Rebuild'
-if (-not $?) {
-    throw "msbuild returned error code: $LASTEXITCODE"
-}
-
-& $nuget pack -BasePath $SourceDirectory "$SourceDirectory/WpfMath.nuspec"
diff --git a/src/WpfMath.Example/WpfMath.Example.csproj b/src/WpfMath.Example/WpfMath.Example.csproj
index 223a916b..aaafc474 100644
--- a/src/WpfMath.Example/WpfMath.Example.csproj
+++ b/src/WpfMath.Example/WpfMath.Example.csproj
@@ -5,6 +5,7 @@
         <LangVersion>8.0</LangVersion>
         <UseWpf>true</UseWpf>
         <DebugType>Full</DebugType>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="../WpfMath/WpfMath.csproj"/>
diff --git a/src/WpfMath/WpfMath.csproj b/src/WpfMath/WpfMath.csproj
index 8c32047f..ec058daf 100644
--- a/src/WpfMath/WpfMath.csproj
+++ b/src/WpfMath/WpfMath.csproj
@@ -7,10 +7,18 @@
         <DebugType>Full</DebugType>
     </PropertyGroup>
     <PropertyGroup>
+        <PackageId>WpfMath</PackageId>
+        <Version>0.8.0</Version>
+        <Title>WPF-Math</Title>
+        <Authors>ForNeVeR</Authors>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageProjectUrl>https://github.com/ForNeVeR/wpf-math</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/ForNeVeR/wpf-math.git</RepositoryUrl>
         <AssemblyTitle>WPF-Math</AssemblyTitle>
+        <PackageReleaseNotes>Migrated to .NET 4.5.2; added matrix support; fixed some bugs.</PackageReleaseNotes>
+        <PackageTags>wpf;latex;formula</PackageTags>
         <Description>.NET library for rendering mathematical formulae using the LaTeX typsetting style, for the WPF framework.</Description>
         <Copyright>Copyright © Alex Regueiro 2010; Copyright © WPF-Math Contributors 2019</Copyright>
-        <AssemblyVersion>0.7.0</AssemblyVersion>
     </PropertyGroup>
     <ItemGroup>
         <EmbeddedResource Include="Data/*" />