Merge branch 'master' of https://codefirst.iut.uca.fr/git/leana.besson/BACHELARD_Benjamin-BESSON_Leana

2 years ago · a304fd1714
parent f8eec6b0c6 ce214b617b
commit a304fd1714
3 changed files with 59 additions and 60 deletions
--- 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,17 +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 /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 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
@ -35,30 +34,30 @@ 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]

-  #- 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: {}
--- 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
--- a/Sources/Wikipet's_without_views.sln
+++ b/Sources/Wikipet's_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