Merge branch 'release/FixPubXmlIIS04'

2023-03-14 15:39:03 +01:00
parent 6a68b8ec99 17bb5f2ec7
commit 31e7ac4ed5
2 changed files with 27 additions and 40 deletions
@@ -19,9 +19,9 @@ variables:
   - |
      $hasSource = C:\Tools\nuget.exe sources list | find "`"Steamware Nexus`"" /C
      if ($hasSource -eq 0) {
-         C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
+         C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"$NEXUS_PASSWD`""
      } else {
-         C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
+         C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"$NEXUS_PASSWD`""
      }
      echo $hasSource

@@ -91,8 +91,8 @@ ADM:staging:
 stage: staging
 tags:
   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "develop"'
+ only:
+   - develop
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore GPW.sln -verbosity quiet'  
@@ -105,8 +105,8 @@ COM:staging:
 stage: staging
 tags:
   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "develop"'
+ only:
+   - develop
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore GPW.sln -verbosity quiet'  
@@ -119,8 +119,8 @@ BH:staging:
 stage: staging
 tags:
   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "develop"'
+ only:
+   - develop
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore GPW.sln -verbosity quiet'  
@@ -134,8 +134,8 @@ Smart:staging:
 stage: staging
 tags:
   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "develop"'
+ only:
+   - develop
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore GPW.sln -verbosity quiet'  
@@ -156,8 +156,6 @@ ADM:deploy:
   - '& "$env:NUGET_PATH" restore GPW.sln -verbosity quiet'  
   - *version-fix
 script: 
-  #  # IIS 02
-  #  -  '& "$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=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Admin/GPW_Admin.csproj'
   # IIS PROD
   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS-PROD.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Admin/GPW_Admin.csproj'
 needs: ["ADM:build"]
@@ -173,8 +171,6 @@ COM:deploy:
   - '& "$env:NUGET_PATH" restore GPW.sln -verbosity quiet'  
   - *version-fix
 script: 
-  #  # IIS 02
-  #  -  '& "$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=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Commesse/GPW_Commesse.csproj'
   # IIS PROD
   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS-PROD.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Commesse/GPW_Commesse.csproj'
 needs: ["COM:build"]
@@ -183,21 +179,17 @@ BH:deploy:
 stage: deploy
 tags:
   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "master"'
+ only:
+   - master
+#  rules:
+#    - if: '$CI_COMMIT_BRANCH == "master"'
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore GPW.sln -verbosity quiet'  
   - *version-fix
- script: 
-   # ----BCode ----
-  #  # IIS 02
-  #  -  '& "$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=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Barcode/GPW_Barcode.csproj'
+ script:
   # IIS PROD
   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS-PROD.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Barcode/GPW_Barcode.csproj'
-    # ---- HOME ----
-  #  # IIS 02
-  #  -  '& "$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=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal HOME/HOME.csproj'
   # IIS PROD
   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS-PROD.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal HOME/HOME.csproj'
 needs: ["BH:build"]
@@ -206,16 +198,13 @@ Smart:deploy:
 stage: deploy
 tags:
   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "master"'
+ only:
+   - master
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore GPW.sln -verbosity quiet'  
   - *version-fix
- script: 
-   # ---- SMART ----
-  #  # IIS 02
-  #  -  '& "$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=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Smart/GPW_Smart.csproj'
+ script:
   # IIS PROD
   -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS-PROD.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Smart/GPW_Smart.csproj'
 needs: ["Smart:build"]
@@ -225,8 +214,8 @@ ADM:install:
 stage: installer
 tags:
   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "master"'
+ only:
+   - master
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore GPW.sln -verbosity quiet'  
@@ -240,8 +229,8 @@ COM:install:
 stage: installer
 tags:
   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "master"'
+ only:
+   - master
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore GPW.sln -verbosity quiet'  
@@ -255,9 +244,8 @@ BH:install:
 stage: installer
 tags:
   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "master"'
-    #  when: manual
+ only:
+   - master
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore GPW.sln -verbosity quiet'  
@@ -273,9 +261,8 @@ Smart:install:
 stage: installer
 tags:
   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "master"'
-    #  when: manual
+ only:
+   - master
 before_script:
   - *nuget-fix
   - '& "$env:NUGET_PATH" restore GPW.sln -verbosity quiet'  
@@ -7,7 +7,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
  <PropertyGroup>
    <WebPublishMethod>MSDeploy</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish>seriate.egalware.com/GPW/SMART</SiteUrlToLaunchAfterPublish>
-    <MSDeployServiceURL>https://seriate.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
+    <MSDeployServiceURL>https://office.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
    <DeployIisAppPath>seriate.egalware.com/GPW/SMART</DeployIisAppPath>
    <RemoteSitePhysicalPath />
    <SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>