From 02c5f5d5768b495674341d987cc461ddb3a8bb35 Mon Sep 17 00:00:00 2001
From: mom-bbtsoftware <122623555+mom-bbtsoftware@users.noreply.github.com>
Date: Thu, 9 Mar 2023 16:57:17 +0100
Subject: [PATCH]  Use dotnet pack command (#133) (#134)

---
 .github/workflows/release.yml                 |   4 +--
 nuspec/nuget/BBT.MaybePattern.nuspec          |  33 ------------------
 src/BBT.MaybePattern/BBT.MaybePattern.csproj  |  20 ++++++++---
 .../nuget => src/BBT.MaybePattern}/icon.png   | Bin
 4 files changed, 18 insertions(+), 39 deletions(-)
 delete mode 100644 nuspec/nuget/BBT.MaybePattern.nuspec
 rename {nuspec/nuget => src/BBT.MaybePattern}/icon.png (100%)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b2e927a..8321eae 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
         uses: NuGet/setup-nuget@v1
 
       - name: Package NuGet
-        run: nuget pack ../nuspec/nuget/*.nuspec
+        run: dotnet pack -c $BUILD_CONFIG -p:PackageVersion=$BUILD_VERSION
 
       - name: Publish NuGet
-        run: nuget push ./*.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGETORG}}
+        run: nuget push ./BBT.MaybePattern/bin/Release/BBT.MaybePattern.$BUILD_VERSION.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGETORG}}
diff --git a/nuspec/nuget/BBT.MaybePattern.nuspec b/nuspec/nuget/BBT.MaybePattern.nuspec
deleted file mode 100644
index 2dafc6f..0000000
--- a/nuspec/nuget/BBT.MaybePattern.nuspec
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <id>BBT.Maybe</id>
-    <title>BBT Maybe</title>
-    <version>3.1.1</version>
-    <authors>BBT Software AG</authors>
-    <owners>bbtsoftware</owners>
-    <summary>An option type for .NET.</summary>
-    <description>An option type for .NET.</description>
-    <license type="expression">MIT</license>
-    <projectUrl>https://bbtsoftware.github.io/BBT.Maybe/</projectUrl>
-    <icon>icon.png</icon>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <repository type="git" url="https://github.com/bbtsoftware/BBT.Maybe.git" />
-    <copyright>Copyright © BBT Software AG</copyright>
-    <tags>Maybe Functional</tags>
-    <releaseNotes>https://github.com/bbtsoftware/BBT.Maybe/releases/tag/3.1.1</releaseNotes>
-    <dependencies>
-      <group targetFramework="net6.0" />
-      <group targetFramework="netstandard2.0" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src=".\icon.png" target="" />
-    <file src="..\..\src\BBT.MaybePattern\bin\Release\netstandard2.0\BBT.MaybePattern.dll" target="lib\netstandard2.0" />
-    <file src="..\..\src\BBT.MaybePattern\bin\Release\netstandard2.0\BBT.MaybePattern.pdb" target="lib\netstandard2.0" />
-    <file src="..\..\src\BBT.MaybePattern\bin\Release\netstandard2.0\BBT.MaybePattern.xml" target="lib\netstandard2.0" />
-    <file src="..\..\src\BBT.MaybePattern\bin\Release\net6.0\BBT.MaybePattern.dll" target="lib\net6.0" />
-    <file src="..\..\src\BBT.MaybePattern\bin\Release\net6.0\BBT.MaybePattern.pdb" target="lib\net6.0" />
-    <file src="..\..\src\BBT.MaybePattern\bin\Release\net6.0\BBT.MaybePattern.xml" target="lib\net6.0" />
-  </files>
-</package>
diff --git a/src/BBT.MaybePattern/BBT.MaybePattern.csproj b/src/BBT.MaybePattern/BBT.MaybePattern.csproj
index 3e6228a..ba981f5 100644
--- a/src/BBT.MaybePattern/BBT.MaybePattern.csproj
+++ b/src/BBT.MaybePattern/BBT.MaybePattern.csproj
@@ -3,15 +3,27 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <AssemblyTitle>BBT.MaybePattern</AssemblyTitle>
-    <Company>BBT Software AG</Company>
-    <Product>BBT.Maybe</Product>
-    <Description>An option type for .NET</Description>
-    <Copyright>Copyright © BBT Software AG</Copyright>
     <CodeAnalysisRuleSet>..\BBT.MaybePattern.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\$(Configuration)\BBT.MaybePattern.XML</DocumentationFile>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
+  
+  <PropertyGroup>
+    <Title>BBT.MaybePattern</Title>
+    <Description>An option type for .NET</Description>
+    <Product>BBT.MaybePattern</Product>
+    <Company>BBT Software AG</Company>
+    <Authors>BBT Software AG</Authors>
+    <Copyright>Copyright © BBT Software AG</Copyright>
+    <PackageTags>Maybe Functional</PackageTags>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageProjectUrl>https://github.com/bbtsoftware/BBT.Maybe/</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/bbtsoftware/BBT.Maybe.git</RepositoryUrl>
+    <PackageReleaseNotes>https://github.com/bbtsoftware/BBT.Maybe/releases/tag/3.1.1</PackageReleaseNotes>
+  </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>
diff --git a/nuspec/nuget/icon.png b/src/BBT.MaybePattern/icon.png
similarity index 100%
rename from nuspec/nuget/icon.png
rename to src/BBT.MaybePattern/icon.png