From 771d136a8273ced56149a23c98ee98d62d98cd16 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 15 Nov 2022 14:45:23 +0100
Subject: [PATCH 1/3] Update x forzare chiamata script fix parametri progetto

---
 .gitlab-ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52c09fc8..b822a6fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,11 @@ variables:
       dotnet nuget add source https://nexus.steamware.net/repository/nuget-proxy-v3/index.json -n nexus-proxy-v3 -u nugetUser -p viaDante16 --store-password-in-clear-text
       echo "Has Source: $hasSource"
 
+.fixVers: &fixVers
+   - |
+      $VersScript = $env:APP_NAME + "\bin\publish\post-build.ps1 -ProjectDir $CI_PROJECT_DIR -ProjectPath $CI_PROJECT_PATH"
+      echo "Script called: $VersScript" 
+
 # helper creazione hash files x IIS
 .hashBuild: &hashBuild
    - |
@@ -61,6 +66,7 @@ variables:
       mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml
       mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html
 
+
 # Stages previsti
 stages:
   - build
@@ -463,6 +469,7 @@ LAND:installer:
   script: 
     - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish
     # qui il deploy su nexus...
+    - *fixVers
     - *hashBuild
     - *nexusUpload
     
@@ -484,6 +491,7 @@ PROG:installer:
   script: 
     - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish
     # qui il deploy su nexus...
+    - *fixVers
     - *hashBuild
     - *nexusUpload
 
@@ -505,6 +513,7 @@ STAT:installer:
   script: 
     - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish
     # qui il deploy su nexus...
+    - *fixVers
     - *hashBuild
     - *nexusUpload
 
@@ -526,6 +535,7 @@ MON:installer:
   script: 
     - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish
     # qui il deploy su nexus...
+    - *fixVers
     - *hashBuild
     - *nexusUpload
 
@@ -569,6 +579,7 @@ SPEC:installer:
   script: 
     - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish
     # qui il deploy su nexus...
+    - *fixVers
     - *hashBuild
     - *nexusUpload
 

From 97d727f815a66ba91740a470a878be0328bffc95 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 15 Nov 2022 14:48:20 +0100
Subject: [PATCH 2/3] Update CI-CD x deploy script ps1 versioni

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b822a6fa..2e8f834a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ variables:
 
 .fixVers: &fixVers
    - |
-      $VersScript = $env:APP_NAME + "\bin\publish\post-build.ps1 -ProjectDir $CI_PROJECT_DIR -ProjectPath $CI_PROJECT_PATH"
+      $VersScript = $env:APP_NAME + "\bin\publish\post-build.ps1 -ProjectDir $CI_PROJECT_DIR\$env:APP_NAME -ProjectPath $CI_PROJECT_PATH\$env:APP_NAME\$env:APP_NAME.csproj"
       echo "Script called: $VersScript" 
 
 # helper creazione hash files x IIS

From c14e04bbfd7ea150ed40d9ed67ae624f249328c0 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 15 Nov 2022 14:54:44 +0100
Subject: [PATCH 3/3] test fix CI/CD

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e8f834a..28d7a489 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ variables:
 
 .fixVers: &fixVers
    - |
-      $VersScript = $env:APP_NAME + "\bin\publish\post-build.ps1 -ProjectDir $CI_PROJECT_DIR\$env:APP_NAME -ProjectPath $CI_PROJECT_PATH\$env:APP_NAME\$env:APP_NAME.csproj"
+      $VersScript = $env:APP_NAME + "\bin\publish\post-build.ps1 -ProjectDir $CI_PROJECT_DIR\$env:APP_NAME -ProjectPath $CI_PROJECT_DIR\$env:APP_NAME\$env:APP_NAME.csproj"
       echo "Script called: $VersScript" 
 
 # helper creazione hash files x IIS