From 2416746b15842a2af386e5c9e274603e783e68f4 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 18:12:42 +0200 Subject: [PATCH 01/16] update x puntamento a file sln --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7be988..152778c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,7 +100,7 @@ WebLCP:build: APP_NAME: WebLCP before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' + - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' - *version-fix script: - '& "$env:MSBUILD_PATH" INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' @@ -117,7 +117,7 @@ WebLCP:build: # - master # before_script: # - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' +# - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' @@ -135,7 +135,7 @@ WebLCP:build: # - master # before_script: # - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' +# - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' # - *version-fix # script: # - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' @@ -153,7 +153,7 @@ WebLCP:build: # - master # before_script: # - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' +# - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' # - *version-fix # script: # - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' @@ -171,7 +171,7 @@ WebLCP:build: # - master # before_script: # - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' +# - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' # - *version-fix # - *manifest-fix # script: From 882aac25e7e2753baadd62fe45cbd83083c94f50 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 18:14:07 +0200 Subject: [PATCH 02/16] Cambio passo restore --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 152778c..d7be988 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,7 +100,7 @@ WebLCP:build: APP_NAME: WebLCP before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' + - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' - *version-fix script: - '& "$env:MSBUILD_PATH" INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' @@ -117,7 +117,7 @@ WebLCP:build: # - master # before_script: # - *nuget-fix -# - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' +# - '& "$env:NUGET_PATH" restore $env:SOL_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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' @@ -135,7 +135,7 @@ WebLCP:build: # - master # before_script: # - *nuget-fix -# - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' +# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' # - *version-fix # script: # - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' @@ -153,7 +153,7 @@ WebLCP:build: # - master # before_script: # - *nuget-fix -# - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' +# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' # - *version-fix # script: # - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' @@ -171,7 +171,7 @@ WebLCP:build: # - master # before_script: # - *nuget-fix -# - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' +# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' # - *version-fix # - *manifest-fix # script: From 0d29f44c9df463e9be636ee7c80244684775d35d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 18:18:30 +0200 Subject: [PATCH 03/16] test echo restore nuget --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7be988..ac6f9c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,6 +100,7 @@ WebLCP:build: APP_NAME: WebLCP before_script: - *nuget-fix + - '& echo "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' - *version-fix script: From d539e69d2da9e1be6050f1c5df3144f562b6c556 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 18:24:06 +0200 Subject: [PATCH 04/16] cambio sintassi --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac6f9c9..6b25072 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ variables: NEW_REL: '' NEXUS_PATH: 'WebLCP' APP_NAME: 'WebLCP' - SOL_NAME: 'INTERFACE\WebLCP' + SOL_NAME: 'WebLCP' APP_CONF: 'Release' PROJ_NAME: 'WebLCP' @@ -100,8 +100,9 @@ WebLCP:build: APP_NAME: WebLCP before_script: - *nuget-fix - - '& echo "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' - - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' + - '& echo "$env:NUGET_PATH" restore "INTERFACE\$env:SOL_NAME.sln" -Verbosity quiet' + - '& "$env:NUGET_PATH" restore "INTERFACE\$env:SOL_NAME.sln"' +# - '& "$env:NUGET_PATH" restore "INTERFACE\$env:SOL_NAME.sln" -Verbosity quiet' - *version-fix script: - '& "$env:MSBUILD_PATH" INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' From ee03463ff9bb284d1e51b1f5bef601ef045be764 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 18:26:41 +0200 Subject: [PATCH 05/16] Fix step version-fix --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b25072..bfaa139 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ variables: .version-fix: &version-fix - | # Esecuzione fix numero versione x pack nuget - $fileName = ".\VersGen\VersGen.cs"; + $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" @@ -100,9 +100,8 @@ WebLCP:build: APP_NAME: WebLCP before_script: - *nuget-fix - - '& echo "$env:NUGET_PATH" restore "INTERFACE\$env:SOL_NAME.sln" -Verbosity quiet' - - '& "$env:NUGET_PATH" restore "INTERFACE\$env:SOL_NAME.sln"' -# - '& "$env:NUGET_PATH" restore "INTERFACE\$env:SOL_NAME.sln" -Verbosity quiet' + # - '& echo "$env:NUGET_PATH" restore "INTERFACE\$env:SOL_NAME.sln" -Verbosity quiet' + - '& "$env:NUGET_PATH" restore "INTERFACE\$env:SOL_NAME.sln" -Verbosity quiet' - *version-fix script: - '& "$env:MSBUILD_PATH" INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' From 725123ac283ba305c71a005dee64318456f9b560 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 18:29:36 +0200 Subject: [PATCH 06/16] correzione x fix versione + inizio primo step --- .gitlab-ci.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfaa139..a5d2d0b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ variables: .version-fix: &version-fix - | # Esecuzione fix numero versione x pack nuget - $fileName = ".INTERFACE\VersGen\VersGen.cs"; + $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" @@ -106,23 +106,23 @@ WebLCP:build: script: - '& "$env:MSBUILD_PATH" INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' -# WebLCP:IIS01:deploy: -# stage: deploy -# tags: -# - win -# variables: -# APP_NAME: WebLCP -# except: -# refs: -# - main -# - master -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' -# needs: ["WebLCP:build"] +WebLCP:IIS01:deploy: + stage: deploy + tags: + - win + variables: + APP_NAME: WebLCP + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore $env:SOL_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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' + needs: ["WebLCP:build"] # WebLCP:IIS02:deploy: # stage: deploy From e9b32b25ad3839a5e3781a8800994f07e90133ff Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 18:50:03 +0200 Subject: [PATCH 07/16] update test deploy IIS01 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5d2d0b..f521b22 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,7 +118,7 @@ WebLCP:IIS01:deploy: - master before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' + - '& "$env:NUGET_PATH" restore INTERFACE\$env:SOL_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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' From 04b36cc50f8734fa361c27ee30ad9798b8acc5a0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 18:58:26 +0200 Subject: [PATCH 08/16] fix yaml x versione base 0.0.0.0 --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f521b22..b863f03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ variables: echo "New vers: $env:NEW_REL" # aggiorno file $contenuto = Get-Content -path $fileName -Raw - $newContenuto = $contenuto -replace '1.0.0.0', $env:NEW_REL + $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL $newContenuto | Set-Content -path $fileName @@ -44,7 +44,7 @@ variables: $contenuto = Get-Content -path $fileName -Raw $newContenuto = $contenuto -replace '{{BRANCHNAME}}', $CI_COMMIT_BRANCH $newContenuto = $newContenuto -replace '{{PACKNAME}}', $env:APP_NAME - $newContenuto = $newContenuto -replace '1.0.0.0', $env:NEW_REL + $newContenuto = $newContenuto -replace '0.0.0.0', $env:NEW_REL $newContenuto | Set-Content -path $fileName # helper creazione hash files @@ -100,8 +100,7 @@ WebLCP:build: APP_NAME: WebLCP before_script: - *nuget-fix - # - '& echo "$env:NUGET_PATH" restore "INTERFACE\$env:SOL_NAME.sln" -Verbosity quiet' - - '& "$env:NUGET_PATH" restore "INTERFACE\$env:SOL_NAME.sln" -Verbosity quiet' + - '& "$env:NUGET_PATH" restore INTERFACE\$env:SOL_NAME.sln -Verbosity quiet' - *version-fix script: - '& "$env:MSBUILD_PATH" INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' From b91784dc07e36022f2925f3fc29a03bf52ad2f06 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 19:10:27 +0200 Subject: [PATCH 09/16] Aggiunto IIS03 --- .gitlab-ci.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b863f03..10781a7 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.8' + VERS_MAIN: '1.1' NEW_REL: '' NEXUS_PATH: 'WebLCP' APP_NAME: 'WebLCP' @@ -104,7 +104,7 @@ WebLCP:build: - *version-fix script: - '& "$env:MSBUILD_PATH" INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m' - + WebLCP:IIS01:deploy: stage: deploy tags: @@ -135,29 +135,29 @@ WebLCP:IIS01:deploy: # - master # before_script: # - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' +# - '& "$env:NUGET_PATH" restore INTERFACE\$env:SOL_NAME.sln -Verbosity quiet' # - *version-fix # script: # - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' # needs: ["WebLCP:build"] -# WebLCP:IIS03:deploy: -# stage: deploy -# tags: -# - win -# variables: -# APP_NAME: WebLCP -# except: -# refs: -# - main -# - master -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' -# needs: ["WebLCP:build"] +WebLCP:IIS03:deploy: + stage: deploy + tags: + - win + variables: + APP_NAME: WebLCP + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore INTERFACE\$env:SOL_NAME.sln -Verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' + needs: ["WebLCP:build"] # WebLCP:File:release: # stage: release From fd46c0997fc9c7fe5fc9694712e81e2d88677b8c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 19:15:46 +0200 Subject: [PATCH 10/16] Aggiunta profilo pub IIS03 --- .../Properties/PublishProfiles/IIS01.pubxml | 32 +++++++---- .../PublishProfiles/IIS01.pubxml.user | 11 ++++ .../Properties/PublishProfiles/IIS02.pubxml | 2 +- .../Properties/PublishProfiles/IIS03.pubxml | 56 +++++++++++++++++++ .../PublishProfiles/IIS03.pubxml.user | 12 ++++ INTERFACE/WebLCP/WebLCP.csproj | 1 + 6 files changed, 103 insertions(+), 11 deletions(-) create mode 100644 INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml.user create mode 100644 INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml create mode 100644 INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml.user diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml index f410476..f460b51 100644 --- a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml +++ b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml @@ -9,20 +9,16 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere Release Any CPU - True - True - https://IIS01:8172/MsDeploy.axd + true + true + https://IIS01.egalware.com:8172/MsDeploy.axd Default Web Site/test/admodelling - False + false WMSVC - True + true jenkins - <_SavePWD>True - True - True - False - DonotMerge + <_SavePWD>true @@ -35,10 +31,26 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere + + + + + + + + + + + false + true + true + false + DonotMerge + \ No newline at end of file diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml.user b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml.user new file mode 100644 index 0000000..7e5fd8e --- /dev/null +++ b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml.user @@ -0,0 +1,11 @@ + + + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAw3dMMgC4FUywyOTV2xvCRgAAAAACAAAAAAADZgAAwAAAABAAAACqz61eFABC7Z0nZDkIfKLEAAAAAASAAACgAAAAEAAAAOOVTONyROIv3qv5NUgkUG0YAAAA8focwB3llJYom640+E26KQCGKQTMo1FiFAAAACK1ThI8VA3UgJSTYYUEWu872i0r + + \ No newline at end of file diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS02.pubxml b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS02.pubxml index 45c28a7..db19e69 100644 --- a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS02.pubxml +++ b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS02.pubxml @@ -11,7 +11,7 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere True True - https://IIS02:8172/MsDeploy.axd + https://IIS02.egalware.com:8172/MsDeploy.axd Default Web Site/test/admodelling False diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml new file mode 100644 index 0000000..ec1d8c4 --- /dev/null +++ b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml @@ -0,0 +1,56 @@ + + + + + MSDeploy + Release + Any CPU + + true + true + https://IIS03.egalware.com:8172/MsDeploy.axd + Default Web Site/test/admodelling + + false + WMSVC + true + jenkins + <_SavePWD>true + + + + + + + + + + + + + + + + + + + + + + + + + true + true + false + DonotMerge + false + + + + + + \ No newline at end of file diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml.user b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml.user new file mode 100644 index 0000000..2293972 --- /dev/null +++ b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml.user @@ -0,0 +1,12 @@ + + + + + + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAw3dMMgC4FUywyOTV2xvCRgAAAAACAAAAAAADZgAAwAAAABAAAACjK1seF/paDih2PkHapZ1jAAAAAASAAACgAAAAEAAAAA1xaLKwBK4kP1MYjXUzIvIYAAAAVf0fteP0ALedvTr6fAUcTljYbVJfxdCPFAAAAE2MYa1jKF852B93cQ97uNkFmS+a + True|2022-04-11T17:14:17.9390616Z; + + \ No newline at end of file diff --git a/INTERFACE/WebLCP/WebLCP.csproj b/INTERFACE/WebLCP/WebLCP.csproj index c43b91d..51f868e 100644 --- a/INTERFACE/WebLCP/WebLCP.csproj +++ b/INTERFACE/WebLCP/WebLCP.csproj @@ -303,6 +303,7 @@ + From 8a600114d05ec35ee402b0959f4fc2efe8bfcf96 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 19:17:20 +0200 Subject: [PATCH 11/16] completato deploy su IIS01/02/03 --- .gitlab-ci.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10781a7..03e80e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,23 +123,23 @@ WebLCP:IIS01:deploy: - '& "$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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' needs: ["WebLCP:build"] -# WebLCP:IIS02:deploy: -# stage: deploy -# tags: -# - win -# variables: -# APP_NAME: WebLCP -# except: -# refs: -# - main -# - master -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore INTERFACE\$env:SOL_NAME.sln -Verbosity quiet' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' -# needs: ["WebLCP:build"] +WebLCP:IIS02:deploy: + stage: deploy + tags: + - win + variables: + APP_NAME: WebLCP + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore INTERFACE\$env:SOL_NAME.sln -Verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' + needs: ["WebLCP:build"] WebLCP:IIS03:deploy: stage: deploy From 21412c6f85e2c9b40a56e892dfb2a359433c6ae1 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 19:26:40 +0200 Subject: [PATCH 12/16] Modifica x creazione ZIP + test slash --- .gitlab-ci.yml | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03e80e0..4274a0c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -153,29 +153,46 @@ WebLCP:IIS03:deploy: - master before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore INTERFACE\$env:SOL_NAME.sln -Verbosity quiet' + - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' - *version-fix script: - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' needs: ["WebLCP:build"] -# WebLCP:File:release: + +# WebLCP:OVH:release: # stage: release # tags: # - win -# variables: -# APP_NAME: WebLCP # only: # refs: # - main # - master # before_script: # - *nuget-fix -# - '& "$env:NUGET_PATH" restore $env:SOL_NAME.sln -Verbosity quiet' +# - '& "$env:NUGET_PATH" restore INTERFACE/$env:APP_NAME.sln -Verbosity quiet' # - *version-fix -# - *manifest-fix -# script: -# - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Package /p:PublishProfile=FileExport.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:PackageLocation=Release/$env:APP_NAME.zip /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' -# - *hashBuild -# - *nexusUpload +# script: +# - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=OVH-PROD.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=steamware /p:Password=viaD@nte16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' # needs: ["WebLCP:build"] + +WebLCP:File:release: + stage: release + tags: + - win + variables: + APP_NAME: WebLCP + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' + - *version-fix + - *manifest-fix + script: + - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Package /p:PublishProfile=FileExport.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:PackageLocation=Release/$env:APP_NAME.zip /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' + - *hashBuild + - *nexusUpload + needs: ["WebLCP:build"] From 27531128290519bb20699b23610f0ed3ec487bf3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 19:30:24 +0200 Subject: [PATCH 13/16] Aggiunta componenti x deploy nexus --- .gitlab-ci.yml | 7 +++---- Resources/ChangeLog.html | 28 ++++++++++++++++++++++++++++ Resources/logoSteamware.png | Bin 0 -> 3402 bytes Resources/manifest.xml | 7 +++++++ 4 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 Resources/ChangeLog.html create mode 100644 Resources/logoSteamware.png create mode 100644 Resources/manifest.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4274a0c..348bb43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,6 @@ variables: $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL $newContenuto | Set-Content -path $fileName - # helper x fix manifest xml .manifest-fix: &manifest-fix - | @@ -78,7 +77,7 @@ variables: { $version = "unstable" } - $File2Send = Get-ChildItem("$env:APP_NAME\Release\*") + $File2Send = Get-ChildItem("INTERFACE\$env:APP_NAME\Release\*") ForEach ($File in $File2Send) { $FileName = Split-path $File -leaf mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/$FileName @@ -117,7 +116,7 @@ WebLCP:IIS01:deploy: - master before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore INTERFACE\$env:SOL_NAME.sln -Verbosity quiet' + - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' @@ -135,7 +134,7 @@ WebLCP:IIS02:deploy: - master before_script: - *nuget-fix - - '& "$env:NUGET_PATH" restore INTERFACE\$env:SOL_NAME.sln -Verbosity quiet' + - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' - *version-fix script: - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html new file mode 100644 index 0000000..ba3680c --- /dev/null +++ b/Resources/ChangeLog.html @@ -0,0 +1,28 @@ + + Server gestioen devices TAB per MAPO/MoonPro +

Versione: {{CURRENT-REL}}

+
+ Note di rilascio: +
    +
  • + Ultime modifiche: +
      {{LAST-CHANGES}}
    +
    • +
  • + v.1.7.* → +
      +
    • Integrazione sistemi di AutoUpdate
      • +
    • Auto Approvazione
      • +
    +
    • +
+
+
+ +
+ +
+ + \ No newline at end of file diff --git a/Resources/logoSteamware.png b/Resources/logoSteamware.png new file mode 100644 index 0000000000000000000000000000000000000000..0958b50a1ee7f6a934e26cf55e2335d4cea6aa82 GIT binary patch literal 3402 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 literal 0 HcmV?d00001 diff --git a/Resources/manifest.xml b/Resources/manifest.xml new file mode 100644 index 0000000..87b774b --- /dev/null +++ b/Resources/manifest.xml @@ -0,0 +1,7 @@ + + + 0.0.0.0 + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/LAST/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/LAST/ChangeLog.html + false + \ No newline at end of file From 60ca965dad37df0bc56ac3a25f32df460d4b7e46 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 19:34:46 +0200 Subject: [PATCH 14/16] Aggiunta fileExport pubxml --- .../PublishProfiles/FileExport.pubxml | 22 +++++++++++++++++++ .../PublishProfiles/IIS01.pubxml.user | 11 ---------- .../PublishProfiles/IIS03.pubxml.user | 12 ---------- 3 files changed, 22 insertions(+), 23 deletions(-) create mode 100644 INTERFACE/WebLCP/Properties/PublishProfiles/FileExport.pubxml delete mode 100644 INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml.user delete mode 100644 INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml.user diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/FileExport.pubxml b/INTERFACE/WebLCP/Properties/PublishProfiles/FileExport.pubxml new file mode 100644 index 0000000..f2575a3 --- /dev/null +++ b/INTERFACE/WebLCP/Properties/PublishProfiles/FileExport.pubxml @@ -0,0 +1,22 @@ + + + + + Package + Release + Any CPU + + true + WebLCP/Release/WebLCP.zip + true + Default Web Site/WebLCP + true + true + true + false + DonotMerge + + \ No newline at end of file diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml.user b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml.user deleted file mode 100644 index 7e5fd8e..0000000 --- a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS01.pubxml.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAw3dMMgC4FUywyOTV2xvCRgAAAAACAAAAAAADZgAAwAAAABAAAACqz61eFABC7Z0nZDkIfKLEAAAAAASAAACgAAAAEAAAAOOVTONyROIv3qv5NUgkUG0YAAAA8focwB3llJYom640+E26KQCGKQTMo1FiFAAAACK1ThI8VA3UgJSTYYUEWu872i0r - - \ No newline at end of file diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml.user b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml.user deleted file mode 100644 index 2293972..0000000 --- a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml.user +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAw3dMMgC4FUywyOTV2xvCRgAAAAACAAAAAAADZgAAwAAAABAAAACjK1seF/paDih2PkHapZ1jAAAAAASAAACgAAAAEAAAAA1xaLKwBK4kP1MYjXUzIvIYAAAAVf0fteP0ALedvTr6fAUcTljYbVJfxdCPFAAAAE2MYa1jKF852B93cQ97uNkFmS+a - True|2022-04-11T17:14:17.9390616Z; - - \ No newline at end of file From 4076bbfec9cf0569da458578c2cc11fc330aac61 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 19:40:46 +0200 Subject: [PATCH 15/16] Test pubblicazione OVH --- .gitlab-ci.yml | 88 +++++++++---------- .../Properties/PublishProfiles/IIS03.pubxml | 2 +- .../Properties/PublishProfiles/OVH.pubxml | 2 +- INTERFACE/WebLCP/WebLCP.csproj | 1 + 4 files changed, 47 insertions(+), 46 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 348bb43..abb8aee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,66 +122,66 @@ WebLCP:IIS01:deploy: - '& "$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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' needs: ["WebLCP:build"] -WebLCP:IIS02:deploy: - stage: deploy - tags: - - win - variables: - APP_NAME: WebLCP - except: - refs: - - main - - master - before_script: - - *nuget-fix - - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' - - *version-fix - script: - - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' - needs: ["WebLCP:build"] - -WebLCP:IIS03:deploy: - stage: deploy - tags: - - win - variables: - APP_NAME: WebLCP - except: - refs: - - main - - master - before_script: - - *nuget-fix - - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' - - *version-fix - script: - - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' - needs: ["WebLCP:build"] - - -# WebLCP:OVH:release: -# stage: release +# WebLCP:IIS02:deploy: +# stage: deploy # tags: # - win -# only: +# variables: +# APP_NAME: WebLCP +# except: # refs: # - main # - master # before_script: # - *nuget-fix -# - '& "$env:NUGET_PATH" restore INTERFACE/$env:APP_NAME.sln -Verbosity quiet' +# - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' # - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=OVH-PROD.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=steamware /p:Password=viaD@nte16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' +# script: +# - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' # needs: ["WebLCP:build"] +# WebLCP:IIS03:deploy: +# stage: deploy +# tags: +# - win +# variables: +# APP_NAME: WebLCP +# except: +# refs: +# - main +# - master +# before_script: +# - *nuget-fix +# - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' +# - *version-fix +# script: +# - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' +# needs: ["WebLCP:build"] + + +WebLCP:OVH:release: + stage: release + tags: + - win + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore INTERFACE/$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=OVH.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=steamware /p:Password=viaD@nte16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' + needs: ["WebLCP:build"] + WebLCP:File:release: stage: release tags: - win variables: APP_NAME: WebLCP - except: + only: refs: - main - master diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml index ec1d8c4..126c9d1 100644 --- a/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml +++ b/INTERFACE/WebLCP/Properties/PublishProfiles/IIS03.pubxml @@ -43,11 +43,11 @@ modificando il file MSBuild. Per altre informazioni su questo argomento, vedere + false true true false DonotMerge - false diff --git a/INTERFACE/WebLCP/Properties/PublishProfiles/OVH.pubxml b/INTERFACE/WebLCP/Properties/PublishProfiles/OVH.pubxml index 9bbd177..f4e6934 100644 --- a/INTERFACE/WebLCP/Properties/PublishProfiles/OVH.pubxml +++ b/INTERFACE/WebLCP/Properties/PublishProfiles/OVH.pubxml @@ -14,7 +14,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt https://172.16.0.214:8172/MsDeploy.axd admodelling.org - False + true WMSVC True steamware diff --git a/INTERFACE/WebLCP/WebLCP.csproj b/INTERFACE/WebLCP/WebLCP.csproj index 51f868e..bedf4cb 100644 --- a/INTERFACE/WebLCP/WebLCP.csproj +++ b/INTERFACE/WebLCP/WebLCP.csproj @@ -302,6 +302,7 @@ DS_App.xsd + From da447bbc1e2af597f06e7e93a0a5a92029606d54 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 11 Apr 2022 19:41:35 +0200 Subject: [PATCH 16/16] Fix finale x corretto ramo di deploy in PROD OVH --- .gitlab-ci.yml | 70 +++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abb8aee..7087d8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,48 +122,48 @@ WebLCP:IIS01:deploy: - '& "$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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' needs: ["WebLCP:build"] -# WebLCP:IIS02:deploy: -# stage: deploy -# tags: -# - win -# variables: -# APP_NAME: WebLCP -# except: -# refs: -# - main -# - master -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' -# needs: ["WebLCP:build"] +WebLCP:IIS02:deploy: + stage: deploy + tags: + - win + variables: + APP_NAME: WebLCP + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' + needs: ["WebLCP:build"] -# WebLCP:IIS03:deploy: -# stage: deploy -# tags: -# - win -# variables: -# APP_NAME: WebLCP -# except: -# refs: -# - main -# - master -# before_script: -# - *nuget-fix -# - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' -# - *version-fix -# script: -# - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' -# needs: ["WebLCP:build"] +WebLCP:IIS03:deploy: + stage: deploy + tags: + - win + variables: + APP_NAME: WebLCP + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore INTERFACE/$env:SOL_NAME.sln -Verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" /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 INTERFACE/$env:APP_NAME/$env:APP_NAME.csproj' + needs: ["WebLCP:build"] WebLCP:OVH:release: stage: release tags: - win - except: + only: refs: - main - master