diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3fffdd88..88ebaaa0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -285,6 +285,24 @@ IOC:build:
script:
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
+RIOC:build:
+ stage: build
+ tags:
+ - win
+ variables:
+ APP_NAME: MP.RIOC
+ SOL_NAME: MP-RIOC
+ rules:
+ - if: $CI_COMMIT_BRANCH == 'develop'
+ - if: $CI_COMMIT_BRANCH == 'master'
+ - if: $CI_COMMIT_BRANCH =~ /^feature\/IOC.+/
+ when: always
+ before_script:
+ - *nuget-fix
+ - dotnet restore "$env:SOL_NAME.sln"
+ script:
+ - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
+
TAB3:build:
stage: build
tags:
@@ -350,8 +368,6 @@ LAND:SDK:deploy:
- '& "$env:NUGET_PATH" setapikey $NUGET_API_KEY -source http://nexus.steamware.net/repository/nuget-hosted'
- '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
-
-
PROG:IIS01:deploy:
stage: deploy
tags:
@@ -485,6 +501,25 @@ IOC:IIS01:deploy:
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+RIOC:IIS01:deploy:
+ stage: deploy
+ tags:
+ - win
+ variables:
+ APP_NAME: MP.RIOC
+ SOL_NAME: MP-RIOC
+ before_script:
+ - *nuget-fix
+ - dotnet restore "$env:SOL_NAME.sln"
+ rules:
+ - if: $CI_COMMIT_BRANCH == 'develop'
+ - if: $CI_COMMIT_BRANCH =~ /^feature\/IOC.+/
+ when: always
+ needs: ["RIOC:build"]
+ script:
+ - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
+ - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+
TAB3:IIS01:deploy:
stage: deploy
tags:
@@ -654,6 +689,24 @@ IOC:IIS03:deploy:
- dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+RIOC:IIS03:deploy:
+ stage: deploy
+ tags:
+ - win
+ variables:
+ APP_NAME: MP.RIOC
+ SOL_NAME: MP-RIOC
+ before_script:
+ - *nuget-fix
+ - dotnet restore "$env:SOL_NAME.sln"
+ rules:
+ - if: $CI_COMMIT_BRANCH == 'master'
+ needs: ["RIOC:build"]
+ script:
+ - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
+ - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+ - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
+
TAB3:IIS03:deploy:
stage: deploy
tags:
@@ -873,6 +926,28 @@ IOC:installer:
- *hashBuild
- *nexusUpload
+RIOC:installer:
+ stage: installer
+ tags:
+ - win
+ variables:
+ APP_NAME: MP.RIOC
+ SOL_NAME: MP-RIOC
+ NEXUS_PATH: MP-RIOC
+ before_script:
+ - *nuget-fix
+ - dotnet restore "$env:SOL_NAME.sln"
+ rules:
+ - if: $CI_COMMIT_BRANCH == 'master'
+ - if: $CI_COMMIT_BRANCH == 'develop'
+ needs: ["IOC:build"]
+ script:
+ - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
+ - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish -p:verbosity=quiet
+ # qui il deploy su nexus...
+ - *hashBuild
+ - *nexusUpload
+
# --------------------------------
# RELEASE (tags only + sdk)
# --------------------------------
@@ -897,7 +972,6 @@ LAND:release:
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
- dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj -p:verbosity=quiet
-
LAND:SDK:release:
stage: release
tags:
@@ -1067,3 +1141,24 @@ IOC:release:
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
- dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj -p:verbosity=quiet
+RIOC:release:
+ stage: release
+ tags:
+ - win
+ variables:
+ APP_NAME: MP.RIOC
+ SOL_NAME: MP-RIOC
+ NEXUS_PATH: MP-RIOC
+ before_script:
+ - *nuget-fix
+ - dotnet restore "$env:SOL_NAME.sln"
+ rules:
+ - if: $CI_COMMIT_TAG
+ needs: ["IOC:build"]
+ artifacts:
+ paths:
+ - publish/
+ script:
+ - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
+ - dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj -p:verbosity=quiet
+
diff --git a/MP-RIOC/MP.RIOC.csproj b/MP-RIOC/MP.RIOC.csproj
index ad2a6515..62b5640a 100644
--- a/MP-RIOC/MP.RIOC.csproj
+++ b/MP-RIOC/MP.RIOC.csproj
@@ -5,7 +5,7 @@
enable
enable
MP.RIOC
- 8.16.2605.811
+ 8.16.2605.812
diff --git a/MP-RIOC/Properties/PublishProfiles/IISProfile.pubxml b/MP-RIOC/Properties/PublishProfiles/IISProfile.pubxml
index f44ed1a0..43da778a 100644
--- a/MP-RIOC/Properties/PublishProfiles/IISProfile.pubxml
+++ b/MP-RIOC/Properties/PublishProfiles/IISProfile.pubxml
@@ -13,5 +13,8 @@
true
Default Web Site/MP/RIOC
<_TargetId>IISWebDeployPackage
+ net8.0
+ win-x64
+ false
\ No newline at end of file
diff --git a/MP-RIOC/Resources/ChangeLog.html b/MP-RIOC/Resources/ChangeLog.html
index 3c179208..f24ab287 100644
--- a/MP-RIOC/Resources/ChangeLog.html
+++ b/MP-RIOC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MP-RIOC
- Versione: 8.16.2605.811
+ Versione: 8.16.2605.812
Note di rilascio:
-
diff --git a/MP-RIOC/Resources/VersNum.txt b/MP-RIOC/Resources/VersNum.txt
index ddc2c22a..3ac974ab 100644
--- a/MP-RIOC/Resources/VersNum.txt
+++ b/MP-RIOC/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2605.811
+8.16.2605.812
diff --git a/MP-RIOC/Resources/manifest.xml b/MP-RIOC/Resources/manifest.xml
index bb27fee8..3cb930b3 100644
--- a/MP-RIOC/Resources/manifest.xml
+++ b/MP-RIOC/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2605.811
+ 8.16.2605.812
https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/MP.IOC.zip
https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/ChangeLog.html
false