From 72f00a098d313ca573200cc3b7e6f907732a5c51 Mon Sep 17 00:00:00 2001 From: X9VoiD Date: Thu, 8 Dec 2022 00:18:20 +0000 Subject: [PATCH] Migrate to .NET 7.0 --- .github/workflows/dotnet.yml | 10 ++-- .github/workflows/release.yml | 6 +-- .gitignore | 4 +- .vscode/launch.json | 54 +++++++++++++++++++ .vscode/tasks.json | 53 ++++++++++++++++++ Directory.Build.props | 3 +- .../OpenTabletDriver.Benchmarks.csproj | 2 +- .../OpenTabletDriver.Configurations.csproj | 2 +- .../OpenTabletDriver.Console.csproj | 2 +- .../OpenTabletDriver.Daemon.csproj | 2 +- .../OpenTabletDriver.Desktop.csproj | 2 +- .../OpenTabletDriver.Native.csproj | 2 +- .../OpenTabletDriver.Tests.csproj | 2 +- .../OpenTabletDriver.Tools.udev.csproj | 2 +- .../OpenTabletDriver.UX.Gtk.csproj | 2 +- .../OpenTabletDriver.UX.MacOS.csproj | 2 +- .../OpenTabletDriver.UX.Wpf.csproj | 2 +- .../OpenTabletDriver.UX.csproj | 2 +- OpenTabletDriver/OpenTabletDriver.csproj | 2 +- build.sh | 2 +- generate-rules.sh | 2 +- 21 files changed, 135 insertions(+), 25 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 0375ab53c..46284d6fa 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -17,7 +17,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0' + dotnet-version: '7.0' include-prerelease: True - name: Linux Publish @@ -54,7 +54,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0' + dotnet-version: '7.0' include-prerelease: True - name: MacOS Publish @@ -82,7 +82,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0' + dotnet-version: '7.0' include-prerelease: True - name: Windows Publish @@ -113,7 +113,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0' + dotnet-version: '7.0' include-prerelease: True - name: Lint Changed Files @@ -131,7 +131,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0' + dotnet-version: '7.0' include-prerelease: True - name: Run tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b7d270279..53e2c4c23 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0' + dotnet-version: '7.0' include-prerelease: True - name: Debian Build run: ./Debian/package @@ -96,7 +96,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0' + dotnet-version: '7.0' include-prerelease: True - name: Package run: ./Windows/package.ps1 @@ -114,4 +114,4 @@ jobs: uses: actions/upload-artifact@master with: name: OpenTabletDriver.win-x64.zip - path: ./Windows/OpenTabletDriver.win-x64.zip \ No newline at end of file + path: ./Windows/OpenTabletDriver.win-x64.zip diff --git a/.gitignore b/.gitignore index b6789ae2d..279c4d245 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ # IDE .vs/ -.vscode/ +.vscode/** +!.vscode/launch.json +!.vscode/tasks.json .idea/ # Build Artifacts diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..743537557 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,54 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Daemon", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "Build Daemon", + "program": "${workspaceFolder}/OpenTabletDriver.Daemon/bin/Debug/net7.0/OpenTabletDriver.Daemon.dll", + "args": [], + "cwd": "${workspaceFolder}/OpenTabletDriver.Daemon", + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": "UX (Wpf)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "Build UX (Wpf)", + "program": "${workspaceFolder}/OpenTabletDriver.UX.Wpf/bin/Debug/net7.0/OpenTabletDriver.UX.Wpf.dll", + "args": [], + "cwd": "${workspaceFolder}/OpenTabletDriver.UX.Wpf", + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": "UX (Gtk)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "Build UX (Gtk)", + "program": "${workspaceFolder}/OpenTabletDriver.UX.Gtk/bin/Debug/net7.0/OpenTabletDriver.UX.Gtk.dll", + "args": [], + "cwd": "${workspaceFolder}/OpenTabletDriver.UX.Gtk", + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": "UX (MacOS)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "Build UX (MacOS)", + "program": "${workspaceFolder}/OpenTabletDriver.UX.MacOS/bin/Debug/net7.0/OpenTabletDriver.UX.MacOS.dll", + "args": [], + "cwd": "${workspaceFolder}/OpenTabletDriver.UX.MacOS", + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach" + } + ] +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 000000000..6e449930e --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,53 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Build Daemon", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/OpenTabletDriver.Daemon/OpenTabletDriver.Daemon.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Build UX (Wpf)", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/OpenTabletDriver.UX.Wpf/OpenTabletDriver.UX.Wpf.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Build UX (Gtk)", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Build UX (MacOS)", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/OpenTabletDriver.UX.MacOS/OpenTabletDriver.UX.MacOS.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + ] +} diff --git a/Directory.Build.props b/Directory.Build.props index 347a37cd8..c4cf939b9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,8 @@ 0.7.0.0 - net6.0 + net6.0 + net7.0 preview $(VersionBase) diff --git a/OpenTabletDriver.Benchmarks/OpenTabletDriver.Benchmarks.csproj b/OpenTabletDriver.Benchmarks/OpenTabletDriver.Benchmarks.csproj index d02910f1c..4c9d268b2 100644 --- a/OpenTabletDriver.Benchmarks/OpenTabletDriver.Benchmarks.csproj +++ b/OpenTabletDriver.Benchmarks/OpenTabletDriver.Benchmarks.csproj @@ -2,7 +2,7 @@ Exe - $(FrameworkBase) + $(FrameworkLatest) enable diff --git a/OpenTabletDriver.Configurations/OpenTabletDriver.Configurations.csproj b/OpenTabletDriver.Configurations/OpenTabletDriver.Configurations.csproj index 1da43c8e8..9a83a14ba 100644 --- a/OpenTabletDriver.Configurations/OpenTabletDriver.Configurations.csproj +++ b/OpenTabletDriver.Configurations/OpenTabletDriver.Configurations.csproj @@ -1,7 +1,7 @@ - net5.0;$(FrameworkBase) + $(FrameworkLTS);$(FrameworkLatest) true VSTHRD100; VSTHRD101; VSTHRD110; VSTHRD200 enable diff --git a/OpenTabletDriver.Console/OpenTabletDriver.Console.csproj b/OpenTabletDriver.Console/OpenTabletDriver.Console.csproj index 2593119e0..c09efde0e 100644 --- a/OpenTabletDriver.Console/OpenTabletDriver.Console.csproj +++ b/OpenTabletDriver.Console/OpenTabletDriver.Console.csproj @@ -2,7 +2,7 @@ Exe - $(FrameworkBase) + $(FrameworkLatest) VSTHRD100; VSTHRD101; VSTHRD110; VSTHRD200 enable diff --git a/OpenTabletDriver.Daemon/OpenTabletDriver.Daemon.csproj b/OpenTabletDriver.Daemon/OpenTabletDriver.Daemon.csproj index b68dd5083..7f23cb853 100644 --- a/OpenTabletDriver.Daemon/OpenTabletDriver.Daemon.csproj +++ b/OpenTabletDriver.Daemon/OpenTabletDriver.Daemon.csproj @@ -2,7 +2,7 @@ Exe - $(FrameworkBase) + $(FrameworkLatest) VSTHRD100; VSTHRD101; VSTHRD110; VSTHRD200 enable diff --git a/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj b/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj index 9bd9b1847..261eaa809 100644 --- a/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj +++ b/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj @@ -1,7 +1,7 @@ - $(FrameworkBase) + $(FrameworkLatest) true VSTHRD100; VSTHRD101; VSTHRD110; VSTHRD200 enable diff --git a/OpenTabletDriver.Native/OpenTabletDriver.Native.csproj b/OpenTabletDriver.Native/OpenTabletDriver.Native.csproj index 0501688e8..3a04bdfcb 100644 --- a/OpenTabletDriver.Native/OpenTabletDriver.Native.csproj +++ b/OpenTabletDriver.Native/OpenTabletDriver.Native.csproj @@ -1,7 +1,7 @@ - net5.0;$(FrameworkBase) + $(FrameworkLTS);$(FrameworkLatest) true enable diff --git a/OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj b/OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj index 488b22c42..43dce9a8e 100644 --- a/OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj +++ b/OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj @@ -1,7 +1,7 @@ - $(FrameworkBase) + $(FrameworkLatest) false enable diff --git a/OpenTabletDriver.Tools.udev/OpenTabletDriver.Tools.udev.csproj b/OpenTabletDriver.Tools.udev/OpenTabletDriver.Tools.udev.csproj index dbd49e867..97cf58078 100755 --- a/OpenTabletDriver.Tools.udev/OpenTabletDriver.Tools.udev.csproj +++ b/OpenTabletDriver.Tools.udev/OpenTabletDriver.Tools.udev.csproj @@ -2,7 +2,7 @@ Exe - $(FrameworkBase) + $(FrameworkLatest) enable diff --git a/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj b/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj index edd104f31..4a25e6bde 100644 --- a/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj +++ b/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj @@ -2,7 +2,7 @@ Exe - $(FrameworkBase) + $(FrameworkLatest) enable enable diff --git a/OpenTabletDriver.UX.MacOS/OpenTabletDriver.UX.MacOS.csproj b/OpenTabletDriver.UX.MacOS/OpenTabletDriver.UX.MacOS.csproj index 6b20b3a30..133113204 100644 --- a/OpenTabletDriver.UX.MacOS/OpenTabletDriver.UX.MacOS.csproj +++ b/OpenTabletDriver.UX.MacOS/OpenTabletDriver.UX.MacOS.csproj @@ -2,7 +2,7 @@ Exe - $(FrameworkBase) + $(FrameworkLatest) enable enable osx-x64;osx-arm64 diff --git a/OpenTabletDriver.UX.Wpf/OpenTabletDriver.UX.Wpf.csproj b/OpenTabletDriver.UX.Wpf/OpenTabletDriver.UX.Wpf.csproj index 32ed71cf8..8684de32a 100644 --- a/OpenTabletDriver.UX.Wpf/OpenTabletDriver.UX.Wpf.csproj +++ b/OpenTabletDriver.UX.Wpf/OpenTabletDriver.UX.Wpf.csproj @@ -2,7 +2,7 @@ WinExe - $(FrameworkBase)-windows + $(FrameworkLatest)-windows enable enable ../OpenTabletDriver.UX/Assets/otd.ico diff --git a/OpenTabletDriver.UX/OpenTabletDriver.UX.csproj b/OpenTabletDriver.UX/OpenTabletDriver.UX.csproj index f14053a42..b43f3c243 100644 --- a/OpenTabletDriver.UX/OpenTabletDriver.UX.csproj +++ b/OpenTabletDriver.UX/OpenTabletDriver.UX.csproj @@ -1,7 +1,7 @@  - $(FrameworkBase) + $(FrameworkLatest) enable enable diff --git a/OpenTabletDriver/OpenTabletDriver.csproj b/OpenTabletDriver/OpenTabletDriver.csproj index f864efeb8..8d39c6e72 100644 --- a/OpenTabletDriver/OpenTabletDriver.csproj +++ b/OpenTabletDriver/OpenTabletDriver.csproj @@ -1,7 +1,7 @@ - net5.0;$(FrameworkBase) + $(FrameworkLTS);$(FrameworkLatest) true VSTHRD100; VSTHRD101; VSTHRD110; VSTHRD200 enable diff --git a/build.sh b/build.sh index 171d711cc..9897cf9b6 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ shift config=(--configuration='Release') -options=(${config} --framework='net6.0' --self-contained='false' --verbosity=quiet --output='./bin' \ +options=(${config} --framework='net7.0' --self-contained='false' --verbosity=quiet --output='./bin' \ /p:SuppressNETCoreSdkPreviewMessage=true /p:PublishTrimmed=false --runtime=$runtime -p:SourceRevisionId=$(git rev-parse --short HEAD)) # change dir to script root, in case people run the script outside of the folder diff --git a/generate-rules.sh b/generate-rules.sh index e96d2cc3a..1ccb86843 100755 --- a/generate-rules.sh +++ b/generate-rules.sh @@ -4,7 +4,7 @@ SRC_ROOT=$(readlink -f $(dirname ${BASH_SOURCE[0]})) [ ! -d "${SRC_ROOT}" ] && exit 100; PROJECT="${SRC_ROOT}/OpenTabletDriver.Tools.udev" -FRAMEWORK="net6.0" +FRAMEWORK="net7.0" TABLET_CONFIGURATIONS="${SRC_ROOT}/OpenTabletDriver.Configurations/Configurations" RULES_FILE="${SRC_ROOT}/bin/99-opentabletdriver.rules"