From 09feadf37cc38a00609d7edd9dabfe829e70e7ea Mon Sep 17 00:00:00 2001
From: 7702244 <56172899+7702244@users.noreply.github.com>
Date: Mon, 24 Jun 2024 21:29:13 +0300
Subject: [PATCH] Fix versioning 4

---
 .github/workflows/dotnet-release.yml     | 2 +-
 src/MAOToolkit.Web/MAOToolkit.Web.csproj | 2 +-
 src/MAOToolkit/MAOToolkit.csproj         | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dotnet-release.yml b/.github/workflows/dotnet-release.yml
index 8d25e36..1183dec 100644
--- a/.github/workflows/dotnet-release.yml
+++ b/.github/workflows/dotnet-release.yml
@@ -84,7 +84,7 @@ jobs:
 
       - name: Get current date version
         id: date_version
-        run: echo "date_version=$(date +'%Y.%m%d.%H%M-build-%S')" >> $GITHUB_OUTPUT
+        run: echo "date_version=$(date +'%Y.%m%d.%H%M')" >> $GITHUB_OUTPUT
 
       - name: Create the package
         run: dotnet pack $SOLUTION --configuration Release --no-restore --no-build --verbosity normal /p:PackageVersion=2.${{ steps.date_version.outputs.date_version }}
diff --git a/src/MAOToolkit.Web/MAOToolkit.Web.csproj b/src/MAOToolkit.Web/MAOToolkit.Web.csproj
index 8b42bc7..cfeb246 100644
--- a/src/MAOToolkit.Web/MAOToolkit.Web.csproj
+++ b/src/MAOToolkit.Web/MAOToolkit.Web.csproj
@@ -7,7 +7,7 @@
 		<InvariantGlobalization>true</InvariantGlobalization>
 
 		<!-- The current Nuget Package Version is configured in the file dotnet-release.yml	-->
-		<BuildNumber>$([System.DateTime]::UtcNow.ToString(yyyy.MMdd.hhmm-ss))</BuildNumber>
+		<BuildNumber>$([System.DateTime]::UtcNow.ToString(yyyy.MMdd.hhmm))</BuildNumber>
 		<VersionPrefix>2.$(BuildNumber)</VersionPrefix>
 		
 		<PackageId>MAOToolkit.Web</PackageId>
diff --git a/src/MAOToolkit/MAOToolkit.csproj b/src/MAOToolkit/MAOToolkit.csproj
index f4c1af8..07d0c05 100644
--- a/src/MAOToolkit/MAOToolkit.csproj
+++ b/src/MAOToolkit/MAOToolkit.csproj
@@ -6,7 +6,8 @@
 		<Nullable>enable</Nullable>
 		<InvariantGlobalization>true</InvariantGlobalization>
 
-		<BuildNumber>$([System.DateTime]::UtcNow.ToString(yyyy.MMdd.hhmm-ss))</BuildNumber>
+		<!-- The current Nuget Package Version is configured in the file dotnet-release.yml	-->
+		<BuildNumber>$([System.DateTime]::UtcNow.ToString(yyyy.MMdd.hhmm))</BuildNumber>
 		<VersionPrefix>2.$(BuildNumber)</VersionPrefix>
 
 		<PackageId>MAOToolkit</PackageId>