diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d78758b1..72337096 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -666,7 +666,7 @@ TAB3:IIS03:deploy: - dotnet restore "$env:SOL_NAME.sln" rules: - if: $CI_COMMIT_BRANCH == 'master' - needs: ["IOC:build"] + needs: ["TAB3:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj - dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj diff --git a/MP-MON/MP-MON/Components/App.razor b/MP-MON/MP-MON/Components/App.razor index 4fa2438f..860bfa6f 100644 --- a/MP-MON/MP-MON/Components/App.razor +++ b/MP-MON/MP-MON/Components/App.razor @@ -4,7 +4,7 @@ - + @* *@ @* @@ -15,7 +15,7 @@ - + diff --git a/MP-MON/MP-MON/Program.cs b/MP-MON/MP-MON/Program.cs index 4ecab68b..725f60f7 100644 --- a/MP-MON/MP-MON/Program.cs +++ b/MP-MON/MP-MON/Program.cs @@ -47,6 +47,11 @@ else app.UseHsts(); } +string basePath = configuration["ServerConf:BaseAppPath"]; +app.UsePathBase(basePath); + +logger.Info($"Base application path: {basePath}"); + app.UseHttpsRedirection(); app.UseStaticFiles(); diff --git a/MP-MON/MP-MON/appsettings.json b/MP-MON/MP-MON/appsettings.json index 48358d01..d1475da8 100644 --- a/MP-MON/MP-MON/appsettings.json +++ b/MP-MON/MP-MON/appsettings.json @@ -56,6 +56,7 @@ "Redis": "localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" }, "ServerConf": { + "BaseAppPath": "/MON8/", "maxAge": "2000", "cssOverlayOff": "bg-dark text-light bg-opacity-50", "maxChar4Scroll": 15 diff --git a/MP-MON8/MP-MON8.csproj b/MP-MON8/MP-MON8.csproj index fcd6759f..13366d30 100644 --- a/MP-MON8/MP-MON8.csproj +++ b/MP-MON8/MP-MON8.csproj @@ -6,7 +6,7 @@ enable MP.MON8 $(AssemblyName.Replace(' ', '_')) - 6.16.2503.1409 + 6.16.2503.1411 MAPO MES Realtime Monitor diff --git a/MP-MON8/Resources/ChangeLog.html b/MP-MON8/Resources/ChangeLog.html index 638ce892..609ae79f 100644 --- a/MP-MON8/Resources/ChangeLog.html +++ b/MP-MON8/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MON MAPO -

Versione: 6.16.2503.1409

+

Versione: 6.16.2503.1411


Note di rilascio: