From 0e837c27bd8d03666d81bcb2722bb2a1875a17ea Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 11 Apr 2022 10:45:30 +0200
Subject: [PATCH] Aggiunto pubblicazione iis02/03 e senza cert untrusted x
 iis01

---
 .gitlab-ci.yml | 56 +++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3f89ff..60f3dcb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ variables:
  NUGET_PATH: 'C:\Tools\nuget.exe'
  MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe'
  ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools'
- VERS_MAIN: '1.1'
+ VERS_MAIN: '1.2'
  NEW_REL: ''
  NEXUS_PATH: 'ZCode'
  APP_NAME: 'QR-GEN'
@@ -104,36 +104,36 @@ Zcode:IIS01:deploy:
    - '& "$env:NUGET_PATH" restore $env:APP_NAME.sln -Verbosity quiet'
    - *version-fix
  script:
-   -  '& "$env:MSBUILD_PATH" /p:m=8 /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'
+   -  '& "$env:MSBUILD_PATH" /p:m=8 /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:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
  needs: ["Zcode:build"]
 
-# Zcode:IIS02:deploy:
-#  stage: deploy
-#  tags:
-#     - win
-#  rules:
-#    - if: '$CI_COMMIT_BRANCH == "master"'
-#  before_script:
-#    - *nuget-fix
-#    - '& "$env:NUGET_PATH" restore $env:APP_NAME.sln -Verbosity quiet'
-#    - *version-fix
-#  script:  
-#    -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.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: ["Zcode:build"]
+Zcode:IIS02:deploy:
+ stage: deploy
+ tags:
+    - win
+ rules:
+   - if: '$CI_COMMIT_BRANCH == "develop"'
+ before_script:
+   - *nuget-fix
+   - '& "$env:NUGET_PATH" restore $env:APP_NAME.sln -Verbosity quiet'
+   - *version-fix
+ script:
+   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.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: ["Zcode:build"]
  
-# Zcode:IIS03:deploy:
-#  stage: deploy
-#  tags:
-#     - win
-#  rules:
-#    - if: '$CI_COMMIT_BRANCH == "master"'
-#  before_script:
-#    - *nuget-fix
-#    - '& "$env:NUGET_PATH" restore $env:APP_NAME.sln -Verbosity quiet'
-#    - *version-fix
-#  script:  
-#    -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.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: ["Zcode:build"]
+ Zcode:IIS03:deploy:
+ stage: deploy
+ tags:
+    - win
+ rules:
+   - if: '$CI_COMMIT_BRANCH == "develop"'
+ before_script:
+   - *nuget-fix
+   - '& "$env:NUGET_PATH" restore $env:APP_NAME.sln -Verbosity quiet'
+   - *version-fix
+ script:
+   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.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: ["Zcode:build"]
 
 # Zcode:OVH:release:
 #  stage: release