From 69731d25fa2f7c120ddbc05e2d2b6ee1e8fc7849 Mon Sep 17 00:00:00 2001 From: Leana BESSON Date: Fri, 9 Jun 2023 23:23:09 +0200 Subject: [PATCH 1/5] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'.drone.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6505d4e..62d063a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,21 +44,21 @@ steps: - dotnet sonarscanner end /d:sonar.login=$${sonar_token} depends_on: [build] - #- name: generate-and-deploy-docs - # image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-docdeployer - # failure: ignore - # volumes: - # - name: docs - # path: /docs - # commands: - #- cd Documentation/doxygen - #- doxygen Doxyfile - # - /entrypoint.sh - # when: - # branch: - # - master - # depends_on: [ build ] + - name: generate-and-deploy-docs + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-docdeployer + failure: ignore + volumes: + - name: docs + path: /docs + commands: + - cd Documentation/doxygen + - doxygen Doxyfile + - /entrypoint.sh + when: + branch: + - master + depends_on: [ build ] -#volumes: -#- name: docs -# temp: {} +volumes: +- name: docs + temp: {} From 905e21ae03bcf6bca4c291a176673a3c062eeb22 Mon Sep 17 00:00:00 2001 From: Leana BESSON Date: Fri, 9 Jun 2023 23:28:21 +0200 Subject: [PATCH 2/5] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'.drone.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 62d063a..bc26e2f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,8 +12,7 @@ steps: commands: - cd Sources/ - dotnet restore Wikipet's_without_views.sln - - dotnet build Wikipet's_without_views.sln -c Release --no-restore /p:AndroidSdkDirectory=$ANDROID_SDK_ROOT -property:Aapt2ToolPath=$ANDROID_SDK_ROOT/build-tools/33.0.0 - - dotnet publish Wikipet's_without_views.sln -c Release --no-restore -o $CI_PROJECT_DIR/build/release + - dotnet build Wikipet's_without_views.sln -c Release --no-restore depends_on: [clone] #- name: tests From e38739250ca48c2e88f72d8b1dac773e68c49342 Mon Sep 17 00:00:00 2001 From: Leana BESSON Date: Fri, 9 Jun 2023 23:31:12 +0200 Subject: [PATCH 3/5] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Sources/Wikipe?= =?UTF-8?q?ts=5Fwithout=5Fviews.sln'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...t_views.sln => Wikipets_without_views.sln} | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) rename Sources/{Wikipet's_without_views.sln => Wikipets_without_views.sln} (98%) diff --git a/Sources/Wikipet's_without_views.sln b/Sources/Wikipets_without_views.sln similarity index 98% rename from Sources/Wikipet's_without_views.sln rename to Sources/Wikipets_without_views.sln index 1785d63..a5ad620 100644 --- a/Sources/Wikipet's_without_views.sln +++ b/Sources/Wikipets_without_views.sln @@ -1,31 +1,31 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.5.33424.131 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Console", "Console\Console.csproj", "{66D1B4E7-A14F-4DCE-89D1-31CC53E5F3B9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model", "Model\Model.csproj", "{83309215-075B-406F-A72E-45E40AD47E43}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {66D1B4E7-A14F-4DCE-89D1-31CC53E5F3B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {66D1B4E7-A14F-4DCE-89D1-31CC53E5F3B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {66D1B4E7-A14F-4DCE-89D1-31CC53E5F3B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {66D1B4E7-A14F-4DCE-89D1-31CC53E5F3B9}.Release|Any CPU.Build.0 = Release|Any CPU - {83309215-075B-406F-A72E-45E40AD47E43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83309215-075B-406F-A72E-45E40AD47E43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83309215-075B-406F-A72E-45E40AD47E43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83309215-075B-406F-A72E-45E40AD47E43}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {B8A5349C-3C89-45FC-94B1-9702CDFE90DF} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33424.131 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Console", "Console\Console.csproj", "{66D1B4E7-A14F-4DCE-89D1-31CC53E5F3B9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model", "Model\Model.csproj", "{83309215-075B-406F-A72E-45E40AD47E43}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {66D1B4E7-A14F-4DCE-89D1-31CC53E5F3B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {66D1B4E7-A14F-4DCE-89D1-31CC53E5F3B9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66D1B4E7-A14F-4DCE-89D1-31CC53E5F3B9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {66D1B4E7-A14F-4DCE-89D1-31CC53E5F3B9}.Release|Any CPU.Build.0 = Release|Any CPU + {83309215-075B-406F-A72E-45E40AD47E43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83309215-075B-406F-A72E-45E40AD47E43}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83309215-075B-406F-A72E-45E40AD47E43}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83309215-075B-406F-A72E-45E40AD47E43}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B8A5349C-3C89-45FC-94B1-9702CDFE90DF} + EndGlobalSection +EndGlobal From d5382136c4aeadd0c889605bd7ef728c7312619e Mon Sep 17 00:00:00 2001 From: Leana BESSON Date: Fri, 9 Jun 2023 23:33:21 +0200 Subject: [PATCH 4/5] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'.drone.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index bc26e2f..691ea6b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ kind: pipeline type: docker -name: Wikipet's_without_views.sln +name: Wikipets_without_views.sln trigger: event: @@ -11,16 +11,16 @@ steps: image: mcr.microsoft.com/dotnet/sdk:7.0 commands: - cd Sources/ - - dotnet restore Wikipet's_without_views.sln - - dotnet build Wikipet's_without_views.sln -c Release --no-restore + - dotnet restore Wikipets_without_views.sln + - dotnet build Wikipets_without_views.sln -c Release --no-restore depends_on: [clone] #- name: tests # image: mcr.microsoft.com/dotnet/sdk:7.0 # commands: # - cd Sources/ - # - dotnet restore Wikipet's_without_views.sln - # - dotnet test Wikipet's_without_views.sln --no-restore + # - dotnet restore Wikipets_without_views.sln + # - dotnet test Wikipets_without_views.sln --no-restore # depends_on: [build] - name: code-analysis @@ -34,12 +34,12 @@ steps: coverage_exclusions: "Tests/**" commands: - cd Sources/ - - dotnet restore Wikipet's_without_views.sln + - dotnet restore Wikipets_without_views.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 Wikipet's_without_views.sln -c Release --no-restore - #- dotnet test Wikipet's_without_views.sln --logger trx --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage" + - dotnet build Wikipets_without_views.sln -c Release --no-restore + #- dotnet test Wikipets_without_views.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 Wikipet's_without_views.sln -c Release --no-restore -o CI_PROJECT_DIR/build/release + - dotnet publish Wikipets_without_views.sln -c Release --no-restore -o CI_PROJECT_DIR/build/release - dotnet sonarscanner end /d:sonar.login=$${sonar_token} depends_on: [build] From ce214b617b7de047c70fcc660c82c63900b57f80 Mon Sep 17 00:00:00 2001 From: Leana BESSON Date: Fri, 9 Jun 2023 23:42:29 +0200 Subject: [PATCH 5/5] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Documentation/?= =?UTF-8?q?doxygen/Doxyfile'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Documentation/doxygen/Doxyfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/doxygen/Doxyfile b/Documentation/doxygen/Doxyfile index c3a5c06..a0dc66a 100644 --- a/Documentation/doxygen/Doxyfile +++ b/Documentation/doxygen/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "BACHELARD_Benjamin-BESSON_Leana" +PROJECT_NAME = "Wikipet's" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version @@ -44,7 +44,7 @@ PROJECT_NUMBER = 1.0.0 # for a project that appears at the top of each page and should give viewer a # quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = "" +PROJECT_BRIEF = "Application for species information and keeping pets in one place" # With the PROJECT_LOGO tag one can specify a logo or an icon that is included # in the documentation. The maximum height of the logo should not exceed 55