Integry/IntegryServerControlCenter
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish v2.4.8.0

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-11-25 11:01:29 +01:00
parent 3effe037e2 c69b37eece
commit aacd183abf
7 changed files with 28 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Integry Server Control Center Avalonia/Integry Server Control Center Avalonia - Backup.csproj
View File

@@ -1,62 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Nullable>enable</Nullable>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<AssemblyVersion>2.3.0.2</AssemblyVersion>
<FileVersion>2.3.0.2</FileVersion>
<PackageIcon>favicon.ico</PackageIcon>
<ApplicationIcon>favicon.ico</ApplicationIcon>
<ApplicationManifest>app.manifest</ApplicationManifest>
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
</PropertyGroup>
<ItemGroup>
<AvaloniaResource Include="Assets\**" />
<AvaloniaXaml Remove="Models\**" />
<Compile Remove="Models\**" />
<EmbeddedResource Remove="Models\**" />
<None Remove="Models\**" />
<Folder Include="Core\" />
<Folder Include="Views\Models\" />
</ItemGroup>
<ItemGroup>
<None Remove="Assets\integry-logo-full-white.png" />
<None Include="favicon.ico">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="Assets\Fonts\Roboto\LICENSE.txt" />
<Content Include="Assets\Fonts\Roboto\Roboto-Black.ttf" />
<Content Include="Assets\Fonts\Roboto\Roboto-BlackItalic.ttf" />
<Content Include="Assets\Fonts\Roboto\Roboto-Bold.ttf" />
<Content Include="Assets\Fonts\Roboto\Roboto-BoldItalic.ttf" />
<Content Include="Assets\Fonts\Roboto\Roboto-Italic.ttf" />
<Content Include="Assets\Fonts\Roboto\Roboto-Light.ttf" />
<Content Include="Assets\Fonts\Roboto\Roboto-LightItalic.ttf" />
<Content Include="Assets\Fonts\Roboto\Roboto-Medium.ttf" />
<Content Include="Assets\Fonts\Roboto\Roboto-MediumItalic.ttf" />
<Content Include="Assets\Fonts\Roboto\Roboto-Regular.ttf" />
<Content Include="Assets\Fonts\Roboto\Roboto-Thin.ttf" />
<Content Include="Assets\Fonts\Roboto\Roboto-ThinItalic.ttf" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.10" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.10" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.10" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.10" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Integry Server Control Center BASE\Integry Server Control Center BASE.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="Views\UpdaterMESToscaView.axaml.cs">
<DependentUpon>UpdaterMesToscaView.axaml</DependentUpon>
</Compile>
<Compile Update="Views\UpdaterWMSView.axaml.cs">
<DependentUpon>UpdaterWMSView.axaml</DependentUpon>
</Compile>
</ItemGroup>
</Project>

16
Integry Server Control Center Avalonia/Integry Server Control Center Avalonia.csproj
View File

@@ -3,8 +3,8 @@
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<AssemblyVersion>2.4.7.1</AssemblyVersion>
<FileVersion>2.4.7.1</FileVersion>
<AssemblyVersion>2.4.8.0</AssemblyVersion>
<FileVersion>2.4.8.0</FileVersion>
<PackageIcon>favicon.ico</PackageIcon>
<ApplicationIcon>favicon.ico</ApplicationIcon>
<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -43,13 +43,13 @@
<Content Include="Assets\Fonts\Roboto\Roboto-ThinItalic.ttf" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.5" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.5" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.5" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.5" />
<PackageReference Include="FluentAvaloniaUI" Version="2.4.0" />
<PackageReference Include="Avalonia" Version="11.3.9" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.9" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.9" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9" />
<PackageReference Include="FluentAvaloniaUI" Version="2.4.1" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.11" />
<PackageReference Include="Svg.Controls.Avalonia" Version="11.3.0.4" />
</ItemGroup>
<ItemGroup>

8
Integry Server Control Center BASE/Integry Server Control Center BASE.csproj
View File

@@ -14,14 +14,14 @@
<ItemGroup>
<PackageReference Include="BCrypt.Net-Core" Version="1.6.0" />
<PackageReference Include="FluentFTP" Version="52.1.0" />
<PackageReference Include="MailKit" Version="4.13.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SharpCompress" Version="0.39.0" />
<PackageReference Include="MailKit" Version="4.14.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="SharpCompress" Version="0.41.0" />
<PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.3" />
<PackageReference Include="System.ServiceModel.Http" Version="8.1.2" />
<PackageReference Include="System.ServiceModel.Primitives" Version="8.1.2" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.9" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.11" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
</ItemGroup>

2
Integry Server Control Center Service/Core/CommonConst.cs
View File

@@ -3,7 +3,7 @@
public static class CommonConst
{
public const string ShortNeededNetCoreRuntime = "9.0";
public const string LongNeededNetCoreRuntime = $"{ShortNeededNetCoreRuntime}.2";
public const string LongNeededNetCoreRuntime = $"{ShortNeededNetCoreRuntime}.11";
public const string NetCoreName = "Microsoft.NETCore.App";
public const string AspNetCoreName = "Microsoft.AspNetCore.App";

26
Integry Server Control Center Service/Core/Service/NetCoreRuntimeManagerWindowsService.cs
View File

@@ -13,25 +13,19 @@ using Integry_Server_Control_Center_BASE.Core.Logger;
namespace Integry_Server_Control_Center_Service.Core.Service;
public class NetCoreRuntimeManagerWindowsService : INetCoreRuntimeManagerService
public class NetCoreRuntimeManagerWindowsService(
ILoggerService loggerService,
INetCoreRuntimeVersionRetrieveService versionRetrieveService)
: INetCoreRuntimeManagerService
{
private const string BaseDownloadUrl = "https://www.integry.it/download/netcore_runtime/";
private const string AspNetCoreRuntimeInstallFile = $"aspnetcore-runtime-{CommonConst.LongNeededNetCoreRuntime}-win-x64.exe";
private const string NetCoreRuntimeInstallFile = $"dotnet-runtime-{CommonConst.LongNeededNetCoreRuntime}-win-x64.exe";
private const string DesktopNetCoreRuntimeInstallFile = $"windowsdesktop-runtime-{CommonConst.LongNeededNetCoreRuntime}-win-x64.exe";
private readonly ILoggerService _loggerService;
private readonly INetCoreRuntimeVersionRetrieveService _versionRetrieveService;
public NetCoreRuntimeManagerWindowsService(ILoggerService loggerService, INetCoreRuntimeVersionRetrieveService versionRetrieveService)
{
_loggerService = loggerService;
_versionRetrieveService = versionRetrieveService;
}
public async Task CheckAndInstall()
{
var foundRuntimes = await _versionRetrieveService.GetAvailableRuntimes();
var foundRuntimes = await versionRetrieveService.GetAvailableRuntimes();
if (foundRuntimes == null || !foundRuntimes.Any(x => x.Name.Equals(CommonConst.DesktopNetCoreName) && x.Version.Equals(CommonConst.LongNeededNetCoreRuntime)))
await InstallNetCoreRuntime(CommonConst.LongNeededNetCoreRuntime);
@@ -68,19 +62,19 @@ public class NetCoreRuntimeManagerWindowsService : INetCoreRuntimeManagerService
private void OnDownloadProgressUpdate(int progress)
{
_loggerService.LogVerbose($"Download {progress}%");
loggerService.LogVerbose($"Download {progress}%");
}
private void OnDownloadLog(string log)
{
_loggerService.LogDebug(log);
loggerService.LogDebug(log);
}
private void OnDownloadError(Exception exception)
{
_loggerService.LogError(exception);
loggerService.LogError(exception);
}
@@ -99,14 +93,14 @@ public class NetCoreRuntimeManagerWindowsService : INetCoreRuntimeManagerService
while (await process.StandardOutput.ReadLineAsync() is { } standardOutput)
{
_loggerService.LogVerbose(standardOutput, "Net Runtime Installation Output");
loggerService.LogVerbose(standardOutput, "Net Runtime Installation Output");
}
await process.WaitForExitAsync();
}
catch(Exception ex)
{
_loggerService.LogError(ex);
loggerService.LogError(ex);
}
}
}

11
Integry Server Control Center Service/Core/Service/NetCoreRuntimeVersionRetrieveService.cs
View File

@@ -8,20 +8,13 @@ using Integry_Server_Control_Center_Service.Core.Service.Dto;
namespace Integry_Server_Control_Center_Service.Core.Service;
public class NetCoreRuntimeVersionRetrieveService : INetCoreRuntimeVersionRetrieveService
public class NetCoreRuntimeVersionRetrieveService(ILoggerService loggerService) : INetCoreRuntimeVersionRetrieveService
{
private const string NetCoreName = "Microsoft.NETCore.App";
private const string AspNetCoreName = "Microsoft.AspNetCore.App";
private const string DesktopNetCoreName = "Microsoft.WindowsDesktop.App";
private readonly ILoggerService _loggerService;
public NetCoreRuntimeVersionRetrieveService(ILoggerService loggerService)
{
_loggerService = loggerService;
}
public async Task<IList<NetCoreRuntimeVersionDto>> GetAvailableRuntimes()
{
@@ -65,7 +58,7 @@ public class NetCoreRuntimeVersionRetrieveService : INetCoreRuntimeVersionRetrie
}
catch (Exception ex)
{
_loggerService.LogError(ex);
loggerService.LogError(ex);
}
return foundRuntimes;

6
Integry Server Control Center Service/Integry Server Control Center Service.csproj
View File

@@ -4,8 +4,8 @@
<TargetFramework>net8.0</TargetFramework>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<RootNamespace>Integry_Server_Control_Center_Service</RootNamespace>
<AssemblyVersion>2.4.7.1</AssemblyVersion>
<FileVersion>2.4.7.1</FileVersion>
<AssemblyVersion>2.4.8.0</AssemblyVersion>
<FileVersion>2.4.8.0</FileVersion>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -18,7 +18,7 @@
<ItemGroup>
<PackageReference Include="Topshelf" Version="4.3.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.11" />
</ItemGroup>
<ItemGroup>