diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index e297113..7864f13 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04, windows-latest] - framework: ['8.0'] + framework: ['10.0'] include: - os: ubuntu-22.04 target: linux-x64 @@ -18,7 +18,7 @@ jobs: timeout-minutes: 30 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - if: matrix.os == 'ubuntu-22.04' name: Install Linux packages @@ -27,7 +27,7 @@ jobs: sudo apt-get install -y build-essential libkrb5-dev make gcc libc-dev cmake llvm - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: dotnet-version: ${{ matrix.framework }} @@ -38,7 +38,7 @@ jobs: run: dotnet publish "LocalAdmin V2.csproj" -r ${{ matrix.target }} -c release -o "${{ github.workspace }}/builds/${{ matrix.framework }}/${{ matrix.target }}" - name: Upload ${{ matrix.target }} Build - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: LocalAdmin-${{ matrix.target }}-${{ matrix.framework }} path: ${{ github.workspace }}/builds/${{ matrix.framework }}/${{ matrix.target }} diff --git a/Commands/LicenseCommand.cs b/Commands/LicenseCommand.cs index b38adce..96f74ff 100644 --- a/Commands/LicenseCommand.cs +++ b/Commands/LicenseCommand.cs @@ -11,7 +11,7 @@ public LicenseCommand() : base("License", "Prints LocalAdmin license details.") internal override void Execute(string[] arguments) { ConsoleUtil.WriteLine("MIT License", ConsoleColor.Cyan); - ConsoleUtil.WriteLine("Copyright by Łukasz \"zabszk\" Jurczyk and KernelError, 2019 - 2025", ConsoleColor.Gray); + ConsoleUtil.WriteLine("Copyright by Łukasz \"zabszk\" Jurczyk and KernelError, 2019 - 2026", ConsoleColor.Gray); ConsoleUtil.WriteLine("Permission is hereby granted, free of charge, to any person obtaining a copy\r\nof this software and associated documentation files (the \"Software\"), to deal\r\nin the Software without restriction, including without limitation the rights\r\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r\ncopies of the Software, and to permit persons to whom the Software is\r\nfurnished to do so, subject to the following conditions:", ConsoleColor.Gray); ConsoleUtil.WriteLine("\r\nThe above copyright notice and this permission notice shall be included in all\r\ncopies or substantial portions of the Software.", ConsoleColor.Gray); ConsoleUtil.WriteLine("\r\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r\nSOFTWARE.", ConsoleColor.Gray); diff --git a/Core/LocalAdmin.cs b/Core/LocalAdmin.cs index 45938e0..6a87080 100644 --- a/Core/LocalAdmin.cs +++ b/Core/LocalAdmin.cs @@ -30,7 +30,7 @@ namespace LocalAdmin.V2.Core; public sealed class LocalAdmin : IDisposable { - public const string VersionString = "2.5.16"; + public const string VersionString = "2.5.17"; private const ushort DefaultPort = 7777; private static readonly ConcurrentQueue InputQueue = new(); @@ -613,7 +613,7 @@ private static void Menu() ConsoleUtil.WriteLine($"SCP: Secret Laboratory - LocalAdmin v. {VersionString}", ConsoleColor.Cyan); ConsoleUtil.WriteLine(string.Empty, ConsoleColor.Cyan); ConsoleUtil.WriteLine("Licensed under The MIT License (use command \"license\" to get license text).", ConsoleColor.Cyan); - ConsoleUtil.WriteLine("Copyright by Łukasz \"zabszk\" Jurczyk and KernelError, 2019 - 2025", ConsoleColor.Cyan); + ConsoleUtil.WriteLine("Copyright by Łukasz \"zabszk\" Jurczyk and KernelError, 2019 - 2026", ConsoleColor.Cyan); ConsoleUtil.WriteLine(string.Empty, ConsoleColor.Cyan); ConsoleUtil.WriteLine("Type 'help' to get list of available commands.", ConsoleColor.Cyan); ConsoleUtil.WriteLine(string.Empty, ConsoleColor.Cyan); diff --git a/Core/StartupArgManager.cs b/Core/StartupArgManager.cs index 26cd394..ce11c64 100644 --- a/Core/StartupArgManager.cs +++ b/Core/StartupArgManager.cs @@ -30,7 +30,7 @@ public static string[] MergeStartupArgs(IEnumerable cmdArgs) if (!File.Exists(StartupArgsPath)) return startupArgs.ToArray(); - startupArgs.AddRange(File.ReadAllLines(StartupArgsPath).Where(arg => !arg.StartsWith("#", StringComparison.Ordinal))); + startupArgs.AddRange(File.ReadAllLines(StartupArgsPath).Where(arg => !arg.StartsWith('#'))); return startupArgs.ToArray(); } catch (Exception ex) diff --git a/Core/TcpServer.cs b/Core/TcpServer.cs index dc0270d..8b8a4eb 100644 --- a/Core/TcpServer.cs +++ b/Core/TcpServer.cs @@ -212,7 +212,7 @@ public void WriteLine(string input) return; } - MemoryMarshal.Cast(buffer)[0] = length; + MemoryMarshal.Write(buffer, length); _networkStream!.Write(buffer, 0, length + offset); ArrayPool.Shared.Return(buffer); diff --git a/LICENSE b/LICENSE index e636579..7ebd41a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 - 2025 Łukasz "zabszk" Jurczyk and KernelError +Copyright (c) 2019 - 2026 Łukasz "zabszk" Jurczyk and KernelError Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/LocalAdmin V2.csproj b/LocalAdmin V2.csproj index 203ce7b..029b907 100644 --- a/LocalAdmin V2.csproj +++ b/LocalAdmin V2.csproj @@ -3,9 +3,9 @@ Exe true net8.0-windows - net8.0 + net10.0 app.manifest - 10 + 14 enable LocalAdmin.V2 LocalAdmin @@ -13,7 +13,7 @@ LocalAdmin V2 Northwood Studios Łukasz "zabszk" Jurczyk, KernelError - Copyright by Łukasz "zabszk" Jurczyk and KernelError, 2019 - 2025 + Copyright by Łukasz "zabszk" Jurczyk and KernelError, 2019 - 2026 true false