diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d66312..83c4f24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,19 +25,17 @@ variables:
.version-fix: &version-fix
- |
# Esecuzione fix numero versione x pack nuget
- $fileNameAss = ".\$env:APP_NAME\Properties\AssemblyInfo.cs";
- $find = "assembly: AssemblyVersion";
- $riga = Select-String $fileNameAss -Pattern $find;
- # recupero il valore della versione release/debug
- $idxVers = $riga.ToString().IndexOf("AssemblyVersion(");
- $currRelease = $riga.ToString().Substring($idxVers).Replace("AssemblyVersion(","").Replace(")]","").Replace("""","");
+ $fileName = "INTERFACE\VersGen\VersGen.cs";
# calcolo nuova
$env:NEW_REL = $env:VERS_MAIN+"."+(get-date –format yyMM)+"."+(get-date –format dHH)
echo "New vers: $env:NEW_REL"
# aggiorno file
- $contenuto = Get-Content -path $fileNameAss -Raw
- $newContenuto = $contenuto -replace $currRelease, $env:NEW_REL
- $newContenuto | Set-Content -path $fileNameAss
+ $contenuto = Get-Content -path $fileName -Raw
+ $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL
+ $newContenuto | Set-Content -path $fileName
+
+# helper x fix manifest xml
+.manifest-fix: &manifest-fix
# helper creazione hash files
.hashBuild: &hashBuild
@@ -94,21 +92,37 @@ StockMan:build:
script:
- '& "$env:MSBUILD_PATH" $env:APP_NAME/$env:APP_NAME.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
-# StockMan:IIS01:deploy:
-# stage: deploy
-# tags:
-# - win
-# except:
-# refs:
-# - main
-# - master
-# before_script:
-# - *nuget-fix
-# - '& "$env:NUGET_PATH" restore $env:APP_NAME.sln -Verbosity quiet'
-# - *version-fix
-# script:
-# - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
-# needs: ["StockMan:build"]
+StockMan:IIS01:deploy:
+ stage: deploy
+ tags:
+ - win
+ except:
+ refs:
+ - main
+ - master
+ before_script:
+ - *nuget-fix
+ - '& "$env:NUGET_PATH" restore $env:APP_NAME.sln -Verbosity quiet'
+ - *version-fix
+ script:
+ - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
+ needs: ["StockMan:build"]
+
+ StockMan:IIS01_TK:deploy:
+ stage: deploy
+ tags:
+ - win
+ except:
+ refs:
+ - main
+ - master
+ before_script:
+ - *nuget-fix
+ - '& "$env:NUGET_PATH" restore $env:APP_NAME.sln -Verbosity quiet'
+ - *version-fix
+ script:
+ - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01_TK.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
+ needs: ["StockMan:build"]
# StockMan:IIS02:deploy:
# stage: deploy
diff --git a/StockManMVC/Properties/PublishProfiles/IIS01.pubxml b/StockManMVC/Properties/PublishProfiles/IIS01.pubxml
index 84bad47..6b40cee 100644
--- a/StockManMVC/Properties/PublishProfiles/IIS01.pubxml
+++ b/StockManMVC/Properties/PublishProfiles/IIS01.pubxml
@@ -12,7 +12,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
True
True
- https://IIS01:8172/MsDeploy.axd
+ https://IIS01.egalware.com:8172/MsDeploy.axd
Default Web Site/StockMan/STEA
False
diff --git a/StockManMVC/Properties/PublishProfiles/IIS01_TK.pubxml b/StockManMVC/Properties/PublishProfiles/IIS01_TK.pubxml
index 73ac63a..5f9bf81 100644
--- a/StockManMVC/Properties/PublishProfiles/IIS01_TK.pubxml
+++ b/StockManMVC/Properties/PublishProfiles/IIS01_TK.pubxml
@@ -12,7 +12,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
True
True
- https://IIS01:8172/MsDeploy.axd
+ https://IIS01.egalware.com:8172/MsDeploy.axd
Default Web Site/StockMan/TK
False
diff --git a/StockManMVC/Properties/PublishProfiles/IIS02.pubxml b/StockManMVC/Properties/PublishProfiles/IIS02.pubxml
index 1aee540..0bf006c 100644
--- a/StockManMVC/Properties/PublishProfiles/IIS02.pubxml
+++ b/StockManMVC/Properties/PublishProfiles/IIS02.pubxml
@@ -12,7 +12,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
True
True
- https://IIS02:8172/MsDeploy.axd
+ https://IIS02.egalware.com:8172/MsDeploy.axd
Default Web Site/StockMan/STEA
False
diff --git a/StockManMVC/Properties/PublishProfiles/IIS02_TK.pubxml b/StockManMVC/Properties/PublishProfiles/IIS02_TK.pubxml
index 6935c67..32862b1 100644
--- a/StockManMVC/Properties/PublishProfiles/IIS02_TK.pubxml
+++ b/StockManMVC/Properties/PublishProfiles/IIS02_TK.pubxml
@@ -12,7 +12,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
True
True
- https://IIS02:8172/MsDeploy.axd
+ https://IIS02.egalware.com:8172/MsDeploy.axd
Default Web Site/StockMan/TK
False
diff --git a/StockManMVC/Properties/PublishProfiles/IIS03.pubxml b/StockManMVC/Properties/PublishProfiles/IIS03.pubxml
new file mode 100644
index 0000000..a77f447
--- /dev/null
+++ b/StockManMVC/Properties/PublishProfiles/IIS03.pubxml
@@ -0,0 +1,47 @@
+
+
+
+
+ MSDeploy
+ False
+ Release
+ Any CPU
+
+ True
+ True
+ https://IIS03.egalware.com:8172/MsDeploy.axd
+ Default Web Site/StockMan/STEA
+
+ False
+ WMSVC
+ True
+ jenkins
+ <_SavePWD>True
+ 14.0
+ True
+
+
+
+
+
+
+
+
+ True
+ True
+ False
+ DonotMerge
+
+
+
+
+ metadata=res://*/Models.SMModel.csdl|res://*/Models.SMModel.ssdl|res://*/Models.SMModel.msl;provider=System.Data.SqlClient;provider connection string="Data Source=SQLSTEAM;Initial Catalog=StockMan;Persist Security Info=True;User ID=sa;Password=keyhammer"
+ False
+
+
+
\ No newline at end of file
diff --git a/StockManMVC/Properties/PublishProfiles/IIS03_TK.pubxml b/StockManMVC/Properties/PublishProfiles/IIS03_TK.pubxml
new file mode 100644
index 0000000..6b8728d
--- /dev/null
+++ b/StockManMVC/Properties/PublishProfiles/IIS03_TK.pubxml
@@ -0,0 +1,43 @@
+
+
+
+
+ MSDeploy
+ False
+ IIS02_TK
+ Any CPU
+
+ True
+ True
+ https://IIS03.egalware.com:8172/MsDeploy.axd
+ Default Web Site/StockMan/TK
+
+ False
+ WMSVC
+ True
+ steamw\administrator
+ <_SavePWD>True
+
+
+
+
+
+
+
+
+ True
+ True
+ False
+ DonotMerge
+
+
+
+ False
+
+
+
\ No newline at end of file
diff --git a/StockManMVC/StockManMVC.csproj b/StockManMVC/StockManMVC.csproj
index a7ed3ac..0658700 100644
--- a/StockManMVC/StockManMVC.csproj
+++ b/StockManMVC/StockManMVC.csproj
@@ -481,6 +481,8 @@
+
+
diff --git a/VersGen/VersGen.cs b/VersGen/VersGen.cs
index 342accd..087f689 100644
--- a/VersGen/VersGen.cs
+++ b/VersGen/VersGen.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyCopyright("Steamware © 2006-2019")]
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]
+[assembly: AssemblyCopyright("Steamware © 2006-2022")]
[assembly: AssemblyCompany("Steamware")]
\ No newline at end of file
diff --git a/VersGen/VersGen.tt b/VersGen/VersGen.tt
index e957cfb..3d9f30c 100644
--- a/VersGen/VersGen.tt
+++ b/VersGen/VersGen.tt
@@ -6,7 +6,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]
[assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
\ No newline at end of file