diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bed978c..2ed742e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -191,15 +191,15 @@ BH:deploy: - *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' - # IIS DEV - - '& "$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=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Barcode/GPW_Barcode.csproj' + # # 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' + # 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 DEV - - '& "$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=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal HOME/HOME.csproj' + # # 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"] Smart:deploy: @@ -214,10 +214,10 @@ Smart:deploy: - *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' - # IIS DEV - - '& "$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=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal GPW_Smart/GPW_Smart.csproj' + # # 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' + # 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"] # ------------------------------------ INSTALL ------------------------------------ diff --git a/GPW_Barcode/GPW_Barcode.csproj b/GPW_Barcode/GPW_Barcode.csproj index a60fe61..062e07e 100644 --- a/GPW_Barcode/GPW_Barcode.csproj +++ b/GPW_Barcode/GPW_Barcode.csproj @@ -514,6 +514,7 @@ + diff --git a/GPW_Barcode/GPW_Barcode.csproj.user b/GPW_Barcode/GPW_Barcode.csproj.user index 90c91e2..acec361 100644 --- a/GPW_Barcode/GPW_Barcode.csproj.user +++ b/GPW_Barcode/GPW_Barcode.csproj.user @@ -3,7 +3,7 @@ true ShowAllFiles - IIS02 + C:\Users\samuele.steamw\source\GPW\GPW_Barcode\Properties\PublishProfiles\IIS-PROD.pubxml diff --git a/GPW_Barcode/Properties/PublishProfiles/IIS-PROD.pubxml b/GPW_Barcode/Properties/PublishProfiles/IIS-PROD.pubxml index a942b6a..a7db2f4 100644 --- a/GPW_Barcode/Properties/PublishProfiles/IIS-PROD.pubxml +++ b/GPW_Barcode/Properties/PublishProfiles/IIS-PROD.pubxml @@ -6,40 +6,52 @@ by editing this MSBuild file. In order to learn more about this please visit htt MSDeploy - - https://iis03.egalware.com:8172/MsDeploy.axd - Default Web Site/GPW/BCODE + office.egalware.com/GPW/BCODE + https://office.egalware.com:8172/MsDeploy.axd + office.egalware.com/GPW/BCODE - False + false WMSVC jenkins - <_SavePWD>True + <_SavePWD>true - + - + + + + + + + + + + + Release Any CPU - True - False - True + true + false + true False - True - True - False + true + true + false DonotMerge + false + False diff --git a/GPW_Smart/GPW_Smart.csproj b/GPW_Smart/GPW_Smart.csproj index 72f5b0a..0d6363d 100644 --- a/GPW_Smart/GPW_Smart.csproj +++ b/GPW_Smart/GPW_Smart.csproj @@ -545,6 +545,7 @@ + diff --git a/GPW_Smart/GPW_Smart.csproj.user b/GPW_Smart/GPW_Smart.csproj.user index b4a663f..25a2d73 100644 --- a/GPW_Smart/GPW_Smart.csproj.user +++ b/GPW_Smart/GPW_Smart.csproj.user @@ -3,7 +3,7 @@ true ShowAllFiles - IISDEV + C:\Users\samuele.steamw\source\GPW\GPW_Smart\Properties\PublishProfiles\IIS-PROD.pubxml diff --git a/GPW_Smart/Properties/PublishProfiles/IIS-PROD.pubxml b/GPW_Smart/Properties/PublishProfiles/IIS-PROD.pubxml index 4ac1860..03db034 100644 --- a/GPW_Smart/Properties/PublishProfiles/IIS-PROD.pubxml +++ b/GPW_Smart/Properties/PublishProfiles/IIS-PROD.pubxml @@ -6,40 +6,52 @@ by editing this MSBuild file. In order to learn more about this please visit htt MSDeploy - - https://iis03.egalware.com:8172/MsDeploy.axd - Default Web Site/GPW/SMART + office.egalware.com/GPW/SMART + https://office.egalware.com:8172/MsDeploy.axd + office.egalware.com/GPW/SMART - False + false WMSVC jenkins - <_SavePWD>True + <_SavePWD>true - + - + + + + + + + + + + + Release Any CPU - True - False - True + true + false + true False - True - True - False + true + true + false DonotMerge + false + False