From ce55d7488deab187effaeafb523f3438559ab72b Mon Sep 17 00:00:00 2001 From: loobry Date: Sat, 6 May 2023 08:55:33 +0200 Subject: [PATCH 01/12] Branche Ci --- Sources/Model/Carte.cs | 27 +++++++++++++++++++++++++++ Sources/Model/Class1.cs | 26 ++++++++++++-------------- 2 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 Sources/Model/Carte.cs diff --git a/Sources/Model/Carte.cs b/Sources/Model/Carte.cs new file mode 100644 index 0000000..5e2fcfe --- /dev/null +++ b/Sources/Model/Carte.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model +{ + public class Carte + { + private string prix; + private string description; + private string pouvoir; + private string strategies; + private int note; + private string lienImage; + public Carte(string nom, string description, string pouvoir, string strategies, int note, string lienimage) + { + this.prix = nom; + this.description = description; + this.pouvoir = pouvoir; + this.strategies = strategies; + this.note = note; + this.lienImage = lienimage; + } + } +} diff --git a/Sources/Model/Class1.cs b/Sources/Model/Class1.cs index c9dd8cb..d5428ff 100644 --- a/Sources/Model/Class1.cs +++ b/Sources/Model/Class1.cs @@ -1,14 +1,12 @@ - - -using System Text; -using System Threading Tasks; - - -namespace Model -{ - public interface IDataManager - { - IEnumerable RecupererGroupe(); - IEnumerable RecupererEtudiant(); - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model +{ + internal class Class1 + { + } +} From 07047182a932b13b4027a7d866143f2863310c7a Mon Sep 17 00:00:00 2001 From: loobry Date: Sat, 6 May 2023 09:11:28 +0200 Subject: [PATCH 02/12] done yml --- .drone.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..3c6688f --- /dev/null +++ b/.drone.yml @@ -0,0 +1,7 @@ +kind: pipeline +type: docker +name: myFirstPipeline + +trigger: + event: + - push \ No newline at end of file From 6a7176d7ac3a4764fdcf15f784bf9ead6ec8f8d9 Mon Sep 17 00:00:00 2001 From: loobry Date: Sat, 6 May 2023 09:22:05 +0200 Subject: [PATCH 03/12] drone yml event push --- .drone.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3c6688f..857aa73 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,4 +4,12 @@ name: myFirstPipeline trigger: event: - - push \ No newline at end of file + - push + +steps: + - name: build + image: mcr.microsoft.com/dotnet/sdk:7.0 + commands: + - cd Sources/ + - dotnet restore MauiApp.sln + - dotnet build MauiApp.sln -c Release --no-restore \ No newline at end of file From 3c0f6d55f9633f97c0b947d7d7f121d6d4729fc4 Mon Sep 17 00:00:00 2001 From: loobry Date: Sat, 6 May 2023 09:24:29 +0200 Subject: [PATCH 04/12] drone yml event push fix --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 857aa73..c7d1571 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ trigger: steps: - name: build image: mcr.microsoft.com/dotnet/sdk:7.0 - commands: + commands: - cd Sources/ - - dotnet restore MauiApp.sln - - dotnet build MauiApp.sln -c Release --no-restore \ No newline at end of file + - dotnet restore MySolution.sln + - dotnet build MySolution.sln -c Release --no-restore \ No newline at end of file From 563040f940b49076ea82bc60cc17fdc80e6ddb04 Mon Sep 17 00:00:00 2001 From: loobry Date: Sat, 6 May 2023 09:30:41 +0200 Subject: [PATCH 05/12] drone yml event push commands --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index c7d1571..81f0099 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,5 +11,5 @@ steps: image: mcr.microsoft.com/dotnet/sdk:7.0 commands: - cd Sources/ - - dotnet restore MySolution.sln - - dotnet build MySolution.sln -c Release --no-restore \ No newline at end of file + - dotnet restore MauiApp1.sln + - dotnet build MauiApp1.sln -c Release --no-restore \ No newline at end of file From bbf47f810ce3194d3d845e9beb7fd70316d9f9e0 Mon Sep 17 00:00:00 2001 From: loobry Date: Sat, 6 May 2023 09:49:24 +0200 Subject: [PATCH 06/12] nouvelle image drone yml --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 81f0099..4545577 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ trigger: steps: - name: build - image: mcr.microsoft.com/dotnet/sdk:7.0 + image: mcr.microsoft.com/dotnet/maui/sdk:7.0 commands: - cd Sources/ - dotnet restore MauiApp1.sln From 2babd2efc414814f1ece66b6718714754143b360 Mon Sep 17 00:00:00 2001 From: loobry Date: Sat, 6 May 2023 10:05:14 +0200 Subject: [PATCH 07/12] drone yml new image --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4545577..6c8a705 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ trigger: steps: - name: build - image: mcr.microsoft.com/dotnet/maui/sdk:7.0 + image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dotnet7-maui:latest commands: - cd Sources/ - dotnet restore MauiApp1.sln From 806ad00cb08a372252b234e25ee5454f48af05a7 Mon Sep 17 00:00:00 2001 From: Loris OBRY Date: Wed, 10 May 2023 08:35:01 +0200 Subject: [PATCH 08/12] modification csproj pour build android --- Sources/MauiApp1/MauiApp1.csproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Sources/MauiApp1/MauiApp1.csproj b/Sources/MauiApp1/MauiApp1.csproj index 9f2b5e1..5755a47 100644 --- a/Sources/MauiApp1/MauiApp1.csproj +++ b/Sources/MauiApp1/MauiApp1.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 5b7614a893c91f0e8902f9d59fedba6ef7173e51 Mon Sep 17 00:00:00 2001 From: Loris OBRY Date: Wed, 10 May 2023 08:58:27 +0200 Subject: [PATCH 09/12] modification csproj --- Sources/MauiApp1/MauiApp1.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/Sources/MauiApp1/MauiApp1.csproj b/Sources/MauiApp1/MauiApp1.csproj index 5755a47..8359689 100644 --- a/Sources/MauiApp1/MauiApp1.csproj +++ b/Sources/MauiApp1/MauiApp1.csproj @@ -31,7 +31,6 @@ 10.0.17763.0 6.5 - From fc51866c0aea57e8a2e1b4681a1917f789b3923a Mon Sep 17 00:00:00 2001 From: Loris OBRY Date: Wed, 10 May 2023 09:36:24 +0200 Subject: [PATCH 10/12] yml publish --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 6c8a705..62e143c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,4 +12,5 @@ steps: commands: - cd Sources/ - dotnet restore MauiApp1.sln - - dotnet build MauiApp1.sln -c Release --no-restore \ No newline at end of file + - dotnet build MauiApp1.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 + - dotnet publish MauiApp1.sln -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk \ No newline at end of file From 4589093234149388ae33df7a056ed0f05e0a2462 Mon Sep 17 00:00:00 2001 From: Loris OBRY Date: Wed, 10 May 2023 09:51:08 +0200 Subject: [PATCH 11/12] modif csproj --- Sources/MauiApp1/MauiApp1.csproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/Sources/MauiApp1/MauiApp1.csproj b/Sources/MauiApp1/MauiApp1.csproj index 8359689..cd5cfc5 100644 --- a/Sources/MauiApp1/MauiApp1.csproj +++ b/Sources/MauiApp1/MauiApp1.csproj @@ -3,8 +3,6 @@ net7.0-android $(TargetFrameworks);net7.0-windows10.0.19041.0 - $(TargetFrameworks);net7.0-ios - $(TargetFrameworks);net7.0-maccatalyst Exe From 432f0bdfc16382a4656f95c0c71796c096becb02 Mon Sep 17 00:00:00 2001 From: Loris OBRY Date: Wed, 10 May 2023 09:53:32 +0200 Subject: [PATCH 12/12] modif yml publish --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 62e143c..ef0f91c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,4 +13,4 @@ steps: - cd Sources/ - dotnet restore MauiApp1.sln - dotnet build MauiApp1.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 - - dotnet publish MauiApp1.sln -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk \ No newline at end of file + - dotnet publish MauiApp1/MauiApp1.csproj -c Release --no-restore -o $CI_PROJECT_DIR/build/release -f:net7.0-android /p:AndroidSdkDirectory=/usr/lib/android-sdk \ No newline at end of file