Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v_6.14_unificata'

Browse Source
This commit is contained in:
Samuele Locatelli
2021-09-22 12:10:45 +02:00
parent fc20464958 faba3fbe60
commit c1c5f2e16e
9 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
-2
View File
@@ -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'
MP.Land/MP.Land.csproj
+1 -1
View File
@@ -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>
MP.Land/Resources/ChangeLog.html
+1 -1
View File
@@ -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>
MP.Land/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.1.2109.2118
6.14.2109.2210
MP.Land/Resources/manifest.xml
+1 -1
View File
@@ -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>
MP.Land/post-build.ps1
+8 -7
View File
@@ -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
MP.Prog/post-build.ps1
+8 -7
View File
@@ -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
MP.Stats/post-build.ps1
+8 -7
View File
@@ -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
MajMin.vers
+1
View File
@@ -0,0 +1 @@
6.14.