From 2c62abdf73f9fe69f6107adb08e4a620444acc83 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 9 Jul 2022 18:21:04 +0200 Subject: [PATCH] ancora refresh yaml e versione WASM --- .gitlab-ci.yml | 114 ++++++++++++++++++- MP.Mon/MP.Mon.csproj | 2 +- MP.Mon/Resources/ChangeLog.html | 2 +- MP.Mon/Resources/VersNum.txt | 2 +- MP.Mon/Resources/manifest.xml | 2 +- MP.WASM.Mon/Server/.config/dotnet-tools.json | 5 + MP.WASM.Mon/Server/MP.WASM.Mon.Server.csproj | 2 + 7 files changed, 123 insertions(+), 6 deletions(-) create mode 100644 MP.WASM.Mon/Server/.config/dotnet-tools.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83019a4a..9d9847b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ variables: NEXUS_PATH: 'MP-STATS' + PROJ_PATH: '' APP_NAME: 'MP.Stats' SOL_NAME: 'MP-STATS' @@ -120,6 +121,20 @@ MON:build: script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj +WAMON:build: + stage: build + tags: + - win + variables: + PROJ_PATH: MP.WASM.Mon\Server + APP_NAME: MP.WASM.Mon.Server + SOL_NAME: MP-WAMON + before_script: + - *nuget-fix + - dotnet restore "$env:SOL_NAME.sln" + script: + - dotnet build $env:PROJ_PATH/$env:APP_NAME.csproj + LAND:test: stage: test tags: @@ -184,6 +199,23 @@ MON:test: script: - dotnet test $env:APP_NAME/$env:APP_NAME.csproj +WAMON:test: + stage: test + tags: + - win + variables: + PROJ_PATH: MP.WASM.Mon\Server + APP_NAME: MP.WASM.Mon.Server + SOL_NAME: MP-WAMON + before_script: + - *nuget-fix + - dotnet restore "$env:SOL_NAME.sln" + only: + - develop + needs: ["WAMON:build"] + script: + - dotnet test $env:PROJ_PATH/$env:APP_NAME.csproj + LAND:IIS01:deploy: stage: deploy tags: @@ -248,6 +280,23 @@ MON:IIS01:deploy: script: - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj +WAMON:IIS01:deploy: + stage: deploy + tags: + - win + variables: + PROJ_PATH: MP.WASM.Mon\Server + APP_NAME: MP.WASM.Mon.Server + SOL_NAME: MP-WAMON + before_script: + - *nuget-fix + - dotnet restore "$env:SOL_NAME.sln" + only: + - develop + needs: ["WAMON:test"] + script: + - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:PROJ_PATH/$env:APP_NAME.csproj + LAND:IIS02:deploy: stage: deploy tags: @@ -316,6 +365,24 @@ MON:IIS02:deploy: - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj +WAMON:IIS02:deploy: + stage: deploy + tags: + - win + variables: + PROJ_PATH: MP.WASM.Mon\Server + APP_NAME: MP.WASM.Mon.Server + SOL_NAME: MP-WAMON + before_script: + - *nuget-fix + - dotnet restore "$env:SOL_NAME.sln" + only: + - master + needs: ["WAMON:build"] + script: + - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:PROJ_PATH/$env:APP_NAME.csproj + - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true $env:PROJ_PATH/$env:APP_NAME.csproj + LAND:installer: stage: installer tags: @@ -400,6 +467,28 @@ MON:installer: - *hashBuild - *nexusUpload +WAMON:installer: + stage: installer + tags: + - win + variables: + PROJ_PATH: MP.WASM.Mon\Server + APP_NAME: MP.WASM.Mon.Server + SOL_NAME: MP-WAMON + NEXUS_PATH: MP-WAMON + before_script: + - *nuget-fix + - dotnet restore "$env:SOL_NAME.sln" + only: + - develop + - master + needs: ["WAMON:build"] + script: + - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:PROJ_PATH/$env:APP_NAME.csproj -o:publish + # qui il deploy su nexus... + - *hashBuild + - *nexusUpload + LAND:release: stage: release tags: @@ -484,8 +573,6 @@ MON:release: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" only: - #- feature/Deploy_CI_CD - # - master - tags except: - branches @@ -495,3 +582,26 @@ MON:release: - publish/ script: - dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj + +WAMON:release: + stage: release + tags: + - win + variables: + PROJ_PATH: MP.WASM.Mon\Server + APP_NAME: MP.WASM.Mon.Server + SOL_NAME: MP-WAMON + NEXUS_PATH: MP-WAMON + before_script: + - *nuget-fix + - dotnet restore "$env:SOL_NAME.sln" + only: + - tags + except: + - branches + needs: ["WAMON:build"] + artifacts: + paths: + - publish/ + script: + - dotnet publish -c Release -o ./publish $env:PROJ_PATH/$env:APP_NAME.csproj \ No newline at end of file diff --git a/MP.Mon/MP.Mon.csproj b/MP.Mon/MP.Mon.csproj index 1fa68856..86bed7b0 100644 --- a/MP.Mon/MP.Mon.csproj +++ b/MP.Mon/MP.Mon.csproj @@ -4,7 +4,7 @@ net6.0 enable enable - 6.15.2207.913 + 6.15.2207.915 diff --git a/MP.Mon/Resources/ChangeLog.html b/MP.Mon/Resources/ChangeLog.html index fea5159a..cc501073 100644 --- a/MP.Mon/Resources/ChangeLog.html +++ b/MP.Mon/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MON MAPO -

Versione: 6.15.2207.913

+

Versione: 6.15.2207.915


Note di rilascio: