From 5e6da5faa93bb2dd7b78e066695de072043e42b3 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 14 Apr 2022 13:05:25 +0200
Subject: [PATCH] Fix yaml fino a test

---
 .gitlab-ci.yml | 52 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70309984..2f44b201 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,13 +23,6 @@ variables:
       dotnet nuget add source https://nexus.steamware.net/repository/nuget-proxy-v3/index.json -n nexus-proxy-v3 -u nugetUser -p viaDante16 --store-password-in-clear-text
       echo "Has Source: $hasSource"
 
-#      $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 https://nexus.steamware.net/#repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`" -"
-#      } else {
-#         C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/#repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
-#      }
-
 # helper creazione hash files x IIS
 .hashBuild: &hashBuild
    - |
@@ -66,10 +59,8 @@ variables:
       }
       mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml
       mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html
-      
-
-# mCurl -v -u $env:NEXUS_USER:$env:NEXUS_PASSWD --upload-file bin/release/$env:APP_NAME.zip $env:NEXUS_SERVER/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip
 
+# Stages previsti
 stages:
   - build
   - test
@@ -129,36 +120,69 @@ MON:build:
   script:
     - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
 
-
 LAND:test:
   stage: test
   tags:
     - win
+  variables:
+    APP_NAME: MP.Land
+    SOL_NAME: MP-LAND
+  before_script:
+    - *nuget-fix
+    - dotnet restore "$env:SOL_NAME.sln"
   only:
     - develop
   needs: ["LAND:build"]
   script:
-    - dotnet test MP.Land/MP.Land.csproj
+    - dotnet test $env:APP_NAME/$env:APP_NAME.csproj
     
 PROG:test:
   stage: test
   tags:
     - win
+  variables:
+    APP_NAME: MP.Prog
+    SOL_NAME: MP-PROG
+  before_script:
+    - *nuget-fix
+    - dotnet restore "$env:SOL_NAME.sln"
   only:
     - develop
   needs: ["PROG:build"]
   script:
-    - dotnet test MP.Prog/MP.Prog.csproj
+    - dotnet test $env:APP_NAME/$env:APP_NAME.csproj
     
 STAT:test:
   stage: test
   tags:
     - win
+  variables:
+    APP_NAME: MP.Stats
+    SOL_NAME: MP-STATS
+  before_script:
+    - *nuget-fix
+    - dotnet restore "$env:SOL_NAME.sln"
   only:
     - develop
   needs: ["STAT:build"]
   script:
-    - dotnet test MP.Stats/MP.Stats.csproj
+    - dotnet test $env:APP_NAME/$env:APP_NAME.csproj
+
+MON:test:
+  stage: test
+  tags:
+    - win
+  variables:
+    APP_NAME: MP.Mon
+    SOL_NAME: MP-MON
+  before_script:
+    - *nuget-fix
+    - dotnet restore "$env:SOL_NAME.sln"
+  only:
+    - develop
+  needs: ["MON:build"]
+  script:
+    - dotnet test $env:APP_NAME/$env:APP_NAME.csproj
 
 LAND:IIS01:deploy:
   stage: deploy