From ec0b0ee9290ef47ce8f50e524c57ed03d5e152e7 Mon Sep 17 00:00:00 2001 From: Alexandre Agostinho Date: Wed, 5 Apr 2023 18:25:19 +0200 Subject: [PATCH 01/41] init branch dev-model: no Views --- .drone.yml | 48 +-- MCTG/CI-CD.sln | 42 -- MCTG/SAE-2.01.sln | 8 - MCTG/Views/App.xaml | 14 - MCTG/Views/App.xaml.cs | 12 - MCTG/Views/AppShell.xaml | 14 - MCTG/Views/AppShell.xaml.cs | 10 - MCTG/Views/MainPage.xaml | 41 -- MCTG/Views/MainPage.xaml.cs | 24 -- MCTG/Views/MauiProgram.cs | 25 -- .../Platforms/Android/AndroidManifest.xml | 6 - MCTG/Views/Platforms/Android/MainActivity.cs | 11 - .../Platforms/Android/MainApplication.cs | 16 - .../Android/Resources/values/colors.xml | 6 - .../Platforms/MacCatalyst/AppDelegate.cs | 10 - MCTG/Views/Platforms/MacCatalyst/Info.plist | 30 -- MCTG/Views/Platforms/MacCatalyst/Program.cs | 16 - MCTG/Views/Platforms/Tizen/Main.cs | 17 - MCTG/Views/Platforms/Tizen/tizen-manifest.xml | 15 - MCTG/Views/Platforms/Windows/App.xaml | 8 - MCTG/Views/Platforms/Windows/App.xaml.cs | 24 -- .../Platforms/Windows/Package.appxmanifest | 46 -- MCTG/Views/Platforms/Windows/app.manifest | 15 - MCTG/Views/Platforms/iOS/AppDelegate.cs | 10 - MCTG/Views/Platforms/iOS/Info.plist | 32 -- MCTG/Views/Platforms/iOS/Program.cs | 16 - MCTG/Views/Properties/launchSettings.json | 8 - MCTG/Views/Resources/AppIcon/appicon.svg | 4 - MCTG/Views/Resources/AppIcon/appiconfg.svg | 8 - .../Resources/Fonts/OpenSans-Regular.ttf | Bin 107140 -> 0 bytes .../Resources/Fonts/OpenSans-Semibold.ttf | Bin 111068 -> 0 bytes MCTG/Views/Resources/Images/dotnet_bot.svg | 93 ---- MCTG/Views/Resources/Raw/AboutAssets.txt | 15 - MCTG/Views/Resources/Splash/splash.svg | 8 - MCTG/Views/Resources/Styles/Colors.xaml | 44 -- MCTG/Views/Resources/Styles/Styles.xaml | 405 ------------------ MCTG/Views/Views.csproj | 55 --- README.md | 14 +- 38 files changed, 35 insertions(+), 1135 deletions(-) delete mode 100644 MCTG/CI-CD.sln delete mode 100644 MCTG/Views/App.xaml delete mode 100644 MCTG/Views/App.xaml.cs delete mode 100644 MCTG/Views/AppShell.xaml delete mode 100644 MCTG/Views/AppShell.xaml.cs delete mode 100644 MCTG/Views/MainPage.xaml delete mode 100644 MCTG/Views/MainPage.xaml.cs delete mode 100644 MCTG/Views/MauiProgram.cs delete mode 100644 MCTG/Views/Platforms/Android/AndroidManifest.xml delete mode 100644 MCTG/Views/Platforms/Android/MainActivity.cs delete mode 100644 MCTG/Views/Platforms/Android/MainApplication.cs delete mode 100644 MCTG/Views/Platforms/Android/Resources/values/colors.xml delete mode 100644 MCTG/Views/Platforms/MacCatalyst/AppDelegate.cs delete mode 100644 MCTG/Views/Platforms/MacCatalyst/Info.plist delete mode 100644 MCTG/Views/Platforms/MacCatalyst/Program.cs delete mode 100644 MCTG/Views/Platforms/Tizen/Main.cs delete mode 100644 MCTG/Views/Platforms/Tizen/tizen-manifest.xml delete mode 100644 MCTG/Views/Platforms/Windows/App.xaml delete mode 100644 MCTG/Views/Platforms/Windows/App.xaml.cs delete mode 100644 MCTG/Views/Platforms/Windows/Package.appxmanifest delete mode 100644 MCTG/Views/Platforms/Windows/app.manifest delete mode 100644 MCTG/Views/Platforms/iOS/AppDelegate.cs delete mode 100644 MCTG/Views/Platforms/iOS/Info.plist delete mode 100644 MCTG/Views/Platforms/iOS/Program.cs delete mode 100644 MCTG/Views/Properties/launchSettings.json delete mode 100644 MCTG/Views/Resources/AppIcon/appicon.svg delete mode 100644 MCTG/Views/Resources/AppIcon/appiconfg.svg delete mode 100644 MCTG/Views/Resources/Fonts/OpenSans-Regular.ttf delete mode 100644 MCTG/Views/Resources/Fonts/OpenSans-Semibold.ttf delete mode 100644 MCTG/Views/Resources/Images/dotnet_bot.svg delete mode 100644 MCTG/Views/Resources/Raw/AboutAssets.txt delete mode 100644 MCTG/Views/Resources/Splash/splash.svg delete mode 100644 MCTG/Views/Resources/Styles/Colors.xaml delete mode 100644 MCTG/Views/Resources/Styles/Styles.xaml delete mode 100644 MCTG/Views/Views.csproj diff --git a/.drone.yml b/.drone.yml index 28b413b..04a7d3d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,37 +14,37 @@ steps: path: /docs commands: - cd MCTG/ - - dotnet restore CI-CD.sln - - dotnet build CI-CD.sln -c Release --no-restore - - dotnet publish CI-CD.sln -c Release --no-restore -o CI_PROJECT_DIR/build/release + - dotnet restore SAE-2.01.sln + - dotnet build SAE-2.01.sln -c Release --no-restore + - dotnet publish SAE-2.01.sln -c Release --no-restore -o CI_PROJECT_DIR/build/release - name: tests image: mcr.microsoft.com/dotnet/sdk:7.0 commands: - cd MCTG/ - - dotnet restore CI-CD.sln - - dotnet test CI-CD.sln --no-restore + - dotnet restore SAE-2.01.sln + - dotnet test SAE-2.01.sln --no-restore 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 SAE-2.01.sln + - dotnet sonarscanner begin /k:SAE-2.01 /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 SAE-2.01.sln -c Release --no-restore + - dotnet test SAE-2.01.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 SAE-2.01.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: generate-and-deploy-docs image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-docdeployer diff --git a/MCTG/CI-CD.sln b/MCTG/CI-CD.sln deleted file mode 100644 index ab7e910..0000000 --- a/MCTG/CI-CD.sln +++ /dev/null @@ -1,42 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.5.33516.290 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MCTGApp", "MCTGApp\MCTGApp.csproj", "{666C2211-8EBB-4FC8-9484-CB93BC854153}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MCTGLib", "MCTGLib\MCTGLib.csproj", "{42FF86BD-92F9-4A32-A938-68515905378F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MCTGLib_UnitTests", "Tests\MCTGLib_UnitTests\MCTGLib_UnitTests.csproj", "{45AB746A-194B-4E43-81EB-83B06F35AA33}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{08B80CE8-A01D-4D86-8989-AF225D5DA48C}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {666C2211-8EBB-4FC8-9484-CB93BC854153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {666C2211-8EBB-4FC8-9484-CB93BC854153}.Debug|Any CPU.Build.0 = Debug|Any CPU - {666C2211-8EBB-4FC8-9484-CB93BC854153}.Release|Any CPU.ActiveCfg = Release|Any CPU - {666C2211-8EBB-4FC8-9484-CB93BC854153}.Release|Any CPU.Build.0 = Release|Any CPU - {42FF86BD-92F9-4A32-A938-68515905378F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42FF86BD-92F9-4A32-A938-68515905378F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42FF86BD-92F9-4A32-A938-68515905378F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42FF86BD-92F9-4A32-A938-68515905378F}.Release|Any CPU.Build.0 = Release|Any CPU - {45AB746A-194B-4E43-81EB-83B06F35AA33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {45AB746A-194B-4E43-81EB-83B06F35AA33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {45AB746A-194B-4E43-81EB-83B06F35AA33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {45AB746A-194B-4E43-81EB-83B06F35AA33}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {45AB746A-194B-4E43-81EB-83B06F35AA33} = {08B80CE8-A01D-4D86-8989-AF225D5DA48C} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {ADEA5603-1EF6-4D43-9493-7D6D9DE7FA3F} - EndGlobalSection -EndGlobal diff --git a/MCTG/SAE-2.01.sln b/MCTG/SAE-2.01.sln index f1995a2..ab7e910 100644 --- a/MCTG/SAE-2.01.sln +++ b/MCTG/SAE-2.01.sln @@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MCTGApp", "MCTGApp\MCTGApp. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MCTGLib", "MCTGLib\MCTGLib.csproj", "{42FF86BD-92F9-4A32-A938-68515905378F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Views", "Views\Views.csproj", "{508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MCTGLib_UnitTests", "Tests\MCTGLib_UnitTests\MCTGLib_UnitTests.csproj", "{45AB746A-194B-4E43-81EB-83B06F35AA33}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{08B80CE8-A01D-4D86-8989-AF225D5DA48C}" @@ -27,12 +25,6 @@ Global {42FF86BD-92F9-4A32-A938-68515905378F}.Debug|Any CPU.Build.0 = Debug|Any CPU {42FF86BD-92F9-4A32-A938-68515905378F}.Release|Any CPU.ActiveCfg = Release|Any CPU {42FF86BD-92F9-4A32-A938-68515905378F}.Release|Any CPU.Build.0 = Release|Any CPU - {508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}.Debug|Any CPU.Build.0 = Debug|Any CPU - {508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}.Release|Any CPU.ActiveCfg = Release|Any CPU - {508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}.Release|Any CPU.Build.0 = Release|Any CPU - {508B5600-AFD0-4AE4-A3CF-5FA8BE3ECE75}.Release|Any CPU.Deploy.0 = Release|Any CPU {45AB746A-194B-4E43-81EB-83B06F35AA33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {45AB746A-194B-4E43-81EB-83B06F35AA33}.Debug|Any CPU.Build.0 = Debug|Any CPU {45AB746A-194B-4E43-81EB-83B06F35AA33}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/MCTG/Views/App.xaml b/MCTG/Views/App.xaml deleted file mode 100644 index beb7cff..0000000 --- a/MCTG/Views/App.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - diff --git a/MCTG/Views/App.xaml.cs b/MCTG/Views/App.xaml.cs deleted file mode 100644 index 40c0c3f..0000000 --- a/MCTG/Views/App.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Views -{ - public partial class App : Application - { - public App() - { - InitializeComponent(); - - MainPage = new AppShell(); - } - } -} \ No newline at end of file diff --git a/MCTG/Views/AppShell.xaml b/MCTG/Views/AppShell.xaml deleted file mode 100644 index 54e7dbe..0000000 --- a/MCTG/Views/AppShell.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/MCTG/Views/AppShell.xaml.cs b/MCTG/Views/AppShell.xaml.cs deleted file mode 100644 index 15833b6..0000000 --- a/MCTG/Views/AppShell.xaml.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Views -{ - public partial class AppShell : Shell - { - public AppShell() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/MCTG/Views/MainPage.xaml b/MCTG/Views/MainPage.xaml deleted file mode 100644 index a1864aa..0000000 --- a/MCTG/Views/MainPage.xaml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - -