diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d03322a..65b9cfc6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ variables: APP_NAME: 'MP.Stats' SOL_NAME: 'MP-STATS' NUGET_PATH: 'C:\Tools\nuget.exe' + DEST: 'install' # nota: cer creazione rules: https://docs.gitlab.com/ee/ci/jobs/job_control.html#common-if-clauses-for-rules @@ -41,6 +42,19 @@ variables: echo "Situazione sorgenti FINALE:" dotnet nuget list source + +# helper x fix appsettings config nei casi installer / office +.appsettings-fix: &appsettings-fix + - | + echo "esecuzione FIX appsettings.json" + $srcFile="appsettings.Production-install.json" + $dstFile="appsettings.Production.json" + if ($env:DEST != 'install') { + $srcFile="appsettings.Production-office.json" + } + Copy-Item -Path $srcFile -Destination $dstFile + echo "Completata copia file appsettings.json corretto" + # helper creazione hash files x IIS .hashBuild: &hashBuild - | @@ -516,11 +530,14 @@ PROG:IIS03:deploy: variables: APP_NAME: MP.Prog SOL_NAME: MP-PROG + DEST: office.egalware.com before_script: - *nuget-fix - dotnet restore "$env:SOL_NAME.sln" + - *appsettings-fix rules: - if: $CI_COMMIT_BRANCH == 'master' + - if: $CI_COMMIT_BRANCH == 'develop' needs: ["PROG:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj diff --git a/MP.Prog/.config/dotnet-tools.json b/MP.Prog/.config/dotnet-tools.json index b0e38abd..76ca931b 100644 --- a/MP.Prog/.config/dotnet-tools.json +++ b/MP.Prog/.config/dotnet-tools.json @@ -1,5 +1,13 @@ { "version": 1, "isRoot": true, - "tools": {} + "tools": { + "dotnet-ef": { + "version": "8.0.10", + "commands": [ + "dotnet-ef" + ], + "rollForward": false + } + } } \ No newline at end of file diff --git a/MP.Prog/Components/CmpTop.razor b/MP.Prog/Components/CmpTop.razor index bf84f2c2..1f0cbbad 100644 --- a/MP.Prog/Components/CmpTop.razor +++ b/MP.Prog/Components/CmpTop.razor @@ -6,15 +6,11 @@ @inject MessageService AppMessages @*@inject AuthenticationStateProvider AuthenticationStateProvider*@ -