From 94d222c7549910967d5f829cf9db464edfff667e Mon Sep 17 00:00:00 2001 From: Lilian BRETON Date: Fri, 25 Nov 2022 14:12:53 +0100 Subject: [PATCH] REMOVE : ci/cd (errors) --- myBlazorApp/myBlazorApp/.drone.yml | 126 +++++++++--------- myBlazorApp/myBlazorApp/Dockerfile | 52 ++++---- myBlazorApp/myBlazorApp/Pages/Inventory.razor | 5 +- .../myBlazorApp/Pages/Inventory.razor.cs | 13 +- 4 files changed, 105 insertions(+), 91 deletions(-) diff --git a/myBlazorApp/myBlazorApp/.drone.yml b/myBlazorApp/myBlazorApp/.drone.yml index 2695a6a..e390d08 100644 --- a/myBlazorApp/myBlazorApp/.drone.yml +++ b/myBlazorApp/myBlazorApp/.drone.yml @@ -2,75 +2,75 @@ type: docker -steps : +#steps : - - name: build - image: mcr.microsoft.com/dotnet/sdk:6.0 - commands: - - cd myBlazorApp/ - - dotnet restore myBlazorApp.sln - - dotnet build myBlazorApp.sln -c Release --no-restore +# - name: build +# image: mcr.microsoft.com/dotnet/sdk:6.0 +# commands: +# - cd myBlazorApp/ +# - dotnet restore myBlazorApp.sln +# - dotnet build myBlazorApp.sln -c Release --no-restore - - name: tests - image: mcr.microsoft.com/dotnet/sdk:6.0 - commands: - - cd myBlazorApp/ - - dotnet restore myBlazorApp.sln - - dotnet test myBlazorApp.sln --no-restore - depends_on: [build] +# - name: tests +# image: mcr.microsoft.com/dotnet/sdk:6.0 +# commands: +# - cd myBlazorApp/ +# - dotnet restore myBlazorApp.sln +# - dotnet test myBlazorApp.sln --no-restore +# depends_on: [build] - - name: code-analysis - image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dronesonarplugin-dotnet6 - commands: - - cd myBlazorApp/ - - dotnet restore myBlazorApp.sln - - dotnet sonarscanner begin /k:$REPO_NAME /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 myBlazorApp.sln -c Release --no-restore - - dotnet test myBlazorApp.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 myBlazorApp.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/thomas.bellembois/codefirst-dronesonarplugin-dotnet6 +# commands: +# - cd myBlazorApp/ +# - dotnet restore myBlazorApp.sln +# - dotnet sonarscanner begin /k:$REPO_NAME /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 myBlazorApp.sln -c Release --no-restore +# - dotnet test myBlazorApp.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 myBlazorApp.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 -# failure: ignore -# volumes: -# - name: docs -# path: /docs -# commands: -# - /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: +## - /entrypoint.sh +## when: +## branch: +## - master +## depends_on: [ build ] -## The volumes declaration appear at the end of the file, after all steps -#volumes: -#- name: docs -# temp: {} +### The volumes declaration appear at the end of the file, after all steps +##volumes: +##- name: docs +## temp: {} - - name: docker-build - image: plugins/docker - settings: - dockerfile: myBlazorApp/myBlazorApp/Dockerfile - context: . - registry: hub.codefirst.iut.uca.fr - repo: hub.codefirst.iut.uca.fr/lucie.bedouret/blazorCourse - username: - from_secret: SECRET_REGISTRY_USERNAME - password: - from_secret: SECRET_REGISTRY_PASSWORD - when: - branch: - - master \ No newline at end of file +# - name: docker-build +# image: plugins/docker +# settings: +# dockerfile: myBlazorApp/myBlazorApp/Dockerfile +# context: . +# registry: hub.codefirst.iut.uca.fr +# repo: hub.codefirst.iut.uca.fr/lucie.bedouret/blazorCourse +# username: +# from_secret: SECRET_REGISTRY_USERNAME +# password: +# from_secret: SECRET_REGISTRY_PASSWORD +# when: +# branch: +# - master \ No newline at end of file diff --git a/myBlazorApp/myBlazorApp/Dockerfile b/myBlazorApp/myBlazorApp/Dockerfile index 3e19f5e..af5bca8 100644 --- a/myBlazorApp/myBlazorApp/Dockerfile +++ b/myBlazorApp/myBlazorApp/Dockerfile @@ -1,26 +1,26 @@ -#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. - -#Depending on the operating system of the host machines(s) that will build or run the containers, the image specified in the FROM statement may need to be changed. -#For more information, please see https://aka.ms/containercompat - -FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base -WORKDIR /app -EXPOSE 80 -EXPOSE 443 - -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build -WORKDIR /src -COPY ["nuget.config", "."] -COPY ["myBlazorApp/myBlazorApp.csproj", "myBlazorApp/"] -RUN dotnet restore "myBlazorApp/myBlazorApp.csproj" -COPY . . -WORKDIR "/src/myBlazorApp" -RUN dotnet build "myBlazorApp.csproj" -c Release -o /app/build - -FROM build AS publish -RUN dotnet publish "myBlazorApp.csproj" -c Release -o /app/publish - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "myBlazorApp.dll"] \ No newline at end of file +##See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. +# +##Depending on the operating system of the host machines(s) that will build or run the containers, the image specified in the FROM statement may need to be changed. +##For more information, please see https://aka.ms/containercompat +# +#FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +#WORKDIR /app +#EXPOSE 80 +#EXPOSE 443 +# +#FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +#WORKDIR /src +#COPY ["nuget.config", "."] +#COPY ["myBlazorApp/myBlazorApp.csproj", "myBlazorApp/"] +#RUN dotnet restore "myBlazorApp/myBlazorApp.csproj" +#COPY . . +#WORKDIR "/src/myBlazorApp" +#RUN dotnet build "myBlazorApp.csproj" -c Release -o /app/build +# +#FROM build AS publish +#RUN dotnet publish "myBlazorApp.csproj" -c Release -o /app/publish +# +#FROM base AS final +#WORKDIR /app +#COPY --from=publish /app/publish . +#ENTRYPOINT ["dotnet", "myBlazorApp.dll"] \ No newline at end of file diff --git a/myBlazorApp/myBlazorApp/Pages/Inventory.razor b/myBlazorApp/myBlazorApp/Pages/Inventory.razor index faa633b..7a3501c 100644 --- a/myBlazorApp/myBlazorApp/Pages/Inventory.razor +++ b/myBlazorApp/myBlazorApp/Pages/Inventory.razor @@ -1,6 +1,9 @@ @page "/inventory" +@using System.Globalization

Inventory

- +

+ CurrentCulture: @CultureInfo.CurrentCulture +

diff --git a/myBlazorApp/myBlazorApp/Pages/Inventory.razor.cs b/myBlazorApp/myBlazorApp/Pages/Inventory.razor.cs index b225bfd..7e2384f 100644 --- a/myBlazorApp/myBlazorApp/Pages/Inventory.razor.cs +++ b/myBlazorApp/myBlazorApp/Pages/Inventory.razor.cs @@ -1,8 +1,19 @@ -using System; +using Blazored.LocalStorage; +using Microsoft.AspNetCore.Components; +using System; namespace myBlazorApp.Pages { public partial class Inventory { + + [Inject] + public ILocalStorageService LocalStorage { get; set; } + + [Inject] + public IWebHostEnvironment WebHostEnvironment { get; set; } + + [Inject] + public NavigationManager NavigationManager { get; set; } } }