From c9113730362ce189bd7e1d133c273c643c5ebd72 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 22 Sep 2021 11:00:49 +0200
Subject: [PATCH 1/2] Fix pubblicazione versioni x MP-CORE Land

---
 MP.Land/MP.Land.csproj           |  2 +-
 MP.Land/Resources/ChangeLog.html |  2 +-
 MP.Land/Resources/VersNum.txt    |  2 +-
 MP.Land/Resources/manifest.xml   |  2 +-
 MP.Land/post-build.ps1           | 15 ++++++++-------
 MajMin.vers                      |  1 +
 6 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 MajMin.vers
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj
index 56441fbc..da550e72 100644
--- a/MP.Land/MP.Land.csproj
+++ b/MP.Land/MP.Land.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
         <RootNamespace>MP.Land</RootNamespace>
-        <Version>1.1.2109.2118</Version>
+        <Version>6.14.2109.2210</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html
index f889f1c9..f8815611 100644
--- a/MP.Land/Resources/ChangeLog.html
+++ b/MP.Land/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo gestione Programmi MAPO</i>
-    <h4>Versione: 1.1.2109.2118</h4>
+    <h4>Versione: 6.14.2109.2210</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt
index 8df6c9f5..d49aa6ef 100644
--- a/MP.Land/Resources/VersNum.txt
+++ b/MP.Land/Resources/VersNum.txt
@@ -1 +1 @@
-1.1.2109.2118
+6.14.2109.2210
diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml
index 29e07ccd..bdfeebf4 100644
--- a/MP.Land/Resources/manifest.xml
+++ b/MP.Land/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.1.2109.2118</version>
+  <version>6.14.2109.2210</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Land/post-build.ps1 b/MP.Land/post-build.ps1
index b0923e85..eb2a52a0 100644
--- a/MP.Land/post-build.ps1
+++ b/MP.Land/post-build.ps1
@@ -1,15 +1,16 @@
 ﻿param([string]$ProjectDir, [string]$ProjectPath);
 
-$FileVers="Resources\VersNum.txt"
-$FileManIn="Resources\manifest-original.xml"
-$FileManOut="Resources\manifest.xml"
-$FileCLogIn="Resources\ChangeLog-original.html"
-$FileCLogOut="Resources\ChangeLog.html"
-$MajMin="1.1."
+$FileMajMin = "..\MajMin.vers"
+$FileVers = "Resources\VersNum.txt"
+$FileManIn = "Resources\manifest-original.xml"
+$FileManOut = "Resources\manifest.xml"
+$FileCLogIn = "Resources\ChangeLog-original.html"
+$FileCLogOut = "Resources\ChangeLog.html"
+$MajMin =  Get-Content $FileMajMin # "6.14." 
 $currentDate = get-date -format yyMM;
 $currentTime = get-date -format ddHH;
 $find = "<Version>(.|\n)*?</Version>";
-$currRelNum=$MajMin + $currentDate +"." + $currentTime
+$currRelNum = $MajMin + $currentDate +"." + $currentTime
 $replace = "<Version>" + $MajMin + $currentDate +"." + $currentTime + "</Version>";
 $csproj = Get-Content $ProjectPath
 $csprojUpdated = $csproj -replace $find, $replace
diff --git a/MajMin.vers b/MajMin.vers
new file mode 100644
index 00000000..c4e3f49d
--- /dev/null
+++ b/MajMin.vers
@@ -0,0 +1 @@
+6.14.
\ No newline at end of file

From faba3fbe6049b460c01c00b86e95ea64999a08a4 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 22 Sep 2021 12:06:03 +0200
Subject: [PATCH 2/2] Fix deploy script x vers number unificato

---
 .gitlab-ci.yml          |  2 --
 MP.Prog/post-build.ps1  | 15 ++++++++-------
 MP.Stats/post-build.ps1 | 15 ++++++++-------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15e81b2e..b8c465da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,6 @@ variables:
  ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools'
  EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\MP-CORE\Release'
  DEPLOY_FOLDER: 'c:\Projects\Deploy\MP-CORE\Builds'
- VERS_MAIN: '1.1'
-#  VERS_FULL: '0.0.0.0'
  NEXUS_PATH: 'MP-STATS'
  APP_NAME: 'MP.Stats'
 
diff --git a/MP.Prog/post-build.ps1 b/MP.Prog/post-build.ps1
index bc301c2a..7b829f79 100644
--- a/MP.Prog/post-build.ps1
+++ b/MP.Prog/post-build.ps1
@@ -1,15 +1,16 @@
 ﻿param([string]$ProjectDir, [string]$ProjectPath);
 
-$FileVers="Resources\VersNum.txt"
-$FileManIn="Resources\manifest-original.xml"
-$FileManOut="Resources\manifest.xml"
-$FileCLogIn="Resources\ChangeLog-original.html"
-$FileCLogOut="Resources\ChangeLog.html"
-$MajMin="1.1."
+$FileMajMin = "..\MajMin.vers"
+$FileVers = "Resources\VersNum.txt"
+$FileManIn = "Resources\manifest-original.xml"
+$FileManOut = "Resources\manifest.xml"
+$FileCLogIn = "Resources\ChangeLog-original.html"
+$FileCLogOut = "Resources\ChangeLog.html"
+$MajMin =  Get-Content $FileMajMin # "6.14." 
 $currentDate = get-date -format yyMM;
 $currentTime = get-date -format ddHH;
 $find = "<Version>(.|\n)*?</Version>";
-$currRelNum=$MajMin + $currentDate +"." + $currentTime
+$currRelNum = $MajMin + $currentDate +"." + $currentTime
 $replace = "<Version>" + $MajMin + $currentDate +"." + $currentTime + "</Version>";
 $csproj = Get-Content $ProjectPath
 $csprojUpdated = $csproj -replace $find, $replace
diff --git a/MP.Stats/post-build.ps1 b/MP.Stats/post-build.ps1
index 063f4945..931766a0 100644
--- a/MP.Stats/post-build.ps1
+++ b/MP.Stats/post-build.ps1
@@ -1,15 +1,16 @@
 ﻿param([string]$ProjectDir, [string]$ProjectPath);
 
-$FileVers="Resources\VersNum.txt"
-$FileManIn="Resources\manifest-original.xml"
-$FileManOut="Resources\manifest.xml"
-$FileCLogIn="Resources\ChangeLog-original.html"
-$FileCLogOut="Resources\ChangeLog.html"
-$MajMin="1.1."
+$FileMajMin = "..\MajMin.vers"
+$FileVers = "Resources\VersNum.txt"
+$FileManIn = "Resources\manifest-original.xml"
+$FileManOut = "Resources\manifest.xml"
+$FileCLogIn = "Resources\ChangeLog-original.html"
+$FileCLogOut = "Resources\ChangeLog.html"
+$MajMin =  Get-Content $FileMajMin # "6.14." 
 $currentDate = get-date -format yyMM;
 $currentTime = get-date -format ddHH;
 $find = "<Version>(.|\n)*?</Version>";
-$currRelNum=$MajMin + $currentDate +"." + $currentTime
+$currRelNum = $MajMin + $currentDate +"." + $currentTime
 $replace = "<Version>" + $MajMin + $currentDate +"." + $currentTime + "</Version>";
 $csproj = Get-Content $ProjectPath
 $csprojUpdated = $csproj -replace $find, $replace
