Merge branch 'develop' into EgwAppControlCenter

Merge branch 'EgwAppControlCenter' into develop
Merge tag 'LimanRelMgmt07' into develop
2024-10-02 09:47:47 +02:00 · 2024-10-02 09:47:28 +02:00 · 2024-10-02 09:46:53 +02:00 · 2024-10-02 09:46:31 +02:00 · 2024-10-02 09:46:01 +02:00 · 2024-09-30 14:45:27 +02:00
15 changed files with 135 additions and 148 deletions
@@ -2,7 +2,9 @@ variables:
 VERS_MAIN: '1.0'
 NEXUS_PATH: 'LiMan'
 APP_NAME: 'LiMan.UI'
+ SOL_NAME: 'LiMan.UI'
 NUGET_PATH: 'C:\Tools\nuget.exe'
+ MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\MSBuild.exe'

 # helper x fix pacchetti nuget da repo locale nexus.steamware.net
 .nuget-fix: &nuget-fix
@@ -11,18 +13,19 @@ variables:
      dotnet nuget list source 
      $hasSource = dotnet nuget list source | Select-String -Pattern "Steamware Nexus Proxy"
      if (! [String]::IsNullOrWhiteSpace($hasSource)) {
-        dotnet nuget remove source "`"Steamware Nexus Proxy`""
+        dotnet nuget remove source "Steamware Nexus Proxy"
      }
      $hasSource = dotnet nuget list source | Select-String -Pattern "Steamware Nexus"
      if (! [String]::IsNullOrWhiteSpace($hasSource)) {
-        dotnet nuget remove source "`"Steamware Nexus`""
+        dotnet nuget remove source "Steamware Nexus"
      }
      $hasSource = dotnet nuget list source | Select-String -Pattern "nexus-proxy-v3"
      if (! [String]::IsNullOrWhiteSpace($hasSource)) {
        dotnet nuget remove source nexus-proxy-v3
      }
      dotnet nuget add source https://nexus.steamware.net/repository/nuget-group-3/index.json -n "Steamware Nexus" -u nugetUser -p $NEXUS_PASSWD --store-password-in-clear-text
-      echo "Steamware Nexus Source added"
+      echo "Steamware Nexus Source added, final state:"
+      dotnet nuget list source 

 # helper creazione files zip
 .zipper: &zipper
@@ -122,13 +125,11 @@ variables:
      echo "replace completati"


-
 stages:
  - build
  - deploy
  - release

-
 # --------------------------------
 # BUILD
 # --------------------------------
@@ -136,46 +137,79 @@ UI:build:
  stage: build
  tags:
    - win
+  except:
+    - EgwAppControlCenter
+  variables:
+    SOL_NAME: LiMan
+    APP_NAME: LiMan.UI
  before_script:
    - *nuget-fix
-    - dotnet restore LiMan.sln
+    - dotnet restore "$env:SOL_NAME.sln"
  script:
-    - dotnet build LiMan.UI/LiMan.UI.csproj
+    - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
    
 API:build:
  stage: build
  tags:
    - win
+  except:
+    - EgwAppControlCenter
+  variables:
+    SOL_NAME: LiMan
+    APP_NAME: LiMan.Api
  before_script:
    - *nuget-fix
-    - dotnet restore LiMan.sln
+    - dotnet restore "$env:SOL_NAME.sln"
  script:
-    - dotnet build LiMan.Api/LiMan.Api.csproj
+    - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
    
 Transfer:build:
  stage: build
  tags:
    - win
+  except:
+    - EgwAppControlCenter
+  variables:
+    SOL_NAME: LiMan
+    APP_NAME: LiMan.Transfer
  before_script:
    - *nuget-fix
-    - dotnet restore LiMan.sln
+    - dotnet restore "$env:SOL_NAME.sln"
  script:
-    - dotnet build LiMan.Transfer/LiMan.Transfer.csproj
+    - dotnet build $env:APP_NAME/$env:APP_NAME.csproj

 EgwProxy.LiMan:build:
  stage: build
  tags:
    - win
+  except:
+    - EgwAppControlCenter
  variables:
-    APP_NAME: EgwProxy.LiMan
    SOL_NAME: EgwProxy.LiMan
+    APP_NAME: EgwProxy.LiMan
  before_script:
    - *nuget-fix
-    - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
+    - dotnet restore "$env:SOL_NAME.sln"
+    # - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
  script:
    - echo $CI_COMMIT_BRANCH
    - dotnet build $env:APP_NAME/$env:APP_NAME.csproj  

+EgwControlCenter:build:
+  stage: build
+  tags:
+    - win
+  only:
+    - EgwAppControlCenter
+  variables:
+    SOL_NAME: EgwControlCenter
+    APP_NAME: EgwControlCenter.App
+  before_script:
+    - *nuget-fix
+    - dotnet restore "$env:SOL_NAME.sln"
+  script:
+    - echo $CI_COMMIT_BRANCH
+    - dotnet build $env:APP_NAME/$env:APP_NAME.csproj   

 # --------------------------------
 # DEPLOY
@@ -184,13 +218,16 @@ UI:IIS01:deploy:
  stage: deploy
  tags:
    - win
+  variables:
+    SOL_NAME: LiMan
+    APP_NAME: LiMan.UI
  only:
    - develop
  needs: ["UI:build"]
  before_script:
    - *nuget-fix
  script: 
-    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true LiMan.UI/LiMan.UI.csproj
+    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj
    - *zipper
    - *hashBuild
    - *nexusUpload
@@ -200,14 +237,15 @@ API:IIS01:deploy:
  tags:
    - win
  variables:
-   APP_NAME: 'LiMan.Api'
+    SOL_NAME: LiMan
+    APP_NAME: LiMan.Api
  only:
    - develop
  needs: ["API:build"]
  before_script:
    - *nuget-fix
  script: 
-    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true LiMan.Api/LiMan.Api.csproj
+    - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj
    - *zipper
    - *hashBuild
    - *nexusUpload
@@ -216,29 +254,36 @@ UI:IIS04:deploy:
  stage: deploy
  tags:
    - win
+  variables:
+    SOL_NAME: LiMan
+    APP_NAME: LiMan.UI
  only:
    - main
  needs: ["UI:build"]
  before_script:
    - *nuget-fix
  script:
-    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true LiMan.UI/LiMan.UI.csproj
+    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj
    - *zipper
    - *hashBuild
    - *nexusUpload
+
 API:IIS04:deploy:
  stage: deploy
  tags:
    - win
+  except:
+    - EgwAppControlCenter
  variables:
-   APP_NAME: 'LiMan.Api'
+    SOL_NAME: LiMan
+    APP_NAME: LiMan.Api
  only:
    - main
  needs: ["API:build"]
  before_script:
    - *nuget-fix
  script:
-    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true LiMan.Api/LiMan.Api.csproj
+    - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true $env:APP_NAME/$env:APP_NAME.csproj
    - *zipper
    - *hashBuild
    - *nexusUpload
@@ -247,14 +292,17 @@ Transfer:deploy:
  stage: deploy
  tags:
    - win
+  except:
+    - EgwAppControlCenter
  variables:
+    SOL_NAME: LiMan
    APP_NAME: LiMan.Transfer
  needs: ["Transfer:build"]
  before_script:
    - *nuget-fix
  script: 
-    - dotnet build LiMan.Transfer/LiMan.Transfer.csproj
-    - dotnet publish -p:PublishProfile=SingleFileX86.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release LiMan.Transfer/LiMan.Transfer.csproj
+    - dotnet build $env:APP_NAME/$env:APP_NAME.csproj
+    - dotnet publish -p:PublishProfile=SingleFileX86.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj
    - *zipper
    - *hashBuild
    - *nexusUpload
@@ -264,6 +312,8 @@ EgwProxy.LiMan:deploy:
  needs: ["EgwProxy.LiMan:build"]
  tags:
    - win
+  except:
+    - EgwAppControlCenter
  variables:
    CONFIG: Debug
    APP_NAME: EgwProxy.LiMan
@@ -273,17 +323,38 @@ EgwProxy.LiMan:deploy:
      - develop
  before_script:
    - *nuget-fix
-    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
+    - dotnet restore "$env:SOL_NAME.sln"
+    # - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
    - *version-fix
    - *nuspec-fix
-  script:  
-#     - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m'
+  script:
     - dotnet build "$env:APP_NAME\$env:APP_NAME.csproj"
     - '& Remove-Item *.nupkg'
     - '& $env:NUGET_PATH pack "$env:APP_NAME.Debug.nuspec"'
     - '& "$env:NUGET_PATH" setapikey $NUGET_API_KEY -source http://nexus.steamware.net/repository/nuget-hosted'
     - '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'

+EgwControlCenter:deploy:
+  stage: deploy
+  needs: ["EgwControlCenter:build"]
+  tags:
+    - win
+  only:
+    - EgwAppControlCenter
+  variables:
+    SOL_NAME: EgwControlCenter
+    APP_NAME: EgwControlCenter.App
+  before_script:
+    - *nuget-fix
+    # - dotnet restore "$env:APP_NAME/$env:APP_NAME.csproj"
+    #- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
+  script:
+    - $env:DOTNET_NUGET_SIGNATURE_VERIFICATION = 'false'
+    - dotnet restore "$env:SOL_NAME.sln" --no-cache
+    #- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
+    # - dotnet restore EgwControlCenter.sln
+    - '& "$env:MSBUILD_PATH" -t:publish -p:PublishProfile=ClickOnceProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj'
+
 # --------------------------------
 # RELEASE
 # --------------------------------
@@ -301,7 +372,8 @@ EgwProxy.LiMan:release:
      - SDK
  before_script:
    - *nuget-fix
-    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
+    - dotnet restore "$env:SOL_NAME.sln"
+    # - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
    - *version-fix
    - *nuspec-fix
  script:  
@@ -22,7 +22,7 @@ namespace EgwControlCenter.App
            CleanOldTrayIcons();
            InitBlazorView();
            StartTimer();
-            ForceReload();
+            StartLastAsync();
        }

        #endregion Public Constructors
@@ -37,7 +37,6 @@ namespace EgwControlCenter.App
        private bool forceClose = false;

        private Size minSize = new Size(676, 409);
-        private bool showReduced = false;

        /// <summary>
        /// Periodo di blocco invio nuove notifiche se ci sono + update...
@@ -112,20 +111,18 @@ namespace EgwControlCenter.App

        private void CleanOldTrayIcons()
        {
-            string registryPath = @"HKEY_CURRENT_USER\Control Panel\NotifyIconSettings";
            Assembly assembly = Assembly.GetExecutingAssembly();
            string startDir = Path.GetDirectoryName(assembly.Location)!;
            string appPath = assembly.ManifestModule.FullyQualifiedName.Replace("dll", "exe");
-            RegistryKey key = Registry.CurrentUser.OpenSubKey(@"Control Panel\NotifyIconSettings", true);
-
+            RegistryKey? key = Registry.CurrentUser.OpenSubKey(@"Control Panel\NotifyIconSettings", true);
            if (key != null)
            {
                foreach (string subKeyName in key.GetSubKeyNames())
                {
-                    RegistryKey subKey = key.OpenSubKey(subKeyName);
+                    RegistryKey? subKey = key.OpenSubKey(subKeyName);
                    if (subKey != null)
                    {
-                        string executablePath = subKey.GetValue("ExecutablePath") as string;
+                        string executablePath = subKey.GetValue("ExecutablePath") as string ?? "";
                        // cerco solo le chaivi di EgwControlCenter.App.exe
                        if (!string.IsNullOrEmpty(executablePath))
                        {
@@ -190,6 +187,16 @@ namespace EgwControlCenter.App
            blazorWebView1.RootComponents.Add<MainBlazor>("#app");
        }

+        /// <summary>
+        /// Riavvio il timer...
+        /// </summary>
+        /// <exception cref="NotImplementedException"></exception>
+        private void MainAppControlService_EA_ConfigUpdated()
+        {
+            timerCheck.Stop();
+            StartTimer();
+        }
+
        /// <summary>
        /// Verifica se ci siano update da mostrare come notifica in tray
        /// </summary>
@@ -274,15 +281,6 @@ namespace EgwControlCenter.App
            MainAppControlService.EA_StatusUpdated += MainAppControlService_EA_StatusUpdated;
            MainAppControlService.EA_ConfigUpdated += MainAppControlService_EA_ConfigUpdated;
        }
-        /// <summary>
-        /// Riavvio il timer...
-        /// </summary>
-        /// <exception cref="NotImplementedException"></exception>
-        private void MainAppControlService_EA_ConfigUpdated()
-        {
-            timerCheck.Stop();
-            StartTimer();
-        }

        private void SetPosition()
        {
@@ -297,6 +295,18 @@ namespace EgwControlCenter.App
            notifyIcon1.Text = $"EgalWare's AppControlCenter | {CurrAssembly.Version}";
        }

+        /// <summary>
+        /// init ultime attività async
+        /// </summary>
+        private void StartLastAsync()
+        {
+            var pUpd = Task.Run(async () =>
+            {
+                await ForceReload();
+            });
+            pUpd.Wait();
+        }
+
        private void StartTimer()
        {
            timerCheck.Interval = (MainAppControlService.RefreshPeriod * 1000);
@@ -3,7 +3,6 @@
        <button class="btn btn-sm btn-outline-light py-0 px-1" @onclick="NavAbout">
            @CurrAssembly.Name <span class="small">v.@AppVers</span>
        </button>
-        @* <a class="text-light" href="https://iis01.egalware.com/Egalware/ACC/Publish.html" target="_blank">@CurrAssembly.Name</a> <span class="small">v.@AppVers</span> *@
    </div>
    <div class="text-end">
        <span class="small px-1">@adesso</span>
@@ -108,10 +108,6 @@ namespace EgwControlCenter.App.Components.Compo
        {
            NavMan.NavigateTo("About");
        }
-        private void NavContacts()
-        {
-            NavMan.NavigateTo("Contacts");
-        }

        #endregion Private Properties
    }
@@ -1,67 +0,0 @@
-@page "/Contacts"
-
-@inject NavigationManager NavMan
-
-<div class="card shadow ">
-    <div class="card-header">
-        <div class="d-flex justify-content-between">
-            <div class="p-0">
-                <h1>Contacts</h1>
-            </div>
-            <div class="p-0">
-                <div class="d-flex flex-row-reverse">
-                    <div class="px-2 badge rounded-pill bg-dark">
-                        <div class="py-2 px-3" style="font-size: 2.5em;">
-                            <a class="text-light" href="https://www.egalware.com/" target="_blank">EgalWare <img width="32" class="img-fluid" src="images/LogoEgw.png" /></a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="card-body">
-        <p>Current count: @currentCount</p>
-        <button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
-        <br />
-        <div class="row my-2">
-            <div class="col">
-                <button class="btn btn-info w-100" @onclick="GoTo01">Nav 01</button>
-            </div>
-            <div class="col">
-                <button class="btn btn-info w-100" @onclick="GoTo02">Nav 02</button>
-            </div>
-            <div class="col">
-                <button class="btn btn-info w-100" @onclick="GoTo03">Nav 03</button>
-            </div>
-        </div>
-    </div>
-    <div class="card-footer">
-        @if (CurrAssembly != null)
-        {
-            <small>@CurrAssembly.Name | @CurrAssembly.Version</small>
-        }
-    </div>
-</div>
-
-@code {
-    private int currentCount = 0;
-
-    private System.Reflection.AssemblyName? CurrAssembly { get; set; } = System.Reflection.Assembly.GetExecutingAssembly().GetName();
-    private void IncrementCount()
-    {
-        currentCount++;
-    }
-
-    private void GoTo01()
-    {
-        NavMan.NavigateTo("Nav01");
-    }
-    private void GoTo02()
-    {
-        NavMan.NavigateTo("Nav02");
-    }
-    private void GoTo03()
-    {
-        NavMan.NavigateTo("Nav03");
-    }
-}
@@ -36,12 +36,6 @@ namespace EgwControlCenter.App.Components.Pages

        #endregion Protected Methods

-        #region Private Fields
-
-        private bool isLoading = false;
-
-        #endregion Private Fields
-
        #region Private Properties

        private bool ReqSetup { get; set; } = false;
@@ -5,7 +5,7 @@
    <Nullable>enable</Nullable>
    <UseWindowsForms>true</UseWindowsForms>
    <ImplicitUsings>enable</ImplicitUsings>
-    <Version>1.1.2409.2712</Version>
+    <Version>1.1.2409.2717</Version>
    <Configurations>Debug;Release;DEBUG_Local</Configurations>
  </PropertyGroup>
  <ItemGroup>
@@ -19,6 +19,7 @@
  <ItemGroup>
    <PackageReference Include="EgwCoreLib.Razor" Version="1.5.2409.2607" />
    <PackageReference Include="EgwCoreLib.Utils" Version="1.5.2409.2607" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Analyzers" Version="8.0.8" />
    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="8.0.90" />
    <PackageReference Include="NLog" Version="5.3.4" />
    <PackageReference Include="System.Text.Json" Version="8.0.4" />
@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
  <PropertyGroup>
-    <ApplicationRevision>2712</ApplicationRevision>
-    <ApplicationVersion>1.1.2409.2712</ApplicationVersion>
+    <ApplicationRevision>2717</ApplicationRevision>
+    <ApplicationVersion>1.1.2409.2717</ApplicationVersion>
    <BootstrapperEnabled>True</BootstrapperEnabled>
    <Configuration>Release</Configuration>
    <CreateWebPageOnPublish>True</CreateWebPageOnPublish>
@@ -19,7 +19,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <OpenBrowserOnPublish>False</OpenBrowserOnPublish>
    <Platform>Any CPU</Platform>
    <ProductName>EgalWare AppControlCenter</ProductName>
-    <PublishDir>bin\Release\net8.0-windows\win-x86\app.publish\</PublishDir>
+    <PublishDir>bin\Release\net8.0-windows\app.publish\</PublishDir>
    <PublishUrl>bin\publish\</PublishUrl>
    <PublisherName>EgalWare s.r.l.</PublisherName>
    <PublishProtocol>ClickOnce</PublishProtocol>
@@ -36,7 +36,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <UpdateMode>Foreground</UpdateMode>
    <UpdateRequired>False</UpdateRequired>
    <WebPageFileName>Index.html</WebPageFileName>
-    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
  </PropertyGroup>
  <ItemGroup>
    <PublishFile Include="Components\Compo\ApplicationCheck.razor">
@@ -102,24 +101,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
      <IncludeHash>true</IncludeHash>
      <FileType>File</FileType>
    </PublishFile>
-    <PublishFile Include="Components\Pages\Nav02.razor">
-      <Group>
-      </Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Include</PublishState>
-      <IncludeHash>true</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
-    <PublishFile Include="Components\Pages\Nav03.razor">
-      <Group>
-      </Group>
-      <TargetPath>
-      </TargetPath>
-      <PublishState>Include</PublishState>
-      <IncludeHash>true</IncludeHash>
-      <FileType>File</FileType>
-    </PublishFile>
    <PublishFile Include="MainBlazor.razor">
      <Group>
      </Group>
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
  <PropertyGroup>
-    <History>True|2024-09-27T10:20:06.5931245Z||;True|2024-09-27T12:17:08.4113286+02:00||;True|2024-09-26T15:24:10.3619492+02:00||;True|2024-09-26T11:41:57.7840547+02:00||;True|2024-09-26T11:04:11.1945474+02:00||;True|2024-09-26T10:59:21.6944321+02:00||;True|2024-09-26T08:47:21.6588993+02:00||;True|2024-09-24T16:54:23.4735539+02:00||;True|2024-09-24T16:39:32.2152525+02:00||;True|2024-09-24T15:16:02.4976236+02:00||;True|2024-09-24T15:06:15.3728331+02:00||;</History>
+    <History>True|2024-09-27T15:08:55.9997044Z||;</History>
    <LastFailureDetails />
  </PropertyGroup>
 </Project>
@@ -9,6 +9,7 @@

  <ItemGroup>
    <PackageReference Include="EgwCoreLib.Utils" Version="1.5.2409.2607" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Analyzers" Version="8.0.8" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
    <PackageReference Include="NLog" Version="5.3.4" />
    <PackageReference Include="RestSharp" Version="112.0.0" />
@@ -1570,7 +1570,7 @@ namespace LiMan.DB.Controllers
                // cerco record esistente...
                var currRec = localDbCtx
                                .DbSetReleases
-                                .Where(x => (x.IdxRel == currItem.IdxRel && currItem.IdxRel > 0) || (x.CodApp == currItem.CodApp && x.VersNum == x.VersNum))
+                                .Where(x => (x.IdxRel == currItem.IdxRel && currItem.IdxRel > 0) || (x.CodApp == currItem.CodApp && x.VersNum == x.VersNum && x.VersText == x.VersText))
                                .FirstOrDefault();
                if (currRec != null)
                {
@@ -2,7 +2,7 @@

    <PropertyGroup>
        <TargetFramework>net6.0</TargetFramework>
-        <Version>1.1.2409.2619</Version>
+        <Version>1.1.2410.0209</Version>
        <RootNamespace>LiMan.UI</RootNamespace>
        <AssemblyName>LiMan.UI</AssemblyName>
    </PropertyGroup>
@@ -1,6 +1,6 @@
 <body>
    <i>License Manager</i>
-    <h4>Versione: 1.1.2409.2619</h4>
+    <h4>Versione: 1.1.2410.0209</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-1.1.2409.2619
+1.1.2410.0209
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.1.2409.2619</version>
+  <version>1.1.2410.0209</version>
  <url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.UI.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>
Author	SHA1	Message	Date
Samuele Locatelli	5d5aa0a731	Merge branch 'develop' into EgwAppControlCenter	2024-10-02 09:47:47 +02:00
Samuele Locatelli	9ed0df29dd	Merge branch 'EgwAppControlCenter' into develop	2024-10-02 09:47:28 +02:00
Samuele Locatelli	d08181d0d1	Merge tag 'LimanRelMgmt07' into develop Fix gestione rel management x save con vers duplicata	2024-10-02 09:46:53 +02:00
Samuele Locatelli	51168cc145	Merge branch 'release/LimanRelMgmt07'	2024-10-02 09:46:31 +02:00
Samuele Locatelli	5a1075db98	update procedura save release aggiornate	2024-10-02 09:46:01 +02:00
Samuele Locatelli	c5ce822bd4	Aggiunto env override verifica signature nuget x core8	2024-09-30 14:45:27 +02:00
Samuele Locatelli	0af8516020	test cambio yaml restore	2024-09-30 14:37:43 +02:00
Samuele Locatelli	c9847e8acd	ancora typo quote	2024-09-30 12:33:40 +02:00
Samuele Locatelli	5e2280bd33	altro test fix typo yaml x remove nuget	2024-09-30 12:26:42 +02:00
Samuele Locatelli	b6bfd8b7cb	yaml type fix?	2024-09-30 12:25:31 +02:00
Samuele Locatelli	103a1d5692	test sintassi alternativa sln	2024-09-30 12:03:39 +02:00
Samuele Locatelli	7f8de87683	spostamento step restore/deploy	2024-09-30 12:00:59 +02:00
Samuele Locatelli	90b43957ca	test push nuovo YAML	2024-09-30 11:44:45 +02:00
Samuele Locatelli	4b27d51b6a	Ancora test deploy con longpath...	2024-09-27 18:08:04 +02:00
Samuele Locatelli	9922330b9f	test restore su proj	2024-09-27 17:28:32 +02:00
Samuele Locatelli	b183ea2301	tolto build post restore x publish	2024-09-27 17:25:54 +02:00
Samuele Locatelli	6cea09e97d	Update analyzers sul proj core	2024-09-27 17:24:21 +02:00
Samuele Locatelli	06fcd2ee9b	Update esplicito analyzers x build	2024-09-27 17:19:09 +02:00
Samuele Locatelli	747510ac30	Target portable exec s dotnet8 (test x publish clickonce in yaml)	2024-09-27 17:09:33 +02:00
Samuele Locatelli	4961026cb8	update conf target publish	2024-09-27 17:04:13 +02:00
Samuele Locatelli	c071f70011	update yaml	2024-09-27 16:42:15 +02:00
Samuele Locatelli	f06cfc203f	Modifica MsBuild x compilazione e publish clickOnce (da provare)	2024-09-27 16:40:08 +02:00
Samuele Locatelli	86aaf5438c	Test modifica senza bootstrapper (setup x dotnet8)	2024-09-27 16:35:48 +02:00
Samuele Locatelli	965a44e677	Cleanup pagine e riferimenti	2024-09-27 16:30:29 +02:00
Samuele Locatelli	cb8ca635ec	ACC: - CleanUp codice YAML: - continuo fix pipeline	2024-09-27 16:25:01 +02:00
Samuele Locatelli	c9eafd8caf	Merge branch 'EgwAppControlCenter' of https://gitlab.steamware.net/egalware/limanapp into EgwAppControlCenter	2024-09-27 16:07:32 +02:00
Samuele Locatelli	55f40bf640	Update sintassi yaml	2024-09-27 16:07:13 +02:00
Samuele Emilio Locatelli	cdf5f57109	Update .gitlab-ci.yml file	2024-09-27 14:05:47 +00:00
Samuele Locatelli	87246d16a9	update yamlx escludere da build le cose non impiegate	2024-09-27 16:04:12 +02:00
Samuele Locatelli	b54de6961f	update yaml	2024-09-27 16:01:26 +02:00
Samuele Locatelli	78f7768dad	Modifica yaml x nuovo ramo...	2024-09-27 15:59:52 +02:00