From a774e0c904ea726230db9d4877a3664d033cedac Mon Sep 17 00:00:00 2001 From: Corentin LEMAIRE Date: Fri, 5 May 2023 13:30:39 +0200 Subject: [PATCH 1/6] Add .drone.yml and activated drone --- .drone.yml | 23 +++++++++++++++++++++++ Sources/Linaris/Linaris.csproj | 6 ++++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..0696232 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,23 @@ +kind: pipeline +type: docker +name: CI_Linaris_pipeline + +trigger: + event: + - push + +steps: + - name: build + image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dotnet7-maui:latest + commands: + - cd Sources/ + - dotnet restore Linaris.sln + - dotnet build Linaris.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 + - dotnet publish MyMauiApp/MyMauiApp.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk + - name: tests + image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dotnet7-maui:latest + commands: + - cd Sources/ + - dotnet restore Linaris.sln + - dotnet test Linaris.sln --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 + depends_on: [build] diff --git a/Sources/Linaris/Linaris.csproj b/Sources/Linaris/Linaris.csproj index bbcc06b..787cfe8 100644 --- a/Sources/Linaris/Linaris.csproj +++ b/Sources/Linaris/Linaris.csproj @@ -1,8 +1,10 @@  - net7.0-android;net7.0-ios;net7.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0 + net7.0-android + $(TargetFrameworks);net7.0-windows10.0.19041.0 + $(TargetFrameworks);net7.0-ios + $(TargetFrameworks);net7.0-maccatalyst Exe From 38ccaf6a270076535367948e8f863cfc067152cb Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Sat, 6 May 2023 09:09:58 +0200 Subject: [PATCH 2/6] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Sources/Connso?= =?UTF-8?q?le/Program.cs'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add line to build --- Sources/Connsole/Program.cs | 51 +++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/Sources/Connsole/Program.cs b/Sources/Connsole/Program.cs index fb87e4e..e568c3b 100644 --- a/Sources/Connsole/Program.cs +++ b/Sources/Connsole/Program.cs @@ -1,25 +1,26 @@ -using Model; - - -// See https://aka.ms/new-console-template for more information - -/*Album a = new Album("Adios Bahamas", "album1.jpg", "Népal"); -Album a1 = new Album("Fenêtre sur Rue", "album3.jpg", "HugoTSR"); -Album a2 = new Album("Dans la Légende", "album8.jpg", "PNL"); - -List lst = new List { a1, a2, a }; - -foreach (Album album in lst) -{ - Console.WriteLine($"Nom de l'album : " + album.Nom); - - Console.WriteLine($"Nom du fichier : " + album.File_Name); - - Console.WriteLine($"Artiste : " + album.Artiste); - - Console.WriteLine($"-------------------------"); -}*/ - - - - +using Model; + +Console.WriteLine("---"); + +// See https://aka.ms/new-console-template for more information + +/*Album a = new Album("Adios Bahamas", "album1.jpg", "Népal"); +Album a1 = new Album("Fenêtre sur Rue", "album3.jpg", "HugoTSR"); +Album a2 = new Album("Dans la Légende", "album8.jpg", "PNL"); + +List lst = new List { a1, a2, a }; + +foreach (Album album in lst) +{ + Console.WriteLine($"Nom de l'album : " + album.Nom); + + Console.WriteLine($"Nom du fichier : " + album.File_Name); + + Console.WriteLine($"Artiste : " + album.Artiste); + + Console.WriteLine($"-------------------------"); +}*/ + + + + From b238fadee6bf21984ec715f4952251e491efafc1 Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Sat, 6 May 2023 09:25:59 +0200 Subject: [PATCH 3/6] Update project name for Drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0696232..a6cb69c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,7 @@ steps: - cd Sources/ - dotnet restore Linaris.sln - dotnet build Linaris.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 - - dotnet publish MyMauiApp/MyMauiApp.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk + - dotnet publish Linaris/Linaris.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk - name: tests image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dotnet7-maui:latest commands: From d2886147316db3b332ec07cfd8f4629ccc1514b0 Mon Sep 17 00:00:00 2001 From: Corentin LEMAIRE Date: Sat, 6 May 2023 10:57:16 +0200 Subject: [PATCH 4/6] Activate SonarQube --- .drone.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.drone.yml b/.drone.yml index a6cb69c..1620d40 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,3 +21,21 @@ steps: - dotnet restore Linaris.sln - dotnet test Linaris.sln --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 depends_on: [build] + - name: code-inspection + image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dronesonarplugin-dotnet7-maui + secrets: [ SECRET_SONAR_LOGIN ] + environment: + sonar_host: https://codefirst.iut.uca.fr/sonar/ + sonar_token: + from_secret: SECRET_SONAR_LOGIN + project_key: Linaris_LEMAIRE_LABORIE + coverage_exclusions: "Tests/**" + commands: + - cd Sources/ + - dotnet restore Linaris.sln + - dotnet sonarscanner begin /k:$${project_key} /d:sonar.host.url=$${sonar_host} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.coverage.exclusions=$${coverage_exclusions} /d:sonar.login=$${sonar_token} + - dotnet build Linaris.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 + - dotnet test Linaris.sln --logger trx --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage" + - reportgenerator -reports:"**/coverage.cobertura.xml" -reporttypes:SonarQube -targetdir:"coveragereport" + - dotnet publish MauiApp/MauiApp.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk + - dotnet sonarscanner end /d:sonar.login=$${sonar_token} From c3e75af248bfb8f92635ae6273f92a48f96d81e3 Mon Sep 17 00:00:00 2001 From: Corentin LEMAIRE Date: Sat, 6 May 2023 11:00:52 +0200 Subject: [PATCH 5/6] Fix dependencies --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 1620d40..fb038e6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,3 +39,4 @@ steps: - reportgenerator -reports:"**/coverage.cobertura.xml" -reporttypes:SonarQube -targetdir:"coveragereport" - dotnet publish MauiApp/MauiApp.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk - dotnet sonarscanner end /d:sonar.login=$${sonar_token} + depends on: [tests] From eabc98da0a60863d25332bd5dc0ad7f86bc6702f Mon Sep 17 00:00:00 2001 From: Corentin LEMAIRE Date: Sat, 6 May 2023 11:08:16 +0200 Subject: [PATCH 6/6] Comment lines waiting for tests merge --- .drone.yml | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.drone.yml b/.drone.yml index fb038e6..172afe1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,29 +14,29 @@ steps: - dotnet restore Linaris.sln - dotnet build Linaris.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 - dotnet publish Linaris/Linaris.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk - - name: tests - image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dotnet7-maui:latest - commands: - - cd Sources/ - - dotnet restore Linaris.sln - - dotnet test Linaris.sln --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 - depends_on: [build] - - name: code-inspection - image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dronesonarplugin-dotnet7-maui - secrets: [ SECRET_SONAR_LOGIN ] - environment: - sonar_host: https://codefirst.iut.uca.fr/sonar/ - sonar_token: - from_secret: SECRET_SONAR_LOGIN - project_key: Linaris_LEMAIRE_LABORIE - coverage_exclusions: "Tests/**" - commands: - - cd Sources/ - - dotnet restore Linaris.sln - - dotnet sonarscanner begin /k:$${project_key} /d:sonar.host.url=$${sonar_host} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.coverage.exclusions=$${coverage_exclusions} /d:sonar.login=$${sonar_token} - - dotnet build Linaris.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 - - dotnet test Linaris.sln --logger trx --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage" - - reportgenerator -reports:"**/coverage.cobertura.xml" -reporttypes:SonarQube -targetdir:"coveragereport" - - dotnet publish MauiApp/MauiApp.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk - - dotnet sonarscanner end /d:sonar.login=$${sonar_token} - depends on: [tests] +# - name: tests +# image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dotnet7-maui:latest +# commands: +# - cd Sources/ +# - dotnet restore Linaris.sln +# - dotnet test Linaris.sln --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 +# depends_on: [build] +# - name: code-inspection +# image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dronesonarplugin-dotnet7-maui +# secrets: [ SECRET_SONAR_LOGIN ] +# environment: +# sonar_host: https://codefirst.iut.uca.fr/sonar/ +# sonar_token: +# from_secret: SECRET_SONAR_LOGIN +# project_key: Linaris_LEMAIRE_LABORIE +# coverage_exclusions: "Tests/**" +# commands: +# - cd Sources/ +# - dotnet restore Linaris.sln +# - dotnet sonarscanner begin /k:$${project_key} /d:sonar.host.url=$${sonar_host} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.coverage.exclusions=$${coverage_exclusions} /d:sonar.login=$${sonar_token} +# - dotnet build Linaris.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 +# - dotnet test Linaris.sln --logger trx --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage" +# - reportgenerator -reports:"**/coverage.cobertura.xml" -reporttypes:SonarQube -targetdir:"coveragereport" +# - dotnet publish MauiApp/MauiApp.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk +# - dotnet sonarscanner end /d:sonar.login=$${sonar_token} +# depends on: [tests]