Merge pull request OpenTabletDriver#3369 from InfinityGhost/master-ne…

…t8.0 Update master to .NET 8
AT-Geist · Jul 21, 2024 · 928b407 · 928b407
2 parents 32f051f + d4fd799
commit 928b407
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <VersionBase>0.7.0.0</VersionBase>
-    <FrameworkLTS>net6.0</FrameworkLTS>
-    <FrameworkLatest>net7.0</FrameworkLatest>
+    <FrameworkLTS>net8.0</FrameworkLTS>
+    <FrameworkLatest>net8.0</FrameworkLatest>
     <LangVersion>preview</LangVersion>
     <VersionPrefix>$(VersionBase)</VersionPrefix>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>

diff --git a/OpenTabletDriver.Desktop/Interop/Timer/FallbackTimer.cs b/OpenTabletDriver.Desktop/Interop/Timer/FallbackTimer.cs
@@ -2,6 +2,8 @@
 using System.Diagnostics;
 using System.Threading;
 
+using ITimer = OpenTabletDriver.ITimer;
+
 namespace OpenTabletDriver.Desktop.Interop.Timer
 {
     public class FallbackTimer : ITimer

diff --git a/default.nix b/default.nix
@@ -32,10 +32,10 @@ buildDotnetModule rec {
 
   src = ./.;
 
-  dotnet-sdk = dotnetCorePackages.sdk_7_0;
-  dotnet-runtime = dotnetCorePackages.runtime_7_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.runtime_8_0;
 
-  dotnetInstallFlags = [ "--framework=net7.0" ];
+  dotnetInstallFlags = [ "--framework=net8.0" ];
 
   projectFile = [ "OpenTabletDriver.Console" "OpenTabletDriver.Daemon" "OpenTabletDriver.UX.Gtk" ];
   nugetDeps = ./deps.nix;

diff --git a/eng/lib.sh b/eng/lib.sh
@@ -17,13 +17,13 @@ REPO_ROOT="$(readlink -f "${ENG_SCRIPT_ROOT}/../")"
 
 ### Build Requirements
 
-DOTNET_VERSION="7.0"
+DOTNET_VERSION="8.0"
 
 # could do away with declare -g, but did it anyway for all of them for consistency
 # with NET_RUNTIME (a global variable without initial value in lib.sh)
 declare -g OUTPUT="dist"
 declare -g CONFIG="Release"
-declare -g FRAMEWORK="net7.0"
+declare -g FRAMEWORK="net$DOTNET_VERSION"
 declare -g NET_RUNTIME
 declare -g DOG_FOOD="true"
 declare -g BUILD="true"

diff --git a/eng/windows/package.ps1 b/eng/windows/package.ps1
@@ -1,7 +1,7 @@
 param (
     $output = "dist",
     $config = "Release",
-    $framework = "net7.0",
+    $framework = "net8.0",
     $netRuntime = "win-x64",
     $isRelease = $true,
     $isPackage = $true,