From 2a1e72d5e10129f60afd809dba851d351b3dbdb0 Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@epita.fr>
Date: Wed, 5 Apr 2023 16:16:07 +0200
Subject: [PATCH] :green_heart: fix sonar deployment

---
 .drone.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0636abf..7789a7a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -35,25 +35,25 @@ steps:
       - dotnet test SAE-2.01.sln --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0
     depends_on: [ build ]
 
-#  - name: code-analysis
-#    image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dronesonarplugin-dotnet6
-#    commands:
-#      - cd MCTG/
-#      - dotnet restore CI-CD.sln
-#      - dotnet sonarscanner begin /k:gitrepotest /d:sonar.host.url=$${PLUGIN_SONAR_HOST} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.coverage.exclusions="Tests/**" /d:sonar.login=$${PLUGIN_SONAR_TOKEN} 
-#      - dotnet build CI-CD.sln -c Release --no-restore
-#      - dotnet test CI-CD.sln --logger trx --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage"
-#      - reportgenerator -reports:"**/coverage.cobertura.xml" -reporttypes:SonarQube -targetdir:"coveragereport"
-#      - dotnet publish CI-CD.sln -c Release --no-restore -o CI_PROJECT_DIR/build/release
-#      - dotnet sonarscanner end /d:sonar.login=$${PLUGIN_SONAR_TOKEN}
-#    secrets: [ SECRET_SONAR_LOGIN ]
-#    settings:
-#      # accessible en ligne de commande par ${PLUGIN_SONAR_HOST}
-#      sonar_host: https://codefirst.iut.uca.fr/sonar/
-#      # accessible en ligne de commande par ${PLUGIN_SONAR_TOKEN}
-#      sonar_token:
-#        from_secret: SECRET_SONAR_LOGIN
-#    depends_on: [ tests ]
+ - name: code-analysis
+   image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dronesonarplugin-dotnet7
+   commands:
+     - cd MCTG/
+     - dotnet restore MCTGApp/MCTGApp.csproj
+     - dotnet sonarscanner begin /k:gitrepotest /d:sonar.host.url=$${PLUGIN_SONAR_HOST} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.coverage.exclusions="Tests/**" /d:sonar.login=$${PLUGIN_SONAR_TOKEN} 
+     - dotnet build MCTGApp/MCTGApp.csproj -c Release --no-restore 
+     - dotnet test MCTGApp/MCTGApp.csproj --logger trx --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage"
+     - reportgenerator -reports:"**/coverage.cobertura.xml" -reporttypes:SonarQube -targetdir:"coveragereport"
+     - dotnet publish MCTGApp/MCTGApp.csproj -c Release --no-restore -o CI_PROJECT_DIR/build/release
+     - dotnet sonarscanner end /d:sonar.login=$${PLUGIN_SONAR_TOKEN}
+   secrets: [ SECRET_SONAR_LOGIN ]
+   settings:
+     # accessible en ligne de commande par ${PLUGIN_SONAR_HOST}
+     sonar_host: https://codefirst.iut.uca.fr/sonar/
+     # accessible en ligne de commande par ${PLUGIN_SONAR_TOKEN}
+     sonar_token:
+       from_secret: SECRET_SONAR_LOGIN
+   depends_on: [ tests ]
 
   - name: generate-and-deploy-docs
     image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-docdeployer