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*@ -
-
- @**@ - @* @userName*@ -
-
+
+
@PageName
-
+
@if (ShowSearch) { diff --git a/MP.Prog/Components/SearchMod.razor b/MP.Prog/Components/SearchMod.razor index c441f690..1e5d7677 100644 --- a/MP.Prog/Components/SearchMod.razor +++ b/MP.Prog/Components/SearchMod.razor @@ -8,7 +8,7 @@
- +
diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj index fc54a3b8..ae754585 100644 --- a/MP.Prog/MP.Prog.csproj +++ b/MP.Prog/MP.Prog.csproj @@ -12,6 +12,7 @@ <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS03.pubxml" /> + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS04-Office.pubxml" /> <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS04.pubxml" /> diff --git a/MP.Prog/Pages/Archive.razor b/MP.Prog/Pages/Archive.razor index 7936e9cc..4efdb9ea 100644 --- a/MP.Prog/Pages/Archive.razor +++ b/MP.Prog/Pages/Archive.razor @@ -4,8 +4,8 @@
-
-
+
+

Elenco Programmi

@@ -19,7 +19,7 @@
-
+
@@ -68,24 +68,24 @@
+
+
@if (!string.IsNullOrEmpty(SelFileName)) { @TextReduce(SelFileName, 20) }
-
+
-
- - Tags -
+ Tags +
@if (!string.IsNullOrEmpty(SelTag)) { - @SelTag + @SelTag } else { @@ -169,7 +169,7 @@
@record.Rev
-
@((((double)record.Size)/1024).ToString("N2")) k
+
@((((double)record.Size) / 1024).ToString("N2")) k
diff --git a/MP.Prog/Properties/PublishProfiles/IIS04-Office.pubxml b/MP.Prog/Properties/PublishProfiles/IIS04-Office.pubxml deleted file mode 100644 index bd4624f8..00000000 --- a/MP.Prog/Properties/PublishProfiles/IIS04-Office.pubxml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - MSDeploy - true - Release - Any CPU - - - false - d9901b50-e61c-400c-b62c-fa060cf72c29 - false - https://iis04.egalware.com:8172/MsDeploy.axd - office.egalware.com/MP/PROG - - false - WMSVC - true - jenkins - <_SavePWD>true - net6.0 - true - - \ No newline at end of file diff --git a/MP.Prog/Properties/PublishProfiles/IIS04.pubxml b/MP.Prog/Properties/PublishProfiles/IIS04.pubxml index a27ffc19..ac58538f 100644 --- a/MP.Prog/Properties/PublishProfiles/IIS04.pubxml +++ b/MP.Prog/Properties/PublishProfiles/IIS04.pubxml @@ -9,13 +9,12 @@ by editing this MSBuild file. In order to learn more about this please visit htt true Release Any CPU - - + office.egalware.com/MP/PROG/ false d9901b50-e61c-400c-b62c-fa060cf72c29 false https://iis04.egalware.com:8172/MsDeploy.axd - Default Web Site/MP/PROG + office.egalware.com/MP/PROG false WMSVC diff --git a/MP.Prog/appsettings.Production-install.json b/MP.Prog/appsettings.Production-install.json new file mode 100644 index 00000000..46d50e83 --- /dev/null +++ b/MP.Prog/appsettings.Production-install.json @@ -0,0 +1,15 @@ +{ + "DetailedErrors": true, + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*", + "ConnectionStrings": { + "DefaultConnection": "Server=localhost\\SQLEXPRESS;Database=MoonPro_PROG;Trusted_Connection=True;MultipleActiveResultSets=true", + "MP.Prog": "Server=localhost\\SQLEXPRESS;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.PROG;" + } +} \ No newline at end of file diff --git a/MP.Prog/appsettings.Production-office.json b/MP.Prog/appsettings.Production-office.json new file mode 100644 index 00000000..3dc010de --- /dev/null +++ b/MP.Prog/appsettings.Production-office.json @@ -0,0 +1,15 @@ +{ + "DetailedErrors": true, + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*", + "ConnectionStrings": { + "DefaultConnection": "Server=W2019-SQL-STEAM;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;", + "MP.Prog": "Server=W2019-SQL-STEAM;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;" + } +} \ No newline at end of file