From ee0da02d1cc65834d59ed24768d9fa69bdfba704 Mon Sep 17 00:00:00 2001
From: Rutherther <fandabohacek@gmail.com>
Date: Fri, 20 Jan 2023 14:43:42 +0100
Subject: [PATCH] chore: use version prefix to allow for setting a version
 suffix

---
 .github/workflows/build-test.yml                              | 2 +-
 Core/NosSmooth.Core/NosSmooth.Core.csproj                     | 4 +---
 Core/NosSmooth.Game/NosSmooth.Game.csproj                     | 4 +---
 .../NosSmooth.Data.Abstractions.csproj                        | 4 +---
 Data/NosSmooth.Data.Database/NosSmooth.Data.Database.csproj   | 4 +---
 Data/NosSmooth.Data.NOSFiles/NosSmooth.Data.NOSFiles.csproj   | 4 +---
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 797ff03..fc9f035 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -36,6 +36,6 @@ jobs:
     - name: Publish NuGet on MyGet
       working-directory: nuget
       if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-      run: dotnet nuget push *.nupkg --skip-duplicate --version-suffix "main$GITHUB_RUN_ID" -k $MYGET_AUTH_TOKEN -s https://www.myget.org/F/nossmooth/api/v3/index.json
+      run: dotnet nuget push *.nupkg --skip-duplicate -k $MYGET_AUTH_TOKEN -s https://www.myget.org/F/nossmooth/api/v3/index.json
       env:
         MYGET_AUTH_TOKEN: ${{secrets.MYGET_KEY}}
\ No newline at end of file
diff --git a/Core/NosSmooth.Core/NosSmooth.Core.csproj b/Core/NosSmooth.Core/NosSmooth.Core.csproj
index c11ae68..18dc217 100644
--- a/Core/NosSmooth.Core/NosSmooth.Core.csproj
+++ b/Core/NosSmooth.Core/NosSmooth.Core.csproj
@@ -8,11 +8,9 @@
         <Description>NosSmooth Core library allowing implementing nostale client, handling packets and commands.</Description>
         <RepositoryUrl>https://github.com/Rutherther/NosSmooth/</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageVersion>3.2.0</PackageVersion>
+        <VersionPrefix>3.2.0</VersionPrefix>
         <PackageReleaseNotes>Add contract reached state.
 Avoid deadlocks.</PackageReleaseNotes>
-        <AssemblyVersion>3.2.0</AssemblyVersion>
-        <FileVersion>3.2.0</FileVersion>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Core/NosSmooth.Game/NosSmooth.Game.csproj b/Core/NosSmooth.Game/NosSmooth.Game.csproj
index 658896c..2072b4f 100644
--- a/Core/NosSmooth.Game/NosSmooth.Game.csproj
+++ b/Core/NosSmooth.Game/NosSmooth.Game.csproj
@@ -8,10 +8,8 @@
         <Description>NosSmooth Game library handling the current game state by responding to packets.</Description>
         <RepositoryUrl>https://github.com/Rutherther/NosSmooth/</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageVersion>2.3.5</PackageVersion>
+        <VersionPrefix>2.3.5</VersionPrefix>
         <PackageReleaseNotes>Add safe checks for skill attack type</PackageReleaseNotes>
-        <AssemblyVersion>2.3.5</AssemblyVersion>
-        <FileVersion>2.3.5</FileVersion>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Data/NosSmooth.Data.Abstractions/NosSmooth.Data.Abstractions.csproj b/Data/NosSmooth.Data.Abstractions/NosSmooth.Data.Abstractions.csproj
index 4332892..da6a62f 100644
--- a/Data/NosSmooth.Data.Abstractions/NosSmooth.Data.Abstractions.csproj
+++ b/Data/NosSmooth.Data.Abstractions/NosSmooth.Data.Abstractions.csproj
@@ -7,11 +7,9 @@
         <LangVersion>10</LangVersion>
         <RepositoryUrl>https://github.com/Rutherther/NosSmooth/</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageVersion>2.2.0</PackageVersion>
+        <VersionPrefix>2.2.0</VersionPrefix>
         <TargetFramework>net7.0</TargetFramework>
         <PackageReleaseNotes>Add new skill information: uses secondary weapon, attack type, element</PackageReleaseNotes>
-        <AssemblyVersion>2.1.0</AssemblyVersion>
-        <FileVersion>2.1.0</FileVersion>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Data/NosSmooth.Data.Database/NosSmooth.Data.Database.csproj b/Data/NosSmooth.Data.Database/NosSmooth.Data.Database.csproj
index cd2fd43..578b972 100644
--- a/Data/NosSmooth.Data.Database/NosSmooth.Data.Database.csproj
+++ b/Data/NosSmooth.Data.Database/NosSmooth.Data.Database.csproj
@@ -7,11 +7,9 @@
         <LangVersion>10</LangVersion>
         <RepositoryUrl>https://github.com/Rutherther/NosSmooth/</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageVersion>2.1.0</PackageVersion>
+        <VersionPrefix>2.1.0</VersionPrefix>
         <TargetFramework>net7.0</TargetFramework>
         <PackageReleaseNotes>Add new skill fields.</PackageReleaseNotes>
-        <AssemblyVersion>2.1.0</AssemblyVersion>
-        <FileVersion>2.1.0</FileVersion>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Data/NosSmooth.Data.NOSFiles/NosSmooth.Data.NOSFiles.csproj b/Data/NosSmooth.Data.NOSFiles/NosSmooth.Data.NOSFiles.csproj
index c0c1227..5f34a78 100644
--- a/Data/NosSmooth.Data.NOSFiles/NosSmooth.Data.NOSFiles.csproj
+++ b/Data/NosSmooth.Data.NOSFiles/NosSmooth.Data.NOSFiles.csproj
@@ -7,11 +7,9 @@
         <LangVersion>10</LangVersion>
         <RepositoryUrl>https://github.com/Rutherther/NosSmooth/</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageVersion>2.2.0</PackageVersion>
+        <VersionPrefix>2.2.0</VersionPrefix>
         <PackageReleaseNotes>Add new skill fields.</PackageReleaseNotes>
         <TargetFramework>net7.0</TargetFramework>
-        <AssemblyVersion>2.2.0</AssemblyVersion>
-        <FileVersion>2.2.0</FileVersion>
     </PropertyGroup>
 
     <ItemGroup>
-- 
2.49.0