From 1c813650e97dda0bb8cfb67f66e1fe314d9998b1 Mon Sep 17 00:00:00 2001 From: EzioTheDeadPoet <52624146+EzioTheDeadPoet@users.noreply.github.com> Date: Wed, 9 Nov 2022 19:56:32 +0100 Subject: [PATCH 1/6] #2194 Set Archives to Hidden in MO2 If meta exists, check if file is valid or not and depending on that make a new one or append to the existing one. If no file exists create one. The tag added is `removed=true` --- Wabbajack.Installer/StandardInstaller.cs | 46 ++++++++++++++++++++ Wabbajack.Paths.IO/AbsolutePathExtensions.cs | 9 ++++ 2 files changed, 55 insertions(+) diff --git a/Wabbajack.Installer/StandardInstaller.cs b/Wabbajack.Installer/StandardInstaller.cs index e1a87938..8b7bb3c6 100644 --- a/Wabbajack.Installer/StandardInstaller.cs +++ b/Wabbajack.Installer/StandardInstaller.cs @@ -148,6 +148,8 @@ public class StandardInstaller : AInstaller SetScreenSizeInPrefs(); + SetDownloadMetasToHideInMO2(token); + await ExtractedModlistFolder!.DisposeAsync(); await _wjClient.SendMetric(MetricNames.FinishInstall, ModList.Name); @@ -270,6 +272,50 @@ public class StandardInstaller : AInstaller } } + private async Task SetDownloadMetasToHideInMO2(CancellationToken token) + { + _logger.LogInformation("Updating Metas To Hide"); + await _configuration.Downloads.EnumerateFiles() + .PDoAll(async download => + { + if (download == default) return; + if (download.Extension == Ext.Meta) return; + + var linesToWriteNewFile = new HashSet( ); + linesToWriteNewFile.Add("[General]"); + linesToWriteNewFile.Add("removed=true"); + + var lineToWriteAppendFile = new HashSet {"removed=true"}; + + var metaFile = download.WithExtension(Ext.Meta); + if (metaFile.FileExists()) + { + try + { + var parsed = metaFile.LoadIniFile(); + if (parsed["General"] != null) + { + _logger.LogInformation("Updating {FileName}", metaFile.FileName); + + await metaFile.WriteAllLinesAsync(lineToWriteAppendFile,FileMode.Append,token); + } + } + catch (Exception e) + { + _logger.LogInformation("Re-Generating corrupted {FileName}", metaFile.FileName); + + await metaFile.WriteAllLinesAsync(linesToWriteNewFile,FileMode.Create,token); + } + } + else //Generate new metas to hide files without metas. + { + _logger.LogInformation("Generating {FileName}", metaFile.FileName); + + await metaFile.WriteAllLinesAsync(linesToWriteNewFile,FileMode.Create,token); + } + }); + } + private async Task BuildBSAs(CancellationToken token) { var bsas = ModList.Directives.OfType().ToList(); diff --git a/Wabbajack.Paths.IO/AbsolutePathExtensions.cs b/Wabbajack.Paths.IO/AbsolutePathExtensions.cs index 266dd5ed..64c64119 100644 --- a/Wabbajack.Paths.IO/AbsolutePathExtensions.cs +++ b/Wabbajack.Paths.IO/AbsolutePathExtensions.cs @@ -165,6 +165,15 @@ public static class AbsolutePathExtensions await sw.DisposeAsync(); } + + public static async Task WriteAllLinesAsync(this AbsolutePath file, IEnumerable src, + FileMode fileMode, CancellationToken token) + { + await using var dest = file.Open(fileMode, FileAccess.Write, FileShare.None); + await using var sw = new StreamWriter(dest, Encoding.UTF8); + foreach (var line in src) await sw.WriteLineAsync(line); + await sw.DisposeAsync(); + } public static async ValueTask WriteAllBytesAsync(this AbsolutePath file, Memory data, CancellationToken token = default) From e205a3fe2f53b28d05896db43130a337cafa4232 Mon Sep 17 00:00:00 2001 From: EzioTheDeadPoet <52624146+EzioTheDeadPoet@users.noreply.github.com> Date: Thu, 10 Nov 2022 00:24:36 +0100 Subject: [PATCH 2/6] update CHANGELOG.md --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e65e0be..f5491b20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ #### Version - 3.0.4.0 - TBD * Upgrade GameFinder to 2.2.1 * Update to .NET 7.0 (no user updates required) +* Update to Gallery: + * The Gallery now also Shows the total combined storage requirement to avoid confusion +* Updates to Compilation Screen: + * Include and Ignore Lists now have an option to add individual files + * All file/folder pickers now allow selection of multiple files in the same folder +* Added final installation-step for marking archives as hidden inside MO2 (They can be unhidden by users knowing what they are doing.) +* Fixes to the inferring of settings (please use the re-infer settings button to apply them) + * Wabbajack compilation tags should now be imported 1:1 to how they worked in 2.5 ++ Fixes for file association (double clicking .wabbajack files to open the installation Menu) +* Game support: + * Added support for Karryn's Prison + * Added support for The Witcher: Enhanced Edition + * Added support for GOG Version of Skyrim Special Edition (It now depends on individual lists if they support it.) + * Added support for GOG Version of Dragon's Dogma: Dark Arisen (It now depends on individual lists if they support it.) #### Version - 3.0.3.1 - 10/30/2022 * Fix file verification issues for CreatedBSAs From ea8835cf342cbb60ed815aa6ecc93375333a60c4 Mon Sep 17 00:00:00 2001 From: EzioTheDeadPoet <52624146+EzioTheDeadPoet@users.noreply.github.com> Date: Thu, 10 Nov 2022 00:26:47 +0100 Subject: [PATCH 3/6] fix typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5491b20..b7f3c1fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ * Added final installation-step for marking archives as hidden inside MO2 (They can be unhidden by users knowing what they are doing.) * Fixes to the inferring of settings (please use the re-infer settings button to apply them) * Wabbajack compilation tags should now be imported 1:1 to how they worked in 2.5 -+ Fixes for file association (double clicking .wabbajack files to open the installation Menu) +* Fixes for file association (double clicking .wabbajack files to open the installation Menu) * Game support: * Added support for Karryn's Prison * Added support for The Witcher: Enhanced Edition From 5b8b815f39acd57e6d658b58ad8824e526032faf Mon Sep 17 00:00:00 2001 From: Halgari Date: Wed, 9 Nov 2022 16:57:16 -0700 Subject: [PATCH 4/6] Update deps for 7.0 --- Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj | 2 +- Wabbajack.CLI.Builder/Wabbajack.CLI.Builder.csproj | 10 +++++----- Wabbajack.CLI/Wabbajack.CLI.csproj | 10 +++++----- Wabbajack.Common/Wabbajack.Common.csproj | 2 +- Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj | 2 +- .../Wabbajack.Compression.BSA.Test.csproj | 2 +- .../Wabbajack.Compression.BSA.csproj | 2 +- Wabbajack.DTOs/Wabbajack.DTOs.csproj | 2 +- .../Wabbajack.Downloaders.Dispatcher.Test.csproj | 2 +- .../Wabbajack.Downloaders.Dispatcher.csproj | 2 +- .../Wabbajack.Downloaders.GoogleDrive.csproj | 2 +- .../Wabbajack.Downloaders.Http.csproj | 2 +- .../Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj | 2 +- .../Wabbajack.Downloaders.Manual.csproj | 2 +- .../Wabbajack.Downloaders.MediaFire.csproj | 4 ++-- .../Wabbajack.Downloaders.Mega.csproj | 2 +- .../Wabbajack.Downloaders.ModDB.csproj | 2 +- .../Wabbajack.Downloaders.VerificationCache.csproj | 2 +- .../Wabbajack.Downloaders.WabbajackCDN.csproj | 2 +- .../Wabbajack.FileExtractor.Test.csproj | 4 ++-- Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj | 2 +- .../Wabbajack.Installer.Test.csproj | 2 +- Wabbajack.Launcher/Wabbajack.Launcher.csproj | 4 ++-- .../Wabbajack.Networking.Discord.csproj | 2 +- .../Wabbajack.Networking.GitHub.csproj | 2 +- .../Wabbajack.Networking.Http.csproj | 2 +- .../Wabbajack.Networking.NexusApi.csproj | 4 ++-- .../Wabbajack.Networking.Steam.Test.csproj | 2 +- .../Wabbajack.Networking.Steam.csproj | 2 +- .../Wabbajack.Networking.WabbajackClientApi.csproj | 2 +- Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj | 2 +- Wabbajack.Server/Wabbajack.Server.csproj | 8 ++++---- .../Wabbajack.Services.OSIntegrated.csproj | 2 +- Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj | 4 ++-- Wabbajack.VFS/Wabbajack.VFS.csproj | 2 +- 35 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj b/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj index 9874f1e8..b0cf2e5f 100644 --- a/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj +++ b/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj @@ -90,7 +90,7 @@ - + diff --git a/Wabbajack.CLI.Builder/Wabbajack.CLI.Builder.csproj b/Wabbajack.CLI.Builder/Wabbajack.CLI.Builder.csproj index 80568491..01a52294 100644 --- a/Wabbajack.CLI.Builder/Wabbajack.CLI.Builder.csproj +++ b/Wabbajack.CLI.Builder/Wabbajack.CLI.Builder.csproj @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj index d61ddc75..730e92bd 100644 --- a/Wabbajack.CLI/Wabbajack.CLI.csproj +++ b/Wabbajack.CLI/Wabbajack.CLI.csproj @@ -16,11 +16,11 @@ - - - - - + + + + + diff --git a/Wabbajack.Common/Wabbajack.Common.csproj b/Wabbajack.Common/Wabbajack.Common.csproj index b5432031..e2660613 100644 --- a/Wabbajack.Common/Wabbajack.Common.csproj +++ b/Wabbajack.Common/Wabbajack.Common.csproj @@ -33,7 +33,7 @@ - + diff --git a/Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj b/Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj index 8c60b6de..92c3aa71 100644 --- a/Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj +++ b/Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj @@ -13,7 +13,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/Wabbajack.Compression.BSA.Test/Wabbajack.Compression.BSA.Test.csproj b/Wabbajack.Compression.BSA.Test/Wabbajack.Compression.BSA.Test.csproj index c767f78e..260103bf 100644 --- a/Wabbajack.Compression.BSA.Test/Wabbajack.Compression.BSA.Test.csproj +++ b/Wabbajack.Compression.BSA.Test/Wabbajack.Compression.BSA.Test.csproj @@ -11,7 +11,7 @@ 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 169cc800..d9d11284 100644 --- a/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj +++ b/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj @@ -18,7 +18,7 @@ - + diff --git a/Wabbajack.DTOs/Wabbajack.DTOs.csproj b/Wabbajack.DTOs/Wabbajack.DTOs.csproj index 5bb70efe..cab359cf 100644 --- a/Wabbajack.DTOs/Wabbajack.DTOs.csproj +++ b/Wabbajack.DTOs/Wabbajack.DTOs.csproj @@ -12,7 +12,7 @@ - + diff --git a/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj b/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj index 54ecc052..9070839d 100644 --- a/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj +++ b/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj @@ -11,7 +11,7 @@ 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 368163d6..1f6e8500 100644 --- a/Wabbajack.Downloaders.Dispatcher/Wabbajack.Downloaders.Dispatcher.csproj +++ b/Wabbajack.Downloaders.Dispatcher/Wabbajack.Downloaders.Dispatcher.csproj @@ -25,7 +25,7 @@ - + diff --git a/Wabbajack.Downloaders.GoogleDrive/Wabbajack.Downloaders.GoogleDrive.csproj b/Wabbajack.Downloaders.GoogleDrive/Wabbajack.Downloaders.GoogleDrive.csproj index 88bdf579..4b708df3 100644 --- a/Wabbajack.Downloaders.GoogleDrive/Wabbajack.Downloaders.GoogleDrive.csproj +++ b/Wabbajack.Downloaders.GoogleDrive/Wabbajack.Downloaders.GoogleDrive.csproj @@ -13,7 +13,7 @@ - + diff --git a/Wabbajack.Downloaders.Http/Wabbajack.Downloaders.Http.csproj b/Wabbajack.Downloaders.Http/Wabbajack.Downloaders.Http.csproj index 763f3ae2..45cba4e4 100644 --- a/Wabbajack.Downloaders.Http/Wabbajack.Downloaders.Http.csproj +++ b/Wabbajack.Downloaders.Http/Wabbajack.Downloaders.Http.csproj @@ -17,7 +17,7 @@ - + diff --git a/Wabbajack.Downloaders.IPS4OAuth2Downloader/Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj b/Wabbajack.Downloaders.IPS4OAuth2Downloader/Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj index 4bca6cd9..c9a6c02e 100644 --- a/Wabbajack.Downloaders.IPS4OAuth2Downloader/Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj +++ b/Wabbajack.Downloaders.IPS4OAuth2Downloader/Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj @@ -18,7 +18,7 @@ - + diff --git a/Wabbajack.Downloaders.Manual/Wabbajack.Downloaders.Manual.csproj b/Wabbajack.Downloaders.Manual/Wabbajack.Downloaders.Manual.csproj index d621572a..63ff665a 100644 --- a/Wabbajack.Downloaders.Manual/Wabbajack.Downloaders.Manual.csproj +++ b/Wabbajack.Downloaders.Manual/Wabbajack.Downloaders.Manual.csproj @@ -12,7 +12,7 @@ - + diff --git a/Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj b/Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj index ffce616f..663d63a7 100644 --- a/Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj +++ b/Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj b/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj index aab75f3b..1d8dc777 100644 --- a/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj +++ b/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj @@ -13,7 +13,7 @@ - + diff --git a/Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj b/Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj index 54c118e8..3e536647 100644 --- a/Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj +++ b/Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj @@ -15,7 +15,7 @@ - + diff --git a/Wabbajack.Downloaders.VerificationCache/Wabbajack.Downloaders.VerificationCache.csproj b/Wabbajack.Downloaders.VerificationCache/Wabbajack.Downloaders.VerificationCache.csproj index b095f528..6b7f856e 100644 --- a/Wabbajack.Downloaders.VerificationCache/Wabbajack.Downloaders.VerificationCache.csproj +++ b/Wabbajack.Downloaders.VerificationCache/Wabbajack.Downloaders.VerificationCache.csproj @@ -12,7 +12,7 @@ - + diff --git a/Wabbajack.Downloaders.WabbajackCDN/Wabbajack.Downloaders.WabbajackCDN.csproj b/Wabbajack.Downloaders.WabbajackCDN/Wabbajack.Downloaders.WabbajackCDN.csproj index 421b55b9..3e5594da 100644 --- a/Wabbajack.Downloaders.WabbajackCDN/Wabbajack.Downloaders.WabbajackCDN.csproj +++ b/Wabbajack.Downloaders.WabbajackCDN/Wabbajack.Downloaders.WabbajackCDN.csproj @@ -15,7 +15,7 @@ - + diff --git a/Wabbajack.FileExtractor.Test/Wabbajack.FileExtractor.Test.csproj b/Wabbajack.FileExtractor.Test/Wabbajack.FileExtractor.Test.csproj index 46e9c00b..ee5f2ae7 100644 --- a/Wabbajack.FileExtractor.Test/Wabbajack.FileExtractor.Test.csproj +++ b/Wabbajack.FileExtractor.Test/Wabbajack.FileExtractor.Test.csproj @@ -11,8 +11,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + diff --git a/Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj b/Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj index 545745bc..742e458c 100644 --- a/Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj +++ b/Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj @@ -29,7 +29,7 @@ - + diff --git a/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj b/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj index 8d3ec325..590be299 100644 --- a/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj +++ b/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj @@ -11,7 +11,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj index 84a56f7c..d42054fe 100644 --- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj +++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj @@ -28,9 +28,9 @@ - + - + diff --git a/Wabbajack.Networking.Discord/Wabbajack.Networking.Discord.csproj b/Wabbajack.Networking.Discord/Wabbajack.Networking.Discord.csproj index d932532c..9a61d8e8 100644 --- a/Wabbajack.Networking.Discord/Wabbajack.Networking.Discord.csproj +++ b/Wabbajack.Networking.Discord/Wabbajack.Networking.Discord.csproj @@ -16,7 +16,7 @@ - + diff --git a/Wabbajack.Networking.GitHub/Wabbajack.Networking.GitHub.csproj b/Wabbajack.Networking.GitHub/Wabbajack.Networking.GitHub.csproj index 1de9fa39..2591cd88 100644 --- a/Wabbajack.Networking.GitHub/Wabbajack.Networking.GitHub.csproj +++ b/Wabbajack.Networking.GitHub/Wabbajack.Networking.GitHub.csproj @@ -17,7 +17,7 @@ - + diff --git a/Wabbajack.Networking.Http/Wabbajack.Networking.Http.csproj b/Wabbajack.Networking.Http/Wabbajack.Networking.Http.csproj index 08e479c2..c9ef1607 100644 --- a/Wabbajack.Networking.Http/Wabbajack.Networking.Http.csproj +++ b/Wabbajack.Networking.Http/Wabbajack.Networking.Http.csproj @@ -8,7 +8,7 @@ - + diff --git a/Wabbajack.Networking.NexusApi/Wabbajack.Networking.NexusApi.csproj b/Wabbajack.Networking.NexusApi/Wabbajack.Networking.NexusApi.csproj index 5a694b24..2a0333a0 100644 --- a/Wabbajack.Networking.NexusApi/Wabbajack.Networking.NexusApi.csproj +++ b/Wabbajack.Networking.NexusApi/Wabbajack.Networking.NexusApi.csproj @@ -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 fbe40f69..c7e6d73b 100644 --- a/Wabbajack.Networking.Steam.Test/Wabbajack.Networking.Steam.Test.csproj +++ b/Wabbajack.Networking.Steam.Test/Wabbajack.Networking.Steam.Test.csproj @@ -12,7 +12,7 @@ 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 70906847..819a40b1 100644 --- a/Wabbajack.Networking.Steam/Wabbajack.Networking.Steam.csproj +++ b/Wabbajack.Networking.Steam/Wabbajack.Networking.Steam.csproj @@ -11,7 +11,7 @@ - + diff --git a/Wabbajack.Networking.WabbajackClientApi/Wabbajack.Networking.WabbajackClientApi.csproj b/Wabbajack.Networking.WabbajackClientApi/Wabbajack.Networking.WabbajackClientApi.csproj index 763a56f3..c5c91f31 100644 --- a/Wabbajack.Networking.WabbajackClientApi/Wabbajack.Networking.WabbajackClientApi.csproj +++ b/Wabbajack.Networking.WabbajackClientApi/Wabbajack.Networking.WabbajackClientApi.csproj @@ -12,7 +12,7 @@ - + diff --git a/Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj b/Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj index 45f54046..03942d81 100644 --- a/Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj +++ b/Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj @@ -16,7 +16,7 @@ - + diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj index 6d411739..f79265c8 100644 --- a/Wabbajack.Server/Wabbajack.Server.csproj +++ b/Wabbajack.Server/Wabbajack.Server.csproj @@ -16,14 +16,14 @@ - + - + - + - + diff --git a/Wabbajack.Services.OSIntegrated/Wabbajack.Services.OSIntegrated.csproj b/Wabbajack.Services.OSIntegrated/Wabbajack.Services.OSIntegrated.csproj index 0204f40f..2223ea6d 100644 --- a/Wabbajack.Services.OSIntegrated/Wabbajack.Services.OSIntegrated.csproj +++ b/Wabbajack.Services.OSIntegrated/Wabbajack.Services.OSIntegrated.csproj @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj b/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj index ae19c377..de77fdee 100644 --- a/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj +++ b/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj @@ -11,8 +11,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + diff --git a/Wabbajack.VFS/Wabbajack.VFS.csproj b/Wabbajack.VFS/Wabbajack.VFS.csproj index e68e6f87..52685ee5 100644 --- a/Wabbajack.VFS/Wabbajack.VFS.csproj +++ b/Wabbajack.VFS/Wabbajack.VFS.csproj @@ -12,7 +12,7 @@ - + From f01dd576b16391d9df2e86fcfffc72a943557978 Mon Sep 17 00:00:00 2001 From: erri120 Date: Fri, 11 Nov 2022 12:05:33 +0100 Subject: [PATCH 5/6] Update GameFinder to 2.2.2 --- .../Wabbajack.Downloaders.GameFile.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Wabbajack.Downloaders.GameFile/Wabbajack.Downloaders.GameFile.csproj b/Wabbajack.Downloaders.GameFile/Wabbajack.Downloaders.GameFile.csproj index 951f23e8..3a0975d7 100644 --- a/Wabbajack.Downloaders.GameFile/Wabbajack.Downloaders.GameFile.csproj +++ b/Wabbajack.Downloaders.GameFile/Wabbajack.Downloaders.GameFile.csproj @@ -18,10 +18,10 @@ - - - - + + + + From 0473e8cd1fa29225fb7a1830c47c53e1724c8254 Mon Sep 17 00:00:00 2001 From: Halgari Date: Fri, 11 Nov 2022 22:26:51 -0700 Subject: [PATCH 6/6] .NET 7.0 Broke the deployment model, will look into it more in a future update --- Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj | 4 ++-- .../Wabbajack.CLI.Builder.csproj | 12 ++++++------ Wabbajack.CLI/Wabbajack.CLI.csproj | 14 +++++++------- Wabbajack.Common/Wabbajack.Common.csproj | 4 ++-- .../Wabbajack.Compiler.Test.csproj | 4 ++-- Wabbajack.Compiler/Wabbajack.Compiler.csproj | 2 +- .../Wabbajack.Compression.BSA.Test.csproj | 4 ++-- .../Wabbajack.Compression.BSA.csproj | 2 +- .../Wabbajack.Compression.Zip.Test.csproj | 2 +- .../Wabbajack.Compression.Zip.csproj | 2 +- .../Wabbajack.DTOs.ConverterGenerators.csproj | 2 +- Wabbajack.DTOs.Test/Wabbajack.DTOs.Test.csproj | 2 +- Wabbajack.DTOs/Wabbajack.DTOs.csproj | 4 ++-- .../Wabbajack.Downloaders.Bethesda.csproj | 2 +- ...abbajack.Downloaders.Dispatcher.Test.csproj | 4 ++-- .../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 | 6 +++--- .../Wabbajack.FileExtractor.csproj | 4 ++-- .../Wabbajack.Hashing.PHash.Test.csproj | 2 +- .../Wabbajack.Hashing.PHash.csproj | 2 +- ...Wabbajack.Hashing.xxHash64.Benchmark.csproj | 2 +- .../Wabbajack.Hashing.xxHash64.Test.csproj | 2 +- .../Wabbajack.Hashing.xxHash64.csproj | 2 +- Wabbajack.IO.Async/Wabbajack.IO.Async.csproj | 2 +- .../Wabbajack.Installer.Test.csproj | 4 ++-- Wabbajack.Installer/Wabbajack.Installer.csproj | 2 +- 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 | 2 +- .../Wabbajack.Networking.Http.csproj | 4 ++-- .../Wabbajack.Networking.NexusApi.Test.csproj | 2 +- .../Wabbajack.Networking.NexusApi.csproj | 6 +++--- .../Wabbajack.Networking.Steam.Test.csproj | 4 ++-- .../Wabbajack.Networking.Steam.csproj | 4 ++-- ...bajack.Networking.WabbajackClientApi.csproj | 4 ++-- .../Wabbajack.Paths.IO.Test.csproj | 2 +- Wabbajack.Paths.IO/Wabbajack.Paths.IO.csproj | 2 +- .../Wabbajack.Paths.Test.csproj | 2 +- Wabbajack.Paths/Wabbajack.Paths.csproj | 2 +- .../Wabbajack.RateLimiter.Test.csproj | 2 +- .../Wabbajack.RateLimiter.csproj | 2 +- .../Wabbajack.Server.Lib.csproj | 2 +- Wabbajack.Server/Wabbajack.Server.csproj | 6 +++--- .../Wabbajack.Services.OSIntegrated.csproj | 4 ++-- .../Wabbajack.VFS.Interfaces.csproj | 2 +- Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj | 6 +++--- Wabbajack.VFS/Wabbajack.VFS.csproj | 4 ++-- 62 files changed, 117 insertions(+), 117 deletions(-) diff --git a/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj b/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj index b0cf2e5f..3d132b57 100644 --- a/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj +++ b/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj @@ -2,7 +2,7 @@ WinExe - net7.0-windows + net6.0-windows true x64 win10-x64 @@ -90,7 +90,7 @@ - + diff --git a/Wabbajack.CLI.Builder/Wabbajack.CLI.Builder.csproj b/Wabbajack.CLI.Builder/Wabbajack.CLI.Builder.csproj index 01a52294..28ed9b4e 100644 --- a/Wabbajack.CLI.Builder/Wabbajack.CLI.Builder.csproj +++ b/Wabbajack.CLI.Builder/Wabbajack.CLI.Builder.csproj @@ -1,17 +1,17 @@ - net7.0 + net6.0 enable enable - - - - - + + + + + diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj index 730e92bd..c9edf2b7 100644 --- a/Wabbajack.CLI/Wabbajack.CLI.csproj +++ b/Wabbajack.CLI/Wabbajack.CLI.csproj @@ -2,8 +2,8 @@ Exe - net7.0-windows - net7.0 + net6.0-windows + net6.0 enable GPL-3.0-or-later $(VERSION) @@ -16,11 +16,11 @@ - - - - - + + + + + diff --git a/Wabbajack.Common/Wabbajack.Common.csproj b/Wabbajack.Common/Wabbajack.Common.csproj index e2660613..35b829e3 100644 --- a/Wabbajack.Common/Wabbajack.Common.csproj +++ b/Wabbajack.Common/Wabbajack.Common.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 92c3aa71..019ec030 100644 --- a/Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj +++ b/Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 false @@ -13,7 +13,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/Wabbajack.Compiler/Wabbajack.Compiler.csproj b/Wabbajack.Compiler/Wabbajack.Compiler.csproj index 9ca4cf58..62584356 100644 --- a/Wabbajack.Compiler/Wabbajack.Compiler.csproj +++ b/Wabbajack.Compiler/Wabbajack.Compiler.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 260103bf..c9ee6010 100644 --- a/Wabbajack.Compression.BSA.Test/Wabbajack.Compression.BSA.Test.csproj +++ b/Wabbajack.Compression.BSA.Test/Wabbajack.Compression.BSA.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 false @@ -11,7 +11,7 @@ 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 d9d11284..ae648ab2 100644 --- a/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj +++ b/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable true GPL-3.0-or-later diff --git a/Wabbajack.Compression.Zip.Test/Wabbajack.Compression.Zip.Test.csproj b/Wabbajack.Compression.Zip.Test/Wabbajack.Compression.Zip.Test.csproj index 6d15e005..3d04da28 100644 --- a/Wabbajack.Compression.Zip.Test/Wabbajack.Compression.Zip.Test.csproj +++ b/Wabbajack.Compression.Zip.Test/Wabbajack.Compression.Zip.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable false diff --git a/Wabbajack.Compression.Zip/Wabbajack.Compression.Zip.csproj b/Wabbajack.Compression.Zip/Wabbajack.Compression.Zip.csproj index 01178a67..bad41454 100644 --- a/Wabbajack.Compression.Zip/Wabbajack.Compression.Zip.csproj +++ b/Wabbajack.Compression.Zip/Wabbajack.Compression.Zip.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable enable diff --git a/Wabbajack.DTOs.ConverterGenerators/Wabbajack.DTOs.ConverterGenerators.csproj b/Wabbajack.DTOs.ConverterGenerators/Wabbajack.DTOs.ConverterGenerators.csproj index 3831f9b2..f549991b 100644 --- a/Wabbajack.DTOs.ConverterGenerators/Wabbajack.DTOs.ConverterGenerators.csproj +++ b/Wabbajack.DTOs.ConverterGenerators/Wabbajack.DTOs.ConverterGenerators.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net6.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 6bc36413..eb42bd83 100644 --- a/Wabbajack.DTOs.Test/Wabbajack.DTOs.Test.csproj +++ b/Wabbajack.DTOs.Test/Wabbajack.DTOs.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 false diff --git a/Wabbajack.DTOs/Wabbajack.DTOs.csproj b/Wabbajack.DTOs/Wabbajack.DTOs.csproj index cab359cf..4e232d26 100644 --- a/Wabbajack.DTOs/Wabbajack.DTOs.csproj +++ b/Wabbajack.DTOs/Wabbajack.DTOs.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 02afa7a1..7544d14c 100644 --- a/Wabbajack.Downloaders.Bethesda/Wabbajack.Downloaders.Bethesda.csproj +++ b/Wabbajack.Downloaders.Bethesda/Wabbajack.Downloaders.Bethesda.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable enable diff --git a/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj b/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj index 9070839d..901a70cc 100644 --- a/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj +++ b/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 false @@ -11,7 +11,7 @@ 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 1f6e8500..0db2bd81 100644 --- a/Wabbajack.Downloaders.Dispatcher/Wabbajack.Downloaders.Dispatcher.csproj +++ b/Wabbajack.Downloaders.Dispatcher/Wabbajack.Downloaders.Dispatcher.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 3a0975d7..26f0e1ca 100644 --- a/Wabbajack.Downloaders.GameFile/Wabbajack.Downloaders.GameFile.csproj +++ b/Wabbajack.Downloaders.GameFile/Wabbajack.Downloaders.GameFile.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable enable @@ -13,7 +13,7 @@ - ..\..\..\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\6.0.0-preview.6.21355.2\ref\net7.0\Microsoft.Extensions.Logging.Abstractions.dll + ..\..\..\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\6.0.0-preview.6.21355.2\ref\net6.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 4b708df3..a2b5a85d 100644 --- a/Wabbajack.Downloaders.GoogleDrive/Wabbajack.Downloaders.GoogleDrive.csproj +++ b/Wabbajack.Downloaders.GoogleDrive/Wabbajack.Downloaders.GoogleDrive.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 45cba4e4..f0190d2e 100644 --- a/Wabbajack.Downloaders.Http/Wabbajack.Downloaders.Http.csproj +++ b/Wabbajack.Downloaders.Http/Wabbajack.Downloaders.Http.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 c9a6c02e..ae2488eb 100644 --- a/Wabbajack.Downloaders.IPS4OAuth2Downloader/Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj +++ b/Wabbajack.Downloaders.IPS4OAuth2Downloader/Wabbajack.Downloaders.IPS4OAuth2Downloader.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 d3acee8e..88869b1c 100644 --- a/Wabbajack.Downloaders.Interfaces/Wabbajack.Downloaders.Interfaces.csproj +++ b/Wabbajack.Downloaders.Interfaces/Wabbajack.Downloaders.Interfaces.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 63ff665a..efbf5c33 100644 --- a/Wabbajack.Downloaders.Manual/Wabbajack.Downloaders.Manual.csproj +++ b/Wabbajack.Downloaders.Manual/Wabbajack.Downloaders.Manual.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 663d63a7..7c3378e9 100644 --- a/Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj +++ b/Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj @@ -1,14 +1,14 @@ - net7.0 + net6.0 enable - - + + diff --git a/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj b/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj index 1d8dc777..300a2784 100644 --- a/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj +++ b/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 3e536647..ed35adc1 100644 --- a/Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj +++ b/Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 6fc137e1..96c12049 100644 --- a/Wabbajack.Downloaders.Nexus/Wabbajack.Downloaders.Nexus.csproj +++ b/Wabbajack.Downloaders.Nexus/Wabbajack.Downloaders.Nexus.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 6b7f856e..775a9597 100644 --- a/Wabbajack.Downloaders.VerificationCache/Wabbajack.Downloaders.VerificationCache.csproj +++ b/Wabbajack.Downloaders.VerificationCache/Wabbajack.Downloaders.VerificationCache.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 3e5594da..c04a827f 100644 --- a/Wabbajack.Downloaders.WabbajackCDN/Wabbajack.Downloaders.WabbajackCDN.csproj +++ b/Wabbajack.Downloaders.WabbajackCDN/Wabbajack.Downloaders.WabbajackCDN.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 ee5f2ae7..6e070afe 100644 --- a/Wabbajack.FileExtractor.Test/Wabbajack.FileExtractor.Test.csproj +++ b/Wabbajack.FileExtractor.Test/Wabbajack.FileExtractor.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 false @@ -11,8 +11,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + diff --git a/Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj b/Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj index 742e458c..356afd7d 100644 --- a/Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj +++ b/Wabbajack.FileExtractor/Wabbajack.FileExtractor.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 9abbceea..3c1093eb 100644 --- a/Wabbajack.Hashing.PHash.Test/Wabbajack.Hashing.PHash.Test.csproj +++ b/Wabbajack.Hashing.PHash.Test/Wabbajack.Hashing.PHash.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 false diff --git a/Wabbajack.Hashing.PHash/Wabbajack.Hashing.PHash.csproj b/Wabbajack.Hashing.PHash/Wabbajack.Hashing.PHash.csproj index e2675fe2..2197a721 100644 --- a/Wabbajack.Hashing.PHash/Wabbajack.Hashing.PHash.csproj +++ b/Wabbajack.Hashing.PHash/Wabbajack.Hashing.PHash.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 03dff657..4e9b1f49 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 - net7.0 + net6.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 204f9d5f..d4523c52 100644 --- a/Wabbajack.Hashing.xxHash64.Test/Wabbajack.Hashing.xxHash64.Test.csproj +++ b/Wabbajack.Hashing.xxHash64.Test/Wabbajack.Hashing.xxHash64.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 false diff --git a/Wabbajack.Hashing.xxHash64/Wabbajack.Hashing.xxHash64.csproj b/Wabbajack.Hashing.xxHash64/Wabbajack.Hashing.xxHash64.csproj index f26d307e..f6edd4e1 100644 --- a/Wabbajack.Hashing.xxHash64/Wabbajack.Hashing.xxHash64.csproj +++ b/Wabbajack.Hashing.xxHash64/Wabbajack.Hashing.xxHash64.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 6836c680..eb2460e9 100644 --- a/Wabbajack.IO.Async/Wabbajack.IO.Async.csproj +++ b/Wabbajack.IO.Async/Wabbajack.IO.Async.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable enable diff --git a/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj b/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj index 590be299..c1dbcbe2 100644 --- a/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj +++ b/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 false @@ -11,7 +11,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/Wabbajack.Installer/Wabbajack.Installer.csproj b/Wabbajack.Installer/Wabbajack.Installer.csproj index 28277612..845d9ca3 100644 --- a/Wabbajack.Installer/Wabbajack.Installer.csproj +++ b/Wabbajack.Installer/Wabbajack.Installer.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable $(VERSION) GPL-3.0-or-later diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj index d42054fe..81694f4f 100644 --- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj +++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj @@ -1,8 +1,8 @@  WinExe - net7.0-windows - net7.0 + net6.0-windows + net6.0 enable Wabbajack @@ -18,19 +18,19 @@ Resources\Icons\wabbajack.ico - + 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 68bb36ab..0267a74f 100644 --- a/Wabbajack.Networking.BethesdaNet/Wabbajack.Networking.BethesdaNet.csproj +++ b/Wabbajack.Networking.BethesdaNet/Wabbajack.Networking.BethesdaNet.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable enable diff --git a/Wabbajack.Networking.Discord/Wabbajack.Networking.Discord.csproj b/Wabbajack.Networking.Discord/Wabbajack.Networking.Discord.csproj index 9a61d8e8..1061d857 100644 --- a/Wabbajack.Networking.Discord/Wabbajack.Networking.Discord.csproj +++ b/Wabbajack.Networking.Discord/Wabbajack.Networking.Discord.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 2591cd88..d75d9f31 100644 --- a/Wabbajack.Networking.GitHub/Wabbajack.Networking.GitHub.csproj +++ b/Wabbajack.Networking.GitHub/Wabbajack.Networking.GitHub.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 5037943c..e9ee3e62 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 @@ - net7.0 + net6.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 a20f6ab2..0aecc8b7 100644 --- a/Wabbajack.Networking.Http.Test/Wabbajack.Networking.Http.Test.csproj +++ b/Wabbajack.Networking.Http.Test/Wabbajack.Networking.Http.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable false diff --git a/Wabbajack.Networking.Http/Wabbajack.Networking.Http.csproj b/Wabbajack.Networking.Http/Wabbajack.Networking.Http.csproj index c9ef1607..50861f38 100644 --- a/Wabbajack.Networking.Http/Wabbajack.Networking.Http.csproj +++ b/Wabbajack.Networking.Http/Wabbajack.Networking.Http.csproj @@ -1,14 +1,14 @@ - net7.0 + net6.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 fac1ed50..552f015c 100644 --- a/Wabbajack.Networking.NexusApi.Test/Wabbajack.Networking.NexusApi.Test.csproj +++ b/Wabbajack.Networking.NexusApi.Test/Wabbajack.Networking.NexusApi.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 false diff --git a/Wabbajack.Networking.NexusApi/Wabbajack.Networking.NexusApi.csproj b/Wabbajack.Networking.NexusApi/Wabbajack.Networking.NexusApi.csproj index 2a0333a0..05977cf3 100644 --- a/Wabbajack.Networking.NexusApi/Wabbajack.Networking.NexusApi.csproj +++ b/Wabbajack.Networking.NexusApi/Wabbajack.Networking.NexusApi.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 c7e6d73b..b8f20c0b 100644 --- a/Wabbajack.Networking.Steam.Test/Wabbajack.Networking.Steam.Test.csproj +++ b/Wabbajack.Networking.Steam.Test/Wabbajack.Networking.Steam.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable false @@ -12,7 +12,7 @@ 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 819a40b1..d9364b70 100644 --- a/Wabbajack.Networking.Steam/Wabbajack.Networking.Steam.csproj +++ b/Wabbajack.Networking.Steam/Wabbajack.Networking.Steam.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 c5c91f31..7aeb859b 100644 --- a/Wabbajack.Networking.WabbajackClientApi/Wabbajack.Networking.WabbajackClientApi.csproj +++ b/Wabbajack.Networking.WabbajackClientApi/Wabbajack.Networking.WabbajackClientApi.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 3948bc11..bbd2b0ea 100644 --- a/Wabbajack.Paths.IO.Test/Wabbajack.Paths.IO.Test.csproj +++ b/Wabbajack.Paths.IO.Test/Wabbajack.Paths.IO.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 false diff --git a/Wabbajack.Paths.IO/Wabbajack.Paths.IO.csproj b/Wabbajack.Paths.IO/Wabbajack.Paths.IO.csproj index 0cd88c4d..2494c58e 100644 --- a/Wabbajack.Paths.IO/Wabbajack.Paths.IO.csproj +++ b/Wabbajack.Paths.IO/Wabbajack.Paths.IO.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 a5d4fe49..1415da3d 100644 --- a/Wabbajack.Paths.Test/Wabbajack.Paths.Test.csproj +++ b/Wabbajack.Paths.Test/Wabbajack.Paths.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 false diff --git a/Wabbajack.Paths/Wabbajack.Paths.csproj b/Wabbajack.Paths/Wabbajack.Paths.csproj index 1ffbca14..2502d56d 100644 --- a/Wabbajack.Paths/Wabbajack.Paths.csproj +++ b/Wabbajack.Paths/Wabbajack.Paths.csproj @@ -1,6 +1,6 @@ - net7.0 + net6.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 3db11fcf..8b16f12f 100644 --- a/Wabbajack.RateLimiter.Test/Wabbajack.RateLimiter.Test.csproj +++ b/Wabbajack.RateLimiter.Test/Wabbajack.RateLimiter.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable false diff --git a/Wabbajack.RateLimiter/Wabbajack.RateLimiter.csproj b/Wabbajack.RateLimiter/Wabbajack.RateLimiter.csproj index 444af79a..72d6b4a4 100644 --- a/Wabbajack.RateLimiter/Wabbajack.RateLimiter.csproj +++ b/Wabbajack.RateLimiter/Wabbajack.RateLimiter.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable diff --git a/Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj b/Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj index 03942d81..d69e3e3c 100644 --- a/Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj +++ b/Wabbajack.Server.Lib/Wabbajack.Server.Lib.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj index f79265c8..eb548414 100644 --- a/Wabbajack.Server/Wabbajack.Server.csproj +++ b/Wabbajack.Server/Wabbajack.Server.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable enable Exe @@ -19,9 +19,9 @@ - + - + diff --git a/Wabbajack.Services.OSIntegrated/Wabbajack.Services.OSIntegrated.csproj b/Wabbajack.Services.OSIntegrated/Wabbajack.Services.OSIntegrated.csproj index 2223ea6d..b2cfce82 100644 --- a/Wabbajack.Services.OSIntegrated/Wabbajack.Services.OSIntegrated.csproj +++ b/Wabbajack.Services.OSIntegrated/Wabbajack.Services.OSIntegrated.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.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 5b854cb5..bf68d60e 100644 --- a/Wabbajack.VFS.Interfaces/Wabbajack.VFS.Interfaces.csproj +++ b/Wabbajack.VFS.Interfaces/Wabbajack.VFS.Interfaces.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable enable diff --git a/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj b/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj index de77fdee..ebcd2790 100644 --- a/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj +++ b/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 false @@ -11,8 +11,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + diff --git a/Wabbajack.VFS/Wabbajack.VFS.csproj b/Wabbajack.VFS/Wabbajack.VFS.csproj index 52685ee5..07ec317f 100644 --- a/Wabbajack.VFS/Wabbajack.VFS.csproj +++ b/Wabbajack.VFS/Wabbajack.VFS.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 enable $(VERSION) GPL-3.0-or-later @@ -12,7 +12,7 @@ - +