Merge branch 'Release/MpTab_Controlli_02'

2025-03-14 11:56:41 +01:00
parent 488947216e 713dc9f191
commit d9c5e8ccce
8 changed files with 13 additions and 7 deletions
@@ -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
@@ -4,7 +4,7 @@
 <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <base href="/" />
+    @* <base href="/" /> *@
    @* <link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
    <link rel="stylesheet" href="app.css" />
    <link rel="stylesheet" href="MP-MON.styles.css" />
@@ -15,7 +15,7 @@
    <link rel="stylesheet" href="css/site.min.css" />
    <link rel="stylesheet" href="lib/font-awesome/css/all.min.css" />
    <link rel="stylesheet" href="MP-MON.styles.css" />
-    <link rel="icon" type="image/png" href="favicon.ico" />
+    <link rel="icon" type="image/png" href="~/favicon.ico" />
    <HeadOutlet />
 </head>

@@ -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();
@@ -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
@@ -6,7 +6,7 @@
    <ImplicitUsings>enable</ImplicitUsings>
    <RootNamespace>MP.MON8</RootNamespace>
    <AssemblyName>$(AssemblyName.Replace(' ', '_'))</AssemblyName>
-    <Version>6.16.2503.1409</Version>
+    <Version>6.16.2503.1411</Version>
    <Title>MAPO MES Realtime Monitor</Title>
  </PropertyGroup>

@@ -1,6 +1,6 @@
 <body>
    <i>Modulo MON MAPO</i>
-    <h4>Versione: 6.16.2503.1409</h4>
+    <h4>Versione: 6.16.2503.1411</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-6.16.2503.1409
+6.16.2503.1411
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2503.1409</version>
+  <version>6.16.2503.1411</version>
  <url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>