diff options
author | Sebastian 'gonX' Jensen | 2021-11-13 19:49:46 +0100 |
---|---|---|
committer | Sebastian 'gonX' Jensen | 2021-11-13 19:50:09 +0100 |
commit | c3c53e27022a99ad344dc3d41419f5a88ed0c910 (patch) | |
tree | 4f59e4e5a7303e63150127a6baedc931ad06fe2e | |
parent | e4b497b4d9f7e0bea5dca096f13b86169f2aad9a (diff) | |
download | aur-c3c53e27022a99ad344dc3d41419f5a88ed0c910.tar.gz |
Use X9VoiD's dotnet6.0 patch
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 28 | ||||
-rw-r--r-- | otd-use-dotnet60.patch | 409 |
3 files changed, 427 insertions, 14 deletions
@@ -1,7 +1,7 @@ pkgbase = opentabletdriver-git pkgdesc = A cross-platform open source tablet driver pkgver = v0.5.3.1.r675.g35ae3e65 - pkgrel = 8 + pkgrel = 9 url = https://github.com/OpenTabletDriver/OpenTabletDriver install = notes.install arch = x86_64 @@ -22,11 +22,13 @@ pkgbase = opentabletdriver-git source = opentabletdriver.service source = OpenTabletDriver.desktop source = notes.install + source = otd-use-dotnet60.patch sha256sums = SKIP sha256sums = 8a09d29e683aefcbf54e5fe891d5688f959d9399804f9c151f0e8f6e6a1ede1a sha256sums = 20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0 sha256sums = 88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2 sha256sums = 4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834 sha256sums = f1f88e4a57b4caf503192a773fdbb88531b51499bfb9b350421d7e92795736fd + sha256sums = 3e15e50a68d092ab768d3f75d9cf17004fa1f4bb214a65cf554878d7d3051ca0 pkgname = opentabletdriver-git @@ -6,7 +6,7 @@ _pkgname=OpenTabletDriver _lpkgname=opentabletdriver _spkgname=otd pkgver=v0.5.3.1.r675.g35ae3e65 -pkgrel=8 +pkgrel=9 pkgdesc="A cross-platform open source tablet driver" arch=('x86_64') url="https://github.com/OpenTabletDriver/OpenTabletDriver" @@ -22,20 +22,31 @@ source=('git+https://github.com/OpenTabletDriver/OpenTabletDriver' "$_spkgname-gui" "$_lpkgname.service" "$_pkgname.desktop" - "notes.install") + "notes.install" + "otd-use-dotnet60.patch") sha256sums=('SKIP' '8a09d29e683aefcbf54e5fe891d5688f959d9399804f9c151f0e8f6e6a1ede1a' '20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0' '88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2' '4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834' - 'f1f88e4a57b4caf503192a773fdbb88531b51499bfb9b350421d7e92795736fd') + 'f1f88e4a57b4caf503192a773fdbb88531b51499bfb9b350421d7e92795736fd' + '3e15e50a68d092ab768d3f75d9cf17004fa1f4bb214a65cf554878d7d3051ca0') pkgver() { cd "$srcdir/$_pkgname" git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } +prepare() { + cd "$srcdir/$_pkgname" + if [ -f "$srcdir"/*.patch ]; then + for i in "$srcdir"/*.patch; do + patch -Np1 -i "$i" || true + done + fi +} + build() { export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true @@ -53,16 +64,7 @@ build() { /p:VersionPrefix="$PREFIX" \ $EXTRA_OPTIONS - dotnet build OpenTabletDriver.Tools.udev \ - --configuration Release \ - --framework net5.0 \ - --runtime linux-x64 \ - --output "./$_pkgname/out-udev" \ - /p:SuppressNETCoreSdkPreviewMessage=true - - dotnet "./$_pkgname/out-udev/$_pkgname.Tools.udev.dll" \ - "$srcdir/$_pkgname/$_pkgname.Configurations/Configurations" \ - "bin/99-$_lpkgname.rules" > /dev/null + ./generate-rules.sh } package() { diff --git a/otd-use-dotnet60.patch b/otd-use-dotnet60.patch new file mode 100644 index 000000000000..6b62886de986 --- /dev/null +++ b/otd-use-dotnet60.patch @@ -0,0 +1,409 @@ +diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml +index 6c678887..1e90fc14 100644 +--- a/.github/workflows/dotnet.yml ++++ b/.github/workflows/dotnet.yml +@@ -14,16 +14,16 @@ jobs: + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: +- dotnet-version: 5.0.x ++ dotnet-version: '6.0' ++ include-prerelease: True + - name: Linux Publish + env: + runtime: linux-x64 +- framework: net5 +- options: --configuration Release -p:DebugType=embedded --self-contained false ++ options: --configuration Release -p:DebugType=embedded --no-self-contained + run: | +- dotnet publish OpenTabletDriver.Daemon $options --runtime $runtime --framework $framework -o build/$runtime +- dotnet publish OpenTabletDriver.Console $options --runtime $runtime --framework $framework -o build/$runtime +- dotnet publish OpenTabletDriver.UX.Gtk $options --runtime $runtime --framework $framework -o build/$runtime ++ dotnet publish OpenTabletDriver.Daemon $options --runtime $runtime -o build/$runtime ++ dotnet publish OpenTabletDriver.Console $options --runtime $runtime -o build/$runtime ++ dotnet publish OpenTabletDriver.UX.Gtk $options --runtime $runtime -o build/$runtime + - name: Upload Linux artifacts + uses: actions/upload-artifact@master + with: +@@ -46,16 +46,16 @@ jobs: + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: +- dotnet-version: 5.0.x ++ dotnet-version: '6.0' ++ include-prerelease: True + - name: MacOS Publish + env: + runtime: osx-x64 +- framework: net5 +- options: --configuration Release -p:DebugType=embedded -p:PublishTrimmed=false --self-contained false ++ options: --configuration Release -p:DebugType=embedded -p:PublishTrimmed=false --no-self-contained + run: | +- dotnet publish OpenTabletDriver.Daemon $options --runtime $runtime --framework $framework -o build/$runtime +- dotnet publish OpenTabletDriver.Console $options --runtime $runtime --framework $framework -o build/$runtime +- dotnet publish OpenTabletDriver.UX.MacOS $options --runtime $runtime --framework $framework -o build/$runtime ++ dotnet publish OpenTabletDriver.Daemon $options --runtime $runtime -o build/$runtime ++ dotnet publish OpenTabletDriver.Console $options --runtime $runtime -o build/$runtime ++ dotnet publish OpenTabletDriver.UX.MacOS $options --runtime $runtime -o build/$runtime + - name: Upload MacOS artifacts + uses: actions/upload-artifact@master + with: +@@ -70,16 +70,16 @@ jobs: + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: +- dotnet-version: 5.0.x ++ dotnet-version: '6.0' ++ include-prerelease: True + - name: Windows Publish + env: + runtime: win-x64 +- framework: net5 + run: | +- $options= @('--configuration', 'Release', '-p:PublishSingleFile=true', '-p:DebugType=embedded', '--self-contained', 'false') +- dotnet publish OpenTabletDriver.Daemon $options --runtime $ENV:runtime --framework $ENV:framework -o build/$ENV:runtime +- dotnet publish OpenTabletDriver.Console $options --runtime $ENV:runtime --framework $ENV:framework -o build/$ENV:runtime +- dotnet publish OpenTabletDriver.UX.Wpf $options --runtime $ENV:runtime --framework $ENV:framework-windows -o build/$ENV:runtime ++ $options= @('--configuration', 'Release', '-p:PublishSingleFile=true', '-p:DebugType=embedded', '--no-self-contained') ++ dotnet publish OpenTabletDriver.Daemon $options --runtime $ENV:runtime -o build/$ENV:runtime ++ dotnet publish OpenTabletDriver.Console $options --runtime $ENV:runtime -o build/$ENV:runtime ++ dotnet publish OpenTabletDriver.UX.Wpf $options --runtime $ENV:runtime -o build/$ENV:runtime + - name: Upload Windows artifacts + uses: actions/upload-artifact@master + with: +diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml +index dbd9a564..2ced4c72 100644 +--- a/.github/workflows/release.yml ++++ b/.github/workflows/release.yml +@@ -30,7 +30,8 @@ jobs: + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: +- dotnet-version: 5.0.x ++ dotnet-version: '6.0' ++ include-prerelease: True + - name: Debian Build + run: ./Debian/package build + - name: Generic Linux Build +@@ -63,7 +64,8 @@ jobs: + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: +- dotnet-version: 5.0.x ++ dotnet-version: '6.0' ++ include-prerelease: True + - name: Package + run: ./Windows/package.ps1 build + - name: Upload assets for tag +diff --git a/Directory.Build.props b/Directory.Build.props +new file mode 100644 +index 00000000..4a868a88 +--- /dev/null ++++ b/Directory.Build.props +@@ -0,0 +1,13 @@ ++<Project> ++ <PropertyGroup> ++ <VersionBase>0.6.0.0</VersionBase> ++ <FrameworkBase>net6.0</FrameworkBase> ++ <LangVersion>preview</LangVersion> ++ <VersionPrefix>$(VersionBase)</VersionPrefix> ++ </PropertyGroup> ++ ++ <PropertyGroup Label="Package Information"> ++ <Authors>InfinityGhost</Authors> ++ <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression> ++ </PropertyGroup> ++</Project> +\ No newline at end of file +diff --git a/OpenTabletDriver.Benchmarks/OpenTabletDriver.Benchmarks.csproj b/OpenTabletDriver.Benchmarks/OpenTabletDriver.Benchmarks.csproj +index e8bc9066..3682450f 100644 +--- a/OpenTabletDriver.Benchmarks/OpenTabletDriver.Benchmarks.csproj ++++ b/OpenTabletDriver.Benchmarks/OpenTabletDriver.Benchmarks.csproj +@@ -2,7 +2,7 @@ + + <PropertyGroup Label="Project Properties"> + <OutputType>Exe</OutputType> +- <TargetFrameworks>net5</TargetFrameworks> ++ <TargetFramework>$(FrameworkBase)</TargetFramework> + </PropertyGroup> + + <ItemGroup Label="NuGet Packages"> +diff --git a/OpenTabletDriver.Configurations/OpenTabletDriver.Configurations.csproj b/OpenTabletDriver.Configurations/OpenTabletDriver.Configurations.csproj +index 0eb1e5a7..d29843a9 100644 +--- a/OpenTabletDriver.Configurations/OpenTabletDriver.Configurations.csproj ++++ b/OpenTabletDriver.Configurations/OpenTabletDriver.Configurations.csproj +@@ -1,20 +1,15 @@ + <Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup Label="Project Properties"> +- <TargetFrameworks>net5</TargetFrameworks> ++ <TargetFramework>$(FrameworkBase)</TargetFramework> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> +- <VersionPrefix>0.6.0.0</VersionPrefix> + <NoWarn>VSTHRD100; VSTHRD101; VSTHRD110; VSTHRD200</NoWarn> +- <LangVersion>preview</LangVersion> + </PropertyGroup> + + <PropertyGroup Label="NuGet Package Information"> + <PackageId>OpenTabletDriver.Configurations</PackageId> +- <Version>0.6.0.0</Version> +- <Authors>InfinityGhost</Authors> + <Description>OpenTabletDriver tablet configurations</Description> + <PackageOutputPath>../nupkg</PackageOutputPath> +- <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression> + </PropertyGroup> + + <ItemGroup Label="NuGet Packages"> +diff --git a/OpenTabletDriver.Console/OpenTabletDriver.Console.csproj b/OpenTabletDriver.Console/OpenTabletDriver.Console.csproj +index 4969138f..5600caf4 100644 +--- a/OpenTabletDriver.Console/OpenTabletDriver.Console.csproj ++++ b/OpenTabletDriver.Console/OpenTabletDriver.Console.csproj +@@ -2,10 +2,8 @@ + + <PropertyGroup Label="Project Properties"> + <OutputType>Exe</OutputType> +- <TargetFrameworks>net5</TargetFrameworks> +- <VersionPrefix>0.6.0.0</VersionPrefix> ++ <TargetFramework>$(FrameworkBase)</TargetFramework> + <NoWarn>VSTHRD100; VSTHRD101; VSTHRD110; VSTHRD200</NoWarn> +- <LangVersion>preview</LangVersion> + </PropertyGroup> + + <PropertyGroup Label="Pack"> +diff --git a/OpenTabletDriver.Daemon/OpenTabletDriver.Daemon.csproj b/OpenTabletDriver.Daemon/OpenTabletDriver.Daemon.csproj +index 47929c82..82f8871b 100644 +--- a/OpenTabletDriver.Daemon/OpenTabletDriver.Daemon.csproj ++++ b/OpenTabletDriver.Daemon/OpenTabletDriver.Daemon.csproj +@@ -2,10 +2,8 @@ + + <PropertyGroup Label="Project Properties"> + <OutputType>Exe</OutputType> +- <TargetFrameworks>net5</TargetFrameworks> +- <VersionPrefix>0.6.0.0</VersionPrefix> ++ <TargetFramework>$(FrameworkBase)</TargetFramework> + <NoWarn>VSTHRD100; VSTHRD101; VSTHRD110; VSTHRD200</NoWarn> +- <LangVersion>preview</LangVersion> + </PropertyGroup> + + <ItemGroup Label="Project References"> +diff --git a/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj b/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj +index 2941a38a..84d28032 100644 +--- a/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj ++++ b/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj +@@ -1,7 +1,7 @@ + <Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup Label="Project Properties"> +- <TargetFramework>net5.0</TargetFramework> ++ <TargetFramework>$(FrameworkBase)</TargetFramework> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <NoWarn>VSTHRD100; VSTHRD101; VSTHRD110; VSTHRD200</NoWarn> + </PropertyGroup> +diff --git a/OpenTabletDriver.Desktop/Reflection/Metadata/PluginMetadata.cs b/OpenTabletDriver.Desktop/Reflection/Metadata/PluginMetadata.cs +index 2c2fd1f3..2dd0b187 100644 +--- a/OpenTabletDriver.Desktop/Reflection/Metadata/PluginMetadata.cs ++++ b/OpenTabletDriver.Desktop/Reflection/Metadata/PluginMetadata.cs +@@ -68,7 +68,7 @@ namespace OpenTabletDriver.Desktop.Reflection.Metadata + + public static string GetSHA256(Stream stream) + { +- using (var sha256 = SHA256Managed.Create()) ++ using (var sha256 = System.Security.Cryptography.SHA256.Create()) + { + var hashData = sha256.ComputeHash(stream); + stream.Position = 0; +diff --git a/OpenTabletDriver.Desktop/Reflection/Metadata/PluginMetadataCollection.cs b/OpenTabletDriver.Desktop/Reflection/Metadata/PluginMetadataCollection.cs +index 7cc7eea2..d28d8dc0 100644 +--- a/OpenTabletDriver.Desktop/Reflection/Metadata/PluginMetadataCollection.cs ++++ b/OpenTabletDriver.Desktop/Reflection/Metadata/PluginMetadataCollection.cs +@@ -79,7 +79,7 @@ namespace OpenTabletDriver.Desktop.Reflection.Metadata + + protected static string CalculateSHA256(Stream stream) + { +- using (var sha256 = SHA256Managed.Create()) ++ using (var sha256 = SHA256.Create()) + { + var hashData = sha256.ComputeHash(stream); + stream.Position = 0; +diff --git a/OpenTabletDriver.Native/OpenTabletDriver.Native.csproj b/OpenTabletDriver.Native/OpenTabletDriver.Native.csproj +index 9149b9fc..48d31976 100644 +--- a/OpenTabletDriver.Native/OpenTabletDriver.Native.csproj ++++ b/OpenTabletDriver.Native/OpenTabletDriver.Native.csproj +@@ -1,9 +1,8 @@ + <Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup Label="Project Properties"> +- <TargetFrameworks>net5</TargetFrameworks> ++ <TargetFramework>$(FrameworkBase)</TargetFramework> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> +- <LangVersion>preview</LangVersion> + </PropertyGroup> + + </Project> +diff --git a/OpenTabletDriver.Plugin/OpenTabletDriver.Plugin.csproj b/OpenTabletDriver.Plugin/OpenTabletDriver.Plugin.csproj +index c2710351..eaaf232a 100644 +--- a/OpenTabletDriver.Plugin/OpenTabletDriver.Plugin.csproj ++++ b/OpenTabletDriver.Plugin/OpenTabletDriver.Plugin.csproj +@@ -1,17 +1,13 @@ + <Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup Label="Project Properties"> +- <TargetFrameworks>net5</TargetFrameworks> +- <LangVersion>preview</LangVersion> ++ <TargetFramework>$(FrameworkBase)</TargetFramework> + </PropertyGroup> + + <PropertyGroup Label="NuGet Package Information"> + <PackageId>OpenTabletDriver.Plugin</PackageId> +- <Version>0.6.0.0</Version> +- <Authors>InfinityGhost</Authors> + <Description>Library used to create OpenTabletDriver plugins.</Description> + <PackageOutputPath>../nupkg</PackageOutputPath> +- <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression> + </PropertyGroup> + + </Project> +diff --git a/OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj b/OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj +index 1ee222ed..ba5ccc20 100644 +--- a/OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj ++++ b/OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj +@@ -1,10 +1,9 @@ + <Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup Label="Project Properties"> +- <TargetFrameworks>net5</TargetFrameworks> ++ <TargetFramework>$(FrameworkBase)</TargetFramework> + <Nullable>enable</Nullable> + <IsPackable>false</IsPackable> +- <LangVersion>preview</LangVersion> + </PropertyGroup> + + <ItemGroup> +diff --git a/OpenTabletDriver.Tools.udev/OpenTabletDriver.Tools.udev.csproj b/OpenTabletDriver.Tools.udev/OpenTabletDriver.Tools.udev.csproj +index 3e90b5b4..3807f084 100755 +--- a/OpenTabletDriver.Tools.udev/OpenTabletDriver.Tools.udev.csproj ++++ b/OpenTabletDriver.Tools.udev/OpenTabletDriver.Tools.udev.csproj +@@ -2,7 +2,7 @@ + + <PropertyGroup> + <OutputType>Exe</OutputType> +- <TargetFrameworks>net5.0</TargetFrameworks> ++ <TargetFramework>$(FrameworkBase)</TargetFramework> + </PropertyGroup> + + <PropertyGroup> +diff --git a/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj b/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj +index 992421c5..40dbb4f5 100644 +--- a/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj ++++ b/OpenTabletDriver.UX.Gtk/OpenTabletDriver.UX.Gtk.csproj +@@ -2,9 +2,7 @@ + + <PropertyGroup Label="Project Properties"> + <OutputType>Exe</OutputType> +- <TargetFrameworks>net5</TargetFrameworks> +- <VersionPrefix>0.6.0.0</VersionPrefix> +- <LangVersion>preview</LangVersion> ++ <TargetFramework>$(FrameworkBase)</TargetFramework> + </PropertyGroup> + + <ItemGroup Label="NuGet Packages"> +diff --git a/OpenTabletDriver.UX.MacOS/OpenTabletDriver.UX.MacOS.csproj b/OpenTabletDriver.UX.MacOS/OpenTabletDriver.UX.MacOS.csproj +index f408e7b3..1ab37ea1 100644 +--- a/OpenTabletDriver.UX.MacOS/OpenTabletDriver.UX.MacOS.csproj ++++ b/OpenTabletDriver.UX.MacOS/OpenTabletDriver.UX.MacOS.csproj +@@ -2,10 +2,8 @@ + + <PropertyGroup Label="Project Properties"> + <OutputType>Exe</OutputType> +- <TargetFrameworks>net5</TargetFrameworks> +- <VersionPrefix>0.6.0.0</VersionPrefix> ++ <TargetFramework>$(FrameworkBase)</TargetFramework> + <RuntimeIdentifiers>osx-x64</RuntimeIdentifiers> +- <LangVersion>preview</LangVersion> + </PropertyGroup> + + <ItemGroup Label="NuGet Packages"> +diff --git a/OpenTabletDriver.UX.Wpf/OpenTabletDriver.UX.Wpf.csproj b/OpenTabletDriver.UX.Wpf/OpenTabletDriver.UX.Wpf.csproj +index d397a867..83dfb7e1 100644 +--- a/OpenTabletDriver.UX.Wpf/OpenTabletDriver.UX.Wpf.csproj ++++ b/OpenTabletDriver.UX.Wpf/OpenTabletDriver.UX.Wpf.csproj +@@ -2,10 +2,8 @@ + + <PropertyGroup Label="Project Properties"> + <OutputType>WinExe</OutputType> +- <TargetFrameworks>net5-windows</TargetFrameworks> +- <VersionPrefix>0.6.0.0</VersionPrefix> ++ <TargetFramework>$(FrameworkBase)-windows</TargetFramework> + <ApplicationIcon>../OpenTabletDriver.UX/Assets/otd.ico</ApplicationIcon> +- <LangVersion>preview</LangVersion> + </PropertyGroup> + + <ItemGroup Label="NuGet Packages"> +diff --git a/OpenTabletDriver.UX/OpenTabletDriver.UX.csproj b/OpenTabletDriver.UX/OpenTabletDriver.UX.csproj +index c6f4b0ea..f5fd2832 100644 +--- a/OpenTabletDriver.UX/OpenTabletDriver.UX.csproj ++++ b/OpenTabletDriver.UX/OpenTabletDriver.UX.csproj +@@ -1,10 +1,8 @@ + <Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup Label="Project Properties"> +- <TargetFrameworks>net5</TargetFrameworks> +- <VersionPrefix>0.6.0.0</VersionPrefix> ++ <TargetFramework>$(FrameworkBase)</TargetFramework> + <NoWarn>VSTHRD100; VSTHRD101; VSTHRD110; VSTHRD200</NoWarn> +- <LangVersion>preview</LangVersion> + </PropertyGroup> + + <ItemGroup Label="Resources"> +diff --git a/OpenTabletDriver/OpenTabletDriver.csproj b/OpenTabletDriver/OpenTabletDriver.csproj +index 8dee1468..77e7f895 100644 +--- a/OpenTabletDriver/OpenTabletDriver.csproj ++++ b/OpenTabletDriver/OpenTabletDriver.csproj +@@ -1,20 +1,15 @@ + <Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup Label="Project Properties"> +- <TargetFrameworks>net5</TargetFrameworks> ++ <TargetFramework>$(FrameworkBase)</TargetFramework> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> +- <VersionPrefix>0.6.0.0</VersionPrefix> + <NoWarn>VSTHRD100; VSTHRD101; VSTHRD110; VSTHRD200</NoWarn> +- <LangVersion>preview</LangVersion> + </PropertyGroup> + + <PropertyGroup Label="NuGet Package Information"> + <PackageId>OpenTabletDriver</PackageId> +- <Version>0.6.0.0</Version> +- <Authors>InfinityGhost</Authors> + <Description>OpenTabletDriver core library</Description> + <PackageOutputPath>../nupkg</PackageOutputPath> +- <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression> + </PropertyGroup> + + <ItemGroup Label="NuGet Packages"> +diff --git a/build.sh b/build.sh +index 873fe7a5..7a8c05c0 100755 +--- a/build.sh ++++ b/build.sh +@@ -7,7 +7,7 @@ + runtime=${1:-linux-x64} + shift + +-options=(--configuration='Release' --framework='net5' --self-contained='false' --output='./bin' /p:SuppressNETCoreSdkPreviewMessage=true /p:PublishTrimmed=false --runtime=$runtime) ++options=(--configuration='Release' --framework='net6.0' --self-contained='false' --output='./bin' /p:SuppressNETCoreSdkPreviewMessage=true /p:PublishTrimmed=false --runtime=$runtime) + + echo "Building OpenTabletDriver with runtime $runtime." + mkdir -p ./bin +diff --git a/generate-rules.sh b/generate-rules.sh +index 9f3ba161..98d5902e 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="net5.0" ++FRAMEWORK="net6.0" + + TABLET_CONFIGURATIONS="${SRC_ROOT}/OpenTabletDriver.Configurations/Configurations" + RULES_FILE="${SRC_ROOT}/bin/99-opentabletdriver.rules" |