From baee7c1ca6d533c9d0f6fb7c2ed70fc4a5894f37 Mon Sep 17 00:00:00 2001
From: Mihail Gribkov <61027276+Misha-133@users.noreply.github.com>
Date: Tue, 19 Mar 2024 02:21:45 +0300
Subject: [PATCH] [CI] fix tag build version (#2886)

* [CI] Fix tag build version

* fix this thing.
---
 .github/workflows/dotnet.yml       |  2 +-
 CHANGELOG.md                       |  4 ++
 Discord.Net.targets                |  8 +++-
 docs/docfx.json                    |  2 +-
 src/Discord.Net/Discord.Net.nuspec | 62 +++++++++++++++---------------
 5 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 305b4252..9e875433 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -40,7 +40,7 @@ jobs:
             run: dotnet restore ./Discord.Net.sln -v minimal
 
           - name: Build
-            run: dotnet build "Discord.Net.sln" -v minimal -c Release --no-restore /p:BuildNumber=${{ env.Suffix }} /p:IsTagBuild=$(IsTagBuild)
+            run: dotnet build "Discord.Net.sln" -v minimal -c Release --no-restore /p:BuildNumber=${{ env.Suffix }} /p:IsTagBuild=${{ env.IsTagBuild }}
 
           - name: Unit Test
             run: dotnet test "test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj" --no-restore --no-build -v minimal -c Release --logger trx
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7bf65476..64ac2f69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [3.14.1] - 2023-03-19
+### Fixed
+- Version number contains commit hash
+
 ## [3.14.0] - 2023-03-19
 
 ### Added
diff --git a/Discord.Net.targets b/Discord.Net.targets
index b8164d70..4a9e7a8f 100644
--- a/Discord.Net.targets
+++ b/Discord.Net.targets
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <VersionPrefix>3.14.0</VersionPrefix>
+        <VersionPrefix>3.14.1</VersionPrefix>
         <LangVersion>latest</LangVersion>
         <Authors>Discord.Net Contributors</Authors>
         <PackageTags>discord;discordapp</PackageTags>
@@ -11,7 +11,11 @@
         <RepositoryUrl>git://github.com/Discord-Net/Discord.Net</RepositoryUrl>
         <PackageReadmeFile>NUGET_README.md</PackageReadmeFile>
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(BuildNumber)' == '' ">
+    <PropertyGroup Condition=" '$(IsTagBuild)' == 'true' ">
+        <VersionSuffix></VersionSuffix>
+        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(BuildNumber)' == '' And $(IsTagBuild) != 'true' ">
         <VersionSuffix Condition=" '$(VersionSuffix)' != ''">$(VersionSuffix)-dev</VersionSuffix>
         <VersionSuffix Condition=" '$(VersionSuffix)' == ''">dev</VersionSuffix>
     </PropertyGroup>
diff --git a/docs/docfx.json b/docs/docfx.json
index b9c5de18..24bb29a3 100644
--- a/docs/docfx.json
+++ b/docs/docfx.json
@@ -59,7 +59,7 @@
     "globalMetadata": {
       "_appTitle": "Discord.Net Documentation",
       "_appName": "Discord.Net",
-      "_appFooter": "Discord.Net © 2015-2024 3.14.0",
+      "_appFooter": "Discord.Net © 2015-2024 3.14.1",
       "_enableSearch": true,
       "_appLogoPath": "marketing/logo/SVG/Logomark Purple.svg",
       "_appFaviconPath": "favicon.png"
diff --git a/src/Discord.Net/Discord.Net.nuspec b/src/Discord.Net/Discord.Net.nuspec
index 04e9fcd3..8f8bbff0 100644
--- a/src/Discord.Net/Discord.Net.nuspec
+++ b/src/Discord.Net/Discord.Net.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Discord.Net</id>
-    <version>3.14.0$suffix$</version>
+    <version>3.14.1$suffix$</version>
     <title>Discord.Net</title>
     <authors>Discord.Net Contributors</authors>
     <owners>foxbot</owners>
@@ -15,44 +15,44 @@
     <readme>NUGET_README.md</readme>
     <dependencies>
         <group targetFramework="net6.0">
-            <dependency id="Discord.Net.Core" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Rest" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Commands" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Interactions" version="3.14.0$suffix$" />
+            <dependency id="Discord.Net.Core" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Rest" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Commands" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Interactions" version="3.14.1$suffix$" />
         </group>
         <group targetFramework="net5.0">
-            <dependency id="Discord.Net.Core" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Rest" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Commands" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Interactions" version="3.14.0$suffix$" />
+            <dependency id="Discord.Net.Core" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Rest" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Commands" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Interactions" version="3.14.1$suffix$" />
         </group>
         <group targetFramework="net461">
-            <dependency id="Discord.Net.Core" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Rest" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Commands" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Interactions" version="3.14.0$suffix$" />
+            <dependency id="Discord.Net.Core" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Rest" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Commands" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Interactions" version="3.14.1$suffix$" />
         </group>
         <group targetFramework="netstandard2.0">
-            <dependency id="Discord.Net.Core" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Rest" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Commands" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Interactions" version="3.14.0$suffix$" />
+            <dependency id="Discord.Net.Core" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Rest" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Commands" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Interactions" version="3.14.1$suffix$" />
         </group>
         <group targetFramework="netstandard2.1">
-            <dependency id="Discord.Net.Core" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Rest" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Commands" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="3.14.0$suffix$" />
-            <dependency id="Discord.Net.Interactions" version="3.14.0$suffix$" />
+            <dependency id="Discord.Net.Core" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Rest" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Commands" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="3.14.1$suffix$" />
+            <dependency id="Discord.Net.Interactions" version="3.14.1$suffix$" />
         </group>
     </dependencies>
   </metadata>