Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 }}

Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion Commands/LicenseCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions Core/LocalAdmin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<string> InputQueue = new();
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Core/StartupArgManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static string[] MergeStartupArgs(IEnumerable<string> 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)
Expand Down
2 changes: 1 addition & 1 deletion Core/TcpServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public void WriteLine(string input)
return;
}

MemoryMarshal.Cast<byte, int>(buffer)[0] = length;
MemoryMarshal.Write(buffer, length);

_networkStream!.Write(buffer, 0, length + offset);
ArrayPool<byte>.Shared.Return(buffer);
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions LocalAdmin V2.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<OutputType>Exe</OutputType>
<DisableWinExeOutputInference>true</DisableWinExeOutputInference>
<TargetFramework Condition="$(RuntimeIdentifier.StartsWith('win', StringComparison.OrdinalIgnoreCase))">net8.0-windows</TargetFramework>
<TargetFramework Condition="!$(RuntimeIdentifier.StartsWith('win', StringComparison.OrdinalIgnoreCase))">net8.0</TargetFramework>
<TargetFramework Condition="!$(RuntimeIdentifier.StartsWith('win', StringComparison.OrdinalIgnoreCase))">net10.0</TargetFramework>
<ApplicationManifest>app.manifest</ApplicationManifest>
<LangVersion>10</LangVersion>
<LangVersion>14</LangVersion>
<Nullable>enable</Nullable>
<RootNamespace>LocalAdmin.V2</RootNamespace>
<AssemblyName>LocalAdmin</AssemblyName>
<Product>LocalAdmin V2</Product>
<PackageId>LocalAdmin V2</PackageId>
<Company>Northwood Studios</Company>
<Authors>Łukasz "zabszk" Jurczyk, KernelError</Authors>
<Copyright>Copyright by Łukasz "zabszk" Jurczyk and KernelError, 2019 - 2025</Copyright>
<Copyright>Copyright by Łukasz "zabszk" Jurczyk and KernelError, 2019 - 2026</Copyright>

<SuppressAotAnalysisWarnings>true</SuppressAotAnalysisWarnings>
<RootAllApplicationAssemblies>false</RootAllApplicationAssemblies>
Expand Down