From a0eb53f9b901150e610cf61bd6748494b1fc7955 Mon Sep 17 00:00:00 2001 From: Halgari Date: Sat, 5 Nov 2022 07:25:53 -0600 Subject: [PATCH] Switch to .net 7.0 --- .github/workflows/tests.yaml | 6 +++--- CHANGELOG.md | 3 ++- Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj | 10 +++++----- .../Wabbajack.CLI.Builder.csproj | 12 ++++++------ Wabbajack.CLI/Wabbajack.CLI.csproj | 18 +++++++++--------- Wabbajack.Common/Wabbajack.Common.csproj | 4 ++-- .../Wabbajack.Compiler.Test.csproj | 10 +++++----- Wabbajack.Compiler/Wabbajack.Compiler.csproj | 2 +- .../Wabbajack.Compression.BSA.Test.csproj | 12 ++++++------ .../Wabbajack.Compression.BSA.csproj | 6 +++--- .../Wabbajack.Compression.Zip.Test.csproj | 8 ++++---- .../Wabbajack.Compression.Zip.csproj | 2 +- .../Wabbajack.DTOs.ConverterGenerators.csproj | 2 +- Wabbajack.DTOs.Test/Wabbajack.DTOs.Test.csproj | 10 +++++----- Wabbajack.DTOs/Wabbajack.DTOs.csproj | 4 ++-- .../Wabbajack.Downloaders.Bethesda.csproj | 4 ++-- ...abbajack.Downloaders.Dispatcher.Test.csproj | 10 +++++----- .../Wabbajack.Downloaders.Dispatcher.csproj | 4 ++-- .../Wabbajack.Downloaders.GameFile.csproj | 4 ++-- .../Wabbajack.Downloaders.GoogleDrive.csproj | 4 ++-- .../Wabbajack.Downloaders.Http.csproj | 4 ++-- ...ack.Downloaders.IPS4OAuth2Downloader.csproj | 4 ++-- .../Wabbajack.Downloaders.Interfaces.csproj | 2 +- .../Wabbajack.Downloaders.Manual.csproj | 4 ++-- .../Wabbajack.Downloaders.MediaFire.csproj | 6 +++--- .../Wabbajack.Downloaders.Mega.csproj | 4 ++-- .../Wabbajack.Downloaders.ModDB.csproj | 4 ++-- .../Wabbajack.Downloaders.Nexus.csproj | 2 +- ...bajack.Downloaders.VerificationCache.csproj | 4 ++-- .../Wabbajack.Downloaders.WabbajackCDN.csproj | 4 ++-- .../Wabbajack.FileExtractor.Test.csproj | 14 +++++++------- .../Wabbajack.FileExtractor.csproj | 4 ++-- .../Wabbajack.Hashing.PHash.Test.csproj | 8 ++++---- .../Wabbajack.Hashing.PHash.csproj | 2 +- ...Wabbajack.Hashing.xxHash64.Benchmark.csproj | 2 +- .../Wabbajack.Hashing.xxHash64.Test.csproj | 8 ++++---- .../Wabbajack.Hashing.xxHash64.csproj | 2 +- Wabbajack.IO.Async/Wabbajack.IO.Async.csproj | 2 +- .../Wabbajack.Installer.Test.csproj | 10 +++++----- Wabbajack.Installer/Wabbajack.Installer.csproj | 4 ++-- Wabbajack.Launcher/Wabbajack.Launcher.csproj | 18 +++++++++--------- .../Wabbajack.Networking.BethesdaNet.csproj | 2 +- .../Wabbajack.Networking.Discord.csproj | 4 ++-- .../Wabbajack.Networking.GitHub.csproj | 4 ++-- ...Wabbajack.Networking.Http.Interfaces.csproj | 2 +- .../Wabbajack.Networking.Http.Test.csproj | 8 ++++---- .../Wabbajack.Networking.Http.csproj | 4 ++-- .../Wabbajack.Networking.NexusApi.Test.csproj | 10 +++++----- .../Wabbajack.Networking.NexusApi.csproj | 6 +++--- .../Wabbajack.Networking.Steam.Test.csproj | 12 ++++++------ .../Wabbajack.Networking.Steam.csproj | 4 ++-- ...bajack.Networking.WabbajackClientApi.csproj | 4 ++-- .../Wabbajack.Paths.IO.Test.csproj | 8 ++++---- Wabbajack.Paths.IO/Wabbajack.Paths.IO.csproj | 2 +- .../Wabbajack.Paths.Test.csproj | 8 ++++---- Wabbajack.Paths/Wabbajack.Paths.csproj | 2 +- .../Wabbajack.RateLimiter.Test.csproj | 8 ++++---- .../Wabbajack.RateLimiter.csproj | 2 +- .../Wabbajack.Server.Lib.csproj | 4 ++-- Wabbajack.Server/Wabbajack.Server.csproj | 8 ++++---- .../Wabbajack.Services.OSIntegrated.csproj | 4 ++-- .../Wabbajack.VFS.Interfaces.csproj | 2 +- Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj | 14 +++++++------- Wabbajack.VFS/Wabbajack.VFS.csproj | 4 ++-- 64 files changed, 187 insertions(+), 186 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index d8bee614..a4b19119 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -32,10 +32,10 @@ jobs: if: runner.os != 'Windows' run: chmod -R +x Wabbajack.FileExtractor/Extractors - - name: Setup .NET Core SDK 6.0.x + - name: Setup .NET Core SDK 7.0.x uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' include-prerelease: true - name: Test @@ -100,7 +100,7 @@ jobs: - name: Setup .NET Core SDK 6.0.x uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' include-prerelease: true - name: Restore diff --git a/CHANGELOG.md b/CHANGELOG.md index e69ed61e..7e65e0be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ ### Changelog #### Version - 3.0.4.0 - TBD -* upgrade GameFinder to 2.2.1 +* Upgrade GameFinder to 2.2.1 +* Update to .NET 7.0 (no user updates required) #### Version - 3.0.3.1 - 10/30/2022 * Fix file verification issues for CreatedBSAs diff --git a/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj b/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj index d72e81e8..9874f1e8 100644 --- a/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj +++ b/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net7.0-windows true x64 win10-x64 @@ -90,10 +90,10 @@ - - - - + + + + diff --git a/Wabbajack.CLI.Builder/Wabbajack.CLI.Builder.csproj b/Wabbajack.CLI.Builder/Wabbajack.CLI.Builder.csproj index 9ae77885..80568491 100644 --- a/Wabbajack.CLI.Builder/Wabbajack.CLI.Builder.csproj +++ b/Wabbajack.CLI.Builder/Wabbajack.CLI.Builder.csproj @@ -1,17 +1,17 @@ - net6.0 + net7.0 enable enable - - - - - + + + + + diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj index 85becb52..d61ddc75 100644 --- a/Wabbajack.CLI/Wabbajack.CLI.csproj +++ b/Wabbajack.CLI/Wabbajack.CLI.csproj @@ -2,8 +2,8 @@ Exe - net6.0-windows - net6.0 + net7.0-windows + net7.0 enable GPL-3.0-or-later $(VERSION) @@ -16,13 +16,13 @@ - - - - - - - + + + + + + + diff --git a/Wabbajack.Common/Wabbajack.Common.csproj b/Wabbajack.Common/Wabbajack.Common.csproj index e34838ab..b5432031 100644 --- a/Wabbajack.Common/Wabbajack.Common.csproj +++ b/Wabbajack.Common/Wabbajack.Common.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable GPL-3.0-or-later $(VERSION) @@ -33,7 +33,7 @@ - + diff --git a/Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj b/Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj index 68dbc575..8c60b6de 100644 --- a/Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj +++ b/Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 false @@ -9,18 +9,18 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.Compiler/Wabbajack.Compiler.csproj b/Wabbajack.Compiler/Wabbajack.Compiler.csproj index 62584356..9ca4cf58 100644 --- a/Wabbajack.Compiler/Wabbajack.Compiler.csproj +++ b/Wabbajack.Compiler/Wabbajack.Compiler.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later diff --git a/Wabbajack.Compression.BSA.Test/Wabbajack.Compression.BSA.Test.csproj b/Wabbajack.Compression.BSA.Test/Wabbajack.Compression.BSA.Test.csproj index c0d4f459..c767f78e 100644 --- a/Wabbajack.Compression.BSA.Test/Wabbajack.Compression.BSA.Test.csproj +++ b/Wabbajack.Compression.BSA.Test/Wabbajack.Compression.BSA.Test.csproj @@ -1,26 +1,26 @@ - net6.0 + net7.0 false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj b/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj index c4e7e2ce..169cc800 100644 --- a/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj +++ b/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable true GPL-3.0-or-later @@ -18,8 +18,8 @@ - - + + diff --git a/Wabbajack.Compression.Zip.Test/Wabbajack.Compression.Zip.Test.csproj b/Wabbajack.Compression.Zip.Test/Wabbajack.Compression.Zip.Test.csproj index 00ce8ebf..6d15e005 100644 --- a/Wabbajack.Compression.Zip.Test/Wabbajack.Compression.Zip.Test.csproj +++ b/Wabbajack.Compression.Zip.Test/Wabbajack.Compression.Zip.Test.csproj @@ -1,24 +1,24 @@ - net6.0 + net7.0 enable false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.Compression.Zip/Wabbajack.Compression.Zip.csproj b/Wabbajack.Compression.Zip/Wabbajack.Compression.Zip.csproj index bad41454..01178a67 100644 --- a/Wabbajack.Compression.Zip/Wabbajack.Compression.Zip.csproj +++ b/Wabbajack.Compression.Zip/Wabbajack.Compression.Zip.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/Wabbajack.DTOs.ConverterGenerators/Wabbajack.DTOs.ConverterGenerators.csproj b/Wabbajack.DTOs.ConverterGenerators/Wabbajack.DTOs.ConverterGenerators.csproj index f549991b..3831f9b2 100644 --- a/Wabbajack.DTOs.ConverterGenerators/Wabbajack.DTOs.ConverterGenerators.csproj +++ b/Wabbajack.DTOs.ConverterGenerators/Wabbajack.DTOs.ConverterGenerators.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 GPL-3.0-or-later $(VERSION) CS8600 diff --git a/Wabbajack.DTOs.Test/Wabbajack.DTOs.Test.csproj b/Wabbajack.DTOs.Test/Wabbajack.DTOs.Test.csproj index 6d966c9c..6bc36413 100644 --- a/Wabbajack.DTOs.Test/Wabbajack.DTOs.Test.csproj +++ b/Wabbajack.DTOs.Test/Wabbajack.DTOs.Test.csproj @@ -1,25 +1,25 @@ - net6.0 + net7.0 false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.DTOs/Wabbajack.DTOs.csproj b/Wabbajack.DTOs/Wabbajack.DTOs.csproj index 4e232d26..5bb70efe 100644 --- a/Wabbajack.DTOs/Wabbajack.DTOs.csproj +++ b/Wabbajack.DTOs/Wabbajack.DTOs.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later @@ -12,7 +12,7 @@ - + diff --git a/Wabbajack.Downloaders.Bethesda/Wabbajack.Downloaders.Bethesda.csproj b/Wabbajack.Downloaders.Bethesda/Wabbajack.Downloaders.Bethesda.csproj index bec3a283..02afa7a1 100644 --- a/Wabbajack.Downloaders.Bethesda/Wabbajack.Downloaders.Bethesda.csproj +++ b/Wabbajack.Downloaders.Bethesda/Wabbajack.Downloaders.Bethesda.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable @@ -14,7 +14,7 @@ - + diff --git a/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj b/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj index f8211cdd..54ecc052 100644 --- a/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj +++ b/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj @@ -1,25 +1,25 @@ - net6.0 + net7.0 false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.Downloaders.Dispatcher/Wabbajack.Downloaders.Dispatcher.csproj b/Wabbajack.Downloaders.Dispatcher/Wabbajack.Downloaders.Dispatcher.csproj index 6069eaa0..368163d6 100644 --- a/Wabbajack.Downloaders.Dispatcher/Wabbajack.Downloaders.Dispatcher.csproj +++ b/Wabbajack.Downloaders.Dispatcher/Wabbajack.Downloaders.Dispatcher.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later @@ -25,7 +25,7 @@ - + diff --git a/Wabbajack.Downloaders.GameFile/Wabbajack.Downloaders.GameFile.csproj b/Wabbajack.Downloaders.GameFile/Wabbajack.Downloaders.GameFile.csproj index d7a39d66..951f23e8 100644 --- a/Wabbajack.Downloaders.GameFile/Wabbajack.Downloaders.GameFile.csproj +++ b/Wabbajack.Downloaders.GameFile/Wabbajack.Downloaders.GameFile.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable @@ -13,7 +13,7 @@ - ..\..\..\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\6.0.0-preview.6.21355.2\ref\net6.0\Microsoft.Extensions.Logging.Abstractions.dll + ..\..\..\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\6.0.0-preview.6.21355.2\ref\net7.0\Microsoft.Extensions.Logging.Abstractions.dll diff --git a/Wabbajack.Downloaders.GoogleDrive/Wabbajack.Downloaders.GoogleDrive.csproj b/Wabbajack.Downloaders.GoogleDrive/Wabbajack.Downloaders.GoogleDrive.csproj index 1edd2438..88bdf579 100644 --- a/Wabbajack.Downloaders.GoogleDrive/Wabbajack.Downloaders.GoogleDrive.csproj +++ b/Wabbajack.Downloaders.GoogleDrive/Wabbajack.Downloaders.GoogleDrive.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later @@ -13,7 +13,7 @@ - + diff --git a/Wabbajack.Downloaders.Http/Wabbajack.Downloaders.Http.csproj b/Wabbajack.Downloaders.Http/Wabbajack.Downloaders.Http.csproj index 5566caeb..763f3ae2 100644 --- a/Wabbajack.Downloaders.Http/Wabbajack.Downloaders.Http.csproj +++ b/Wabbajack.Downloaders.Http/Wabbajack.Downloaders.Http.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later @@ -17,7 +17,7 @@ - + diff --git a/Wabbajack.Downloaders.IPS4OAuth2Downloader/Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj b/Wabbajack.Downloaders.IPS4OAuth2Downloader/Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj index 93280d28..4bca6cd9 100644 --- a/Wabbajack.Downloaders.IPS4OAuth2Downloader/Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj +++ b/Wabbajack.Downloaders.IPS4OAuth2Downloader/Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable @@ -18,7 +18,7 @@ - + diff --git a/Wabbajack.Downloaders.Interfaces/Wabbajack.Downloaders.Interfaces.csproj b/Wabbajack.Downloaders.Interfaces/Wabbajack.Downloaders.Interfaces.csproj index 88869b1c..d3acee8e 100644 --- a/Wabbajack.Downloaders.Interfaces/Wabbajack.Downloaders.Interfaces.csproj +++ b/Wabbajack.Downloaders.Interfaces/Wabbajack.Downloaders.Interfaces.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable GPL-3.0-or-later $(VERSION) diff --git a/Wabbajack.Downloaders.Manual/Wabbajack.Downloaders.Manual.csproj b/Wabbajack.Downloaders.Manual/Wabbajack.Downloaders.Manual.csproj index 29846ee1..d621572a 100644 --- a/Wabbajack.Downloaders.Manual/Wabbajack.Downloaders.Manual.csproj +++ b/Wabbajack.Downloaders.Manual/Wabbajack.Downloaders.Manual.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable @@ -12,7 +12,7 @@ - + diff --git a/Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj b/Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj index ae3501d0..ffce616f 100644 --- a/Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj +++ b/Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj @@ -1,14 +1,14 @@ - net6.0 + net7.0 enable - - + + diff --git a/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj b/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj index f4d4c6df..aab75f3b 100644 --- a/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj +++ b/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable @@ -13,7 +13,7 @@ - + diff --git a/Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj b/Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj index c0febc54..54c118e8 100644 --- a/Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj +++ b/Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable @@ -15,7 +15,7 @@ - + diff --git a/Wabbajack.Downloaders.Nexus/Wabbajack.Downloaders.Nexus.csproj b/Wabbajack.Downloaders.Nexus/Wabbajack.Downloaders.Nexus.csproj index 96c12049..6fc137e1 100644 --- a/Wabbajack.Downloaders.Nexus/Wabbajack.Downloaders.Nexus.csproj +++ b/Wabbajack.Downloaders.Nexus/Wabbajack.Downloaders.Nexus.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable GPL-3.0-or-later $(VERSION) diff --git a/Wabbajack.Downloaders.VerificationCache/Wabbajack.Downloaders.VerificationCache.csproj b/Wabbajack.Downloaders.VerificationCache/Wabbajack.Downloaders.VerificationCache.csproj index 1e6d05cf..b095f528 100644 --- a/Wabbajack.Downloaders.VerificationCache/Wabbajack.Downloaders.VerificationCache.csproj +++ b/Wabbajack.Downloaders.VerificationCache/Wabbajack.Downloaders.VerificationCache.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable @@ -12,7 +12,7 @@ - + diff --git a/Wabbajack.Downloaders.WabbajackCDN/Wabbajack.Downloaders.WabbajackCDN.csproj b/Wabbajack.Downloaders.WabbajackCDN/Wabbajack.Downloaders.WabbajackCDN.csproj index f5fb5c23..421b55b9 100644 --- a/Wabbajack.Downloaders.WabbajackCDN/Wabbajack.Downloaders.WabbajackCDN.csproj +++ b/Wabbajack.Downloaders.WabbajackCDN/Wabbajack.Downloaders.WabbajackCDN.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later @@ -15,7 +15,7 @@ - + diff --git a/Wabbajack.FileExtractor.Test/Wabbajack.FileExtractor.Test.csproj b/Wabbajack.FileExtractor.Test/Wabbajack.FileExtractor.Test.csproj index cd3b0f2e..46e9c00b 100644 --- a/Wabbajack.FileExtractor.Test/Wabbajack.FileExtractor.Test.csproj +++ b/Wabbajack.FileExtractor.Test/Wabbajack.FileExtractor.Test.csproj @@ -1,27 +1,27 @@ - net6.0 + net7.0 false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj b/Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj index 33f3fea2..545745bc 100644 --- a/Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj +++ b/Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later @@ -29,7 +29,7 @@ - + diff --git a/Wabbajack.Hashing.PHash.Test/Wabbajack.Hashing.PHash.Test.csproj b/Wabbajack.Hashing.PHash.Test/Wabbajack.Hashing.PHash.Test.csproj index de83ad1b..9abbceea 100644 --- a/Wabbajack.Hashing.PHash.Test/Wabbajack.Hashing.PHash.Test.csproj +++ b/Wabbajack.Hashing.PHash.Test/Wabbajack.Hashing.PHash.Test.csproj @@ -1,17 +1,17 @@ - net6.0 + net7.0 false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + @@ -19,7 +19,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.Hashing.PHash/Wabbajack.Hashing.PHash.csproj b/Wabbajack.Hashing.PHash/Wabbajack.Hashing.PHash.csproj index 2197a721..e2675fe2 100644 --- a/Wabbajack.Hashing.PHash/Wabbajack.Hashing.PHash.csproj +++ b/Wabbajack.Hashing.PHash/Wabbajack.Hashing.PHash.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later diff --git a/Wabbajack.Hashing.xxHash64.Benchmark/Wabbajack.Hashing.xxHash64.Benchmark.csproj b/Wabbajack.Hashing.xxHash64.Benchmark/Wabbajack.Hashing.xxHash64.Benchmark.csproj index 4e9b1f49..03dff657 100644 --- a/Wabbajack.Hashing.xxHash64.Benchmark/Wabbajack.Hashing.xxHash64.Benchmark.csproj +++ b/Wabbajack.Hashing.xxHash64.Benchmark/Wabbajack.Hashing.xxHash64.Benchmark.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Wabbajac.Hash.xxHash64.Benchmark true diff --git a/Wabbajack.Hashing.xxHash64.Test/Wabbajack.Hashing.xxHash64.Test.csproj b/Wabbajack.Hashing.xxHash64.Test/Wabbajack.Hashing.xxHash64.Test.csproj index 9d297395..204f9d5f 100644 --- a/Wabbajack.Hashing.xxHash64.Test/Wabbajack.Hashing.xxHash64.Test.csproj +++ b/Wabbajack.Hashing.xxHash64.Test/Wabbajack.Hashing.xxHash64.Test.csproj @@ -1,26 +1,26 @@ - net6.0 + net7.0 false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.Hashing.xxHash64/Wabbajack.Hashing.xxHash64.csproj b/Wabbajack.Hashing.xxHash64/Wabbajack.Hashing.xxHash64.csproj index f6edd4e1..f26d307e 100644 --- a/Wabbajack.Hashing.xxHash64/Wabbajack.Hashing.xxHash64.csproj +++ b/Wabbajack.Hashing.xxHash64/Wabbajack.Hashing.xxHash64.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later diff --git a/Wabbajack.IO.Async/Wabbajack.IO.Async.csproj b/Wabbajack.IO.Async/Wabbajack.IO.Async.csproj index eb2460e9..6836c680 100644 --- a/Wabbajack.IO.Async/Wabbajack.IO.Async.csproj +++ b/Wabbajack.IO.Async/Wabbajack.IO.Async.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj b/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj index 430616db..8d3ec325 100644 --- a/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj +++ b/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj @@ -1,24 +1,24 @@ - net6.0 + net7.0 false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.Installer/Wabbajack.Installer.csproj b/Wabbajack.Installer/Wabbajack.Installer.csproj index 7b3417ae..28277612 100644 --- a/Wabbajack.Installer/Wabbajack.Installer.csproj +++ b/Wabbajack.Installer/Wabbajack.Installer.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later @@ -24,7 +24,7 @@ - + diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj index 7dc12f64..ff9396be 100644 --- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj +++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj @@ -1,8 +1,8 @@  WinExe - net6.0-windows - net6.0 + net7.0-windows + net7.0 enable Wabbajack @@ -22,14 +22,14 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + - + diff --git a/Wabbajack.Networking.BethesdaNet/Wabbajack.Networking.BethesdaNet.csproj b/Wabbajack.Networking.BethesdaNet/Wabbajack.Networking.BethesdaNet.csproj index 0267a74f..68bb36ab 100644 --- a/Wabbajack.Networking.BethesdaNet/Wabbajack.Networking.BethesdaNet.csproj +++ b/Wabbajack.Networking.BethesdaNet/Wabbajack.Networking.BethesdaNet.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/Wabbajack.Networking.Discord/Wabbajack.Networking.Discord.csproj b/Wabbajack.Networking.Discord/Wabbajack.Networking.Discord.csproj index 9fd9d3ad..d932532c 100644 --- a/Wabbajack.Networking.Discord/Wabbajack.Networking.Discord.csproj +++ b/Wabbajack.Networking.Discord/Wabbajack.Networking.Discord.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable GPL-3.0-or-later $(VERSION) @@ -16,7 +16,7 @@ - + diff --git a/Wabbajack.Networking.GitHub/Wabbajack.Networking.GitHub.csproj b/Wabbajack.Networking.GitHub/Wabbajack.Networking.GitHub.csproj index 541ea2ba..1de9fa39 100644 --- a/Wabbajack.Networking.GitHub/Wabbajack.Networking.GitHub.csproj +++ b/Wabbajack.Networking.GitHub/Wabbajack.Networking.GitHub.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable GPL-3.0-or-later $(VERSION) @@ -17,7 +17,7 @@ - + diff --git a/Wabbajack.Networking.Http.Interfaces/Wabbajack.Networking.Http.Interfaces.csproj b/Wabbajack.Networking.Http.Interfaces/Wabbajack.Networking.Http.Interfaces.csproj index e9ee3e62..5037943c 100644 --- a/Wabbajack.Networking.Http.Interfaces/Wabbajack.Networking.Http.Interfaces.csproj +++ b/Wabbajack.Networking.Http.Interfaces/Wabbajack.Networking.Http.Interfaces.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later diff --git a/Wabbajack.Networking.Http.Test/Wabbajack.Networking.Http.Test.csproj b/Wabbajack.Networking.Http.Test/Wabbajack.Networking.Http.Test.csproj index b22b3d5a..a20f6ab2 100644 --- a/Wabbajack.Networking.Http.Test/Wabbajack.Networking.Http.Test.csproj +++ b/Wabbajack.Networking.Http.Test/Wabbajack.Networking.Http.Test.csproj @@ -1,24 +1,24 @@ - net6.0 + net7.0 enable false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.Networking.Http/Wabbajack.Networking.Http.csproj b/Wabbajack.Networking.Http/Wabbajack.Networking.Http.csproj index 50861f38..08e479c2 100644 --- a/Wabbajack.Networking.Http/Wabbajack.Networking.Http.csproj +++ b/Wabbajack.Networking.Http/Wabbajack.Networking.Http.csproj @@ -1,14 +1,14 @@ - net6.0 + net7.0 enable GPL-3.0-or-later $(VERSION) - + diff --git a/Wabbajack.Networking.NexusApi.Test/Wabbajack.Networking.NexusApi.Test.csproj b/Wabbajack.Networking.NexusApi.Test/Wabbajack.Networking.NexusApi.Test.csproj index d44765f1..fac1ed50 100644 --- a/Wabbajack.Networking.NexusApi.Test/Wabbajack.Networking.NexusApi.Test.csproj +++ b/Wabbajack.Networking.NexusApi.Test/Wabbajack.Networking.NexusApi.Test.csproj @@ -1,25 +1,25 @@ - net6.0 + net7.0 false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.Networking.NexusApi/Wabbajack.Networking.NexusApi.csproj b/Wabbajack.Networking.NexusApi/Wabbajack.Networking.NexusApi.csproj index 7dfd728f..5a694b24 100644 --- a/Wabbajack.Networking.NexusApi/Wabbajack.Networking.NexusApi.csproj +++ b/Wabbajack.Networking.NexusApi/Wabbajack.Networking.NexusApi.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable GPL-3.0-or-later $(VERSION) @@ -12,8 +12,8 @@ - - + + diff --git a/Wabbajack.Networking.Steam.Test/Wabbajack.Networking.Steam.Test.csproj b/Wabbajack.Networking.Steam.Test/Wabbajack.Networking.Steam.Test.csproj index 5023447e..fbe40f69 100644 --- a/Wabbajack.Networking.Steam.Test/Wabbajack.Networking.Steam.Test.csproj +++ b/Wabbajack.Networking.Steam.Test/Wabbajack.Networking.Steam.Test.csproj @@ -1,27 +1,27 @@ - net6.0 + net7.0 enable false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.Networking.Steam/Wabbajack.Networking.Steam.csproj b/Wabbajack.Networking.Steam/Wabbajack.Networking.Steam.csproj index 0bba5c61..70906847 100644 --- a/Wabbajack.Networking.Steam/Wabbajack.Networking.Steam.csproj +++ b/Wabbajack.Networking.Steam/Wabbajack.Networking.Steam.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable @@ -11,7 +11,7 @@ - + diff --git a/Wabbajack.Networking.WabbajackClientApi/Wabbajack.Networking.WabbajackClientApi.csproj b/Wabbajack.Networking.WabbajackClientApi/Wabbajack.Networking.WabbajackClientApi.csproj index 1c3cb15a..763a56f3 100644 --- a/Wabbajack.Networking.WabbajackClientApi/Wabbajack.Networking.WabbajackClientApi.csproj +++ b/Wabbajack.Networking.WabbajackClientApi/Wabbajack.Networking.WabbajackClientApi.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later @@ -12,7 +12,7 @@ - + diff --git a/Wabbajack.Paths.IO.Test/Wabbajack.Paths.IO.Test.csproj b/Wabbajack.Paths.IO.Test/Wabbajack.Paths.IO.Test.csproj index b161cca7..3948bc11 100644 --- a/Wabbajack.Paths.IO.Test/Wabbajack.Paths.IO.Test.csproj +++ b/Wabbajack.Paths.IO.Test/Wabbajack.Paths.IO.Test.csproj @@ -1,24 +1,24 @@ - net6.0 + net7.0 false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.Paths.IO/Wabbajack.Paths.IO.csproj b/Wabbajack.Paths.IO/Wabbajack.Paths.IO.csproj index 2494c58e..0cd88c4d 100644 --- a/Wabbajack.Paths.IO/Wabbajack.Paths.IO.csproj +++ b/Wabbajack.Paths.IO/Wabbajack.Paths.IO.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable GPL-3.0-or-later $(VERSION) diff --git a/Wabbajack.Paths.Test/Wabbajack.Paths.Test.csproj b/Wabbajack.Paths.Test/Wabbajack.Paths.Test.csproj index aafd8e0c..a5d4fe49 100644 --- a/Wabbajack.Paths.Test/Wabbajack.Paths.Test.csproj +++ b/Wabbajack.Paths.Test/Wabbajack.Paths.Test.csproj @@ -1,23 +1,23 @@ - net6.0 + net7.0 false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.Paths/Wabbajack.Paths.csproj b/Wabbajack.Paths/Wabbajack.Paths.csproj index 2502d56d..1ffbca14 100644 --- a/Wabbajack.Paths/Wabbajack.Paths.csproj +++ b/Wabbajack.Paths/Wabbajack.Paths.csproj @@ -1,6 +1,6 @@ - net6.0 + net7.0 enable GPL-3.0-or-later $(VERSION) diff --git a/Wabbajack.RateLimiter.Test/Wabbajack.RateLimiter.Test.csproj b/Wabbajack.RateLimiter.Test/Wabbajack.RateLimiter.Test.csproj index fe0108a0..3db11fcf 100644 --- a/Wabbajack.RateLimiter.Test/Wabbajack.RateLimiter.Test.csproj +++ b/Wabbajack.RateLimiter.Test/Wabbajack.RateLimiter.Test.csproj @@ -1,24 +1,24 @@ - net6.0 + net7.0 enable false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.RateLimiter/Wabbajack.RateLimiter.csproj b/Wabbajack.RateLimiter/Wabbajack.RateLimiter.csproj index 72d6b4a4..444af79a 100644 --- a/Wabbajack.RateLimiter/Wabbajack.RateLimiter.csproj +++ b/Wabbajack.RateLimiter/Wabbajack.RateLimiter.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable diff --git a/Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj b/Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj index e6ee4394..45f54046 100644 --- a/Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj +++ b/Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable @@ -16,7 +16,7 @@ - + diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj index a83a541d..6d411739 100644 --- a/Wabbajack.Server/Wabbajack.Server.csproj +++ b/Wabbajack.Server/Wabbajack.Server.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable Exe @@ -16,12 +16,12 @@ - + - + - + diff --git a/Wabbajack.Services.OSIntegrated/Wabbajack.Services.OSIntegrated.csproj b/Wabbajack.Services.OSIntegrated/Wabbajack.Services.OSIntegrated.csproj index b2cfce82..0204f40f 100644 --- a/Wabbajack.Services.OSIntegrated/Wabbajack.Services.OSIntegrated.csproj +++ b/Wabbajack.Services.OSIntegrated/Wabbajack.Services.OSIntegrated.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Wabbajack.VFS.Interfaces/Wabbajack.VFS.Interfaces.csproj b/Wabbajack.VFS.Interfaces/Wabbajack.VFS.Interfaces.csproj index bf68d60e..5b854cb5 100644 --- a/Wabbajack.VFS.Interfaces/Wabbajack.VFS.Interfaces.csproj +++ b/Wabbajack.VFS.Interfaces/Wabbajack.VFS.Interfaces.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj b/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj index 4dc33aaf..ae19c377 100644 --- a/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj +++ b/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj @@ -1,31 +1,31 @@ - net6.0 + net7.0 false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Wabbajack.VFS/Wabbajack.VFS.csproj b/Wabbajack.VFS/Wabbajack.VFS.csproj index 3f238cd6..e68e6f87 100644 --- a/Wabbajack.VFS/Wabbajack.VFS.csproj +++ b/Wabbajack.VFS/Wabbajack.VFS.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable $(VERSION) GPL-3.0-or-later @@ -12,7 +12,7 @@ - +