From c61650c5eafff0632bb6de4c1f8a3fcca77281bf Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 27 Jul 2025 16:18:09 -0400 Subject: [PATCH] Update to .NET 10 preview 6 --- build/TestCommon.props | 2 +- .../Tgstation.Server.Client.GraphQL.csproj | 4 +++- .../Tgstation.Server.Client.csproj | 4 ++-- .../Tgstation.Server.Host.Console.csproj | 4 ++-- .../Tgstation.Server.Host.Service.csproj | 14 +++++--------- .../Tgstation.Server.Host.Watchdog.csproj | 2 +- src/Tgstation.Server.Host/System/SystemDManager.cs | 2 +- .../Tgstation.Server.Host.csproj | 12 ++++++------ .../Tgstation.Server.Shared.csproj | 2 +- 9 files changed, 22 insertions(+), 24 deletions(-) diff --git a/build/TestCommon.props b/build/TestCommon.props index 671db0cb7b..3f87378f49 100644 --- a/build/TestCommon.props +++ b/build/TestCommon.props @@ -13,7 +13,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Tgstation.Server.Client.GraphQL/Tgstation.Server.Client.GraphQL.csproj b/src/Tgstation.Server.Client.GraphQL/Tgstation.Server.Client.GraphQL.csproj index 67e9d74754..8317c28ea0 100644 --- a/src/Tgstation.Server.Client.GraphQL/Tgstation.Server.Client.GraphQL.csproj +++ b/src/Tgstation.Server.Client.GraphQL/Tgstation.Server.Client.GraphQL.csproj @@ -8,7 +8,9 @@ - + + + diff --git a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj index e6fd0c0ed7..7147aab8f8 100644 --- a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj +++ b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj @@ -11,9 +11,9 @@ - + - + diff --git a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj index 3934704562..06f38392b7 100644 --- a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj +++ b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj @@ -13,9 +13,9 @@ - + - + diff --git a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj index 4959e81773..5657a97c65 100644 --- a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj +++ b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj @@ -21,21 +21,17 @@ - + - + - + - - - - - + - + diff --git a/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj b/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj index d90985e2f4..97ec170509 100644 --- a/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj +++ b/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Tgstation.Server.Host/System/SystemDManager.cs b/src/Tgstation.Server.Host/System/SystemDManager.cs index d31f4d8e6d..20d9d53018 100644 --- a/src/Tgstation.Server.Host/System/SystemDManager.cs +++ b/src/Tgstation.Server.Host/System/SystemDManager.cs @@ -53,7 +53,7 @@ namespace Tgstation.Server.Host.System /// /// A representing the clock time in nanoseconds. /// See https://linux.die.net/man/3/clock_gettime. - static long GetMonotonicUsec() => global::System.Diagnostics.Stopwatch.GetTimestamp(); // HACK: https://github.com/dotnet/runtime/blob/v10.0.0-preview.2.25163.2/src/native/libs/System.Native/pal_time.c#L91 clock_gettime_nsec_np is an OSX only thing apparently... + static long GetMonotonicUsec() => global::System.Diagnostics.Stopwatch.GetTimestamp(); // HACK: https://github.com/dotnet/runtime/blob/v10.0.0-preview.6.25358.103/src/native/libs/System.Native/pal_time.c#L84 https://github.com/dotnet/runtime/blob/v10.0.0-preview.6.25358.103/src/native/minipal/time.c#L76 /// /// Initializes a new instance of the class. diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 1a4d1e6f99..91a82061f2 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -112,11 +112,11 @@ - + - + - + @@ -130,7 +130,7 @@ - + @@ -162,11 +162,11 @@ - + - + diff --git a/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj b/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj index c6f4f031b5..b5cd8a66fb 100644 --- a/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj +++ b/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj @@ -10,7 +10,7 @@ - +