diff --git a/src/CCVTAC.Main/CCVTAC.Main.fsproj b/src/CCVTAC.Main/CCVTAC.Main.fsproj index a99b120..96883f7 100644 --- a/src/CCVTAC.Main/CCVTAC.Main.fsproj +++ b/src/CCVTAC.Main/CCVTAC.Main.fsproj @@ -40,12 +40,12 @@ - + - + - + diff --git a/src/CCVTAC.Main/Commands.fs b/src/CCVTAC.Main/Commands.fs index 8eb8013..a91d825 100644 --- a/src/CCVTAC.Main/Commands.fs +++ b/src/CCVTAC.Main/Commands.fs @@ -1,6 +1,6 @@ namespace CCVTAC.Main -open CCFSharpUtils.Library +open CCFSharpUtils open System module Commands = diff --git a/src/CCVTAC.Main/Downloading/Downloading.fs b/src/CCVTAC.Main/Downloading/Downloading.fs index f266df0..5f8f89c 100644 --- a/src/CCVTAC.Main/Downloading/Downloading.fs +++ b/src/CCVTAC.Main/Downloading/Downloading.fs @@ -1,6 +1,6 @@ namespace CCVTAC.Main.Downloading -open CCFSharpUtils.Library +open CCFSharpUtils module Downloading = diff --git a/src/CCVTAC.Main/Downloading/Updater.fs b/src/CCVTAC.Main/Downloading/Updater.fs index 7d90131..9aa8133 100644 --- a/src/CCVTAC.Main/Downloading/Updater.fs +++ b/src/CCVTAC.Main/Downloading/Updater.fs @@ -3,7 +3,7 @@ namespace CCVTAC.Main.Downloading open CCVTAC.Main open CCVTAC.Main.ExternalTools open CCVTAC.Main.Settings.Settings -open CCFSharpUtils.Library +open CCFSharpUtils module Updater = diff --git a/src/CCVTAC.Main/ExternalTools/Runner.fs b/src/CCVTAC.Main/ExternalTools/Runner.fs index d49b61d..0659090 100644 --- a/src/CCVTAC.Main/ExternalTools/Runner.fs +++ b/src/CCVTAC.Main/ExternalTools/Runner.fs @@ -1,7 +1,7 @@ namespace CCVTAC.Main.ExternalTools open CCVTAC.Main -open CCFSharpUtils.Library +open CCFSharpUtils open Startwatch.Library open System open System.Diagnostics diff --git a/src/CCVTAC.Main/History.fs b/src/CCVTAC.Main/History.fs index 25f44b2..8f2b021 100644 --- a/src/CCVTAC.Main/History.fs +++ b/src/CCVTAC.Main/History.fs @@ -1,7 +1,7 @@ namespace CCVTAC.Main open CCVTAC.Main.IoUtilities.Files -open CCFSharpUtils.Library +open CCFSharpUtils open System open System.IO open System.Text.Json diff --git a/src/CCVTAC.Main/IoUtilities/Directories.fs b/src/CCVTAC.Main/IoUtilities/Directories.fs index 007a05d..1b75ccf 100644 --- a/src/CCVTAC.Main/IoUtilities/Directories.fs +++ b/src/CCVTAC.Main/IoUtilities/Directories.fs @@ -1,7 +1,7 @@ namespace CCVTAC.Main.IoUtilities open CCVTAC.Main -open CCFSharpUtils.Library +open CCFSharpUtils open System.IO open System.Text diff --git a/src/CCVTAC.Main/IoUtilities/Files.fs b/src/CCVTAC.Main/IoUtilities/Files.fs index 00d2e98..9dbefdd 100644 --- a/src/CCVTAC.Main/IoUtilities/Files.fs +++ b/src/CCVTAC.Main/IoUtilities/Files.fs @@ -1,7 +1,6 @@ namespace CCVTAC.Main.IoUtilities -open CCVTAC.Main -open CCFSharpUtils.Library +open CCFSharpUtils open System.IO module Files = diff --git a/src/CCVTAC.Main/Orchestrator.fs b/src/CCVTAC.Main/Orchestrator.fs index 60e4e00..4fff70b 100644 --- a/src/CCVTAC.Main/Orchestrator.fs +++ b/src/CCVTAC.Main/Orchestrator.fs @@ -7,7 +7,7 @@ open CCVTAC.Main.PostProcessing open CCVTAC.Main.Settings open CCVTAC.Main.Settings.Settings open CCVTAC.Main.Settings.Settings.LiveUpdating -open CCFSharpUtils.Library +open CCFSharpUtils open Startwatch.Library open System diff --git a/src/CCVTAC.Main/PostProcessing/Deleter.fs b/src/CCVTAC.Main/PostProcessing/Deleter.fs index e6485c5..36ca2a0 100644 --- a/src/CCVTAC.Main/PostProcessing/Deleter.fs +++ b/src/CCVTAC.Main/PostProcessing/Deleter.fs @@ -1,7 +1,7 @@ namespace CCVTAC.Main.PostProcessing open CCVTAC.Main -open CCFSharpUtils.Library +open CCFSharpUtils open System.IO module Deleter = diff --git a/src/CCVTAC.Main/PostProcessing/MetadataUtilities.fs b/src/CCVTAC.Main/PostProcessing/MetadataUtilities.fs index a75c543..3916349 100644 --- a/src/CCVTAC.Main/PostProcessing/MetadataUtilities.fs +++ b/src/CCVTAC.Main/PostProcessing/MetadataUtilities.fs @@ -1,7 +1,7 @@ namespace CCVTAC.Main.PostProcessing open CCVTAC.Main -open CCFSharpUtils.Library +open CCFSharpUtils open System open System.Text diff --git a/src/CCVTAC.Main/PostProcessing/Mover.fs b/src/CCVTAC.Main/PostProcessing/Mover.fs index c8eedc5..b783b7b 100644 --- a/src/CCVTAC.Main/PostProcessing/Mover.fs +++ b/src/CCVTAC.Main/PostProcessing/Mover.fs @@ -6,7 +6,7 @@ open CCVTAC.Main.IoUtilities open CCVTAC.Main.PostProcessing open CCVTAC.Main.PostProcessing.Tagging open CCVTAC.Main.Settings.Settings -open CCFSharpUtils.Library +open CCFSharpUtils open TaggingSet open System open System.IO diff --git a/src/CCVTAC.Main/PostProcessing/PostProcessing.fs b/src/CCVTAC.Main/PostProcessing/PostProcessing.fs index 414b85d..62550a7 100644 --- a/src/CCVTAC.Main/PostProcessing/PostProcessing.fs +++ b/src/CCVTAC.Main/PostProcessing/PostProcessing.fs @@ -5,7 +5,7 @@ open CCVTAC.Main.IoUtilities open CCVTAC.Main.PostProcessing.Tagging open CCVTAC.Main.PostProcessing.Tagging.TaggingSet open CCVTAC.Main.Settings.Settings -open CCFSharpUtils.Library +open CCFSharpUtils open Startwatch.Library open System.IO open System.Linq diff --git a/src/CCVTAC.Main/PostProcessing/Renamer.fs b/src/CCVTAC.Main/PostProcessing/Renamer.fs index 9af82f3..ecb1c4f 100644 --- a/src/CCVTAC.Main/PostProcessing/Renamer.fs +++ b/src/CCVTAC.Main/PostProcessing/Renamer.fs @@ -3,7 +3,7 @@ namespace CCVTAC.Main.PostProcessing open CCVTAC.Main open CCVTAC.Main.IoUtilities open CCVTAC.Main.Settings.Settings -open CCFSharpUtils.Library +open CCFSharpUtils open System open System.IO open System.Text diff --git a/src/CCVTAC.Main/PostProcessing/Tagging/Tagger.fs b/src/CCVTAC.Main/PostProcessing/Tagging/Tagger.fs index 8a905fc..4f442ec 100644 --- a/src/CCVTAC.Main/PostProcessing/Tagging/Tagger.fs +++ b/src/CCVTAC.Main/PostProcessing/Tagging/Tagger.fs @@ -5,7 +5,7 @@ open CCVTAC.Main.Settings.Settings open CCVTAC.Main.PostProcessing open CCVTAC.Main.PostProcessing.Tagging open CCVTAC.Main.Downloading.Downloading -open CCFSharpUtils.Library +open CCFSharpUtils open Startwatch.Library open TaggingSet open MetadataUtilities diff --git a/src/CCVTAC.Main/PostProcessing/Tagging/TaggingSet.fs b/src/CCVTAC.Main/PostProcessing/Tagging/TaggingSet.fs index 100a81b..474e240 100644 --- a/src/CCVTAC.Main/PostProcessing/Tagging/TaggingSet.fs +++ b/src/CCVTAC.Main/PostProcessing/Tagging/TaggingSet.fs @@ -1,7 +1,8 @@ namespace CCVTAC.Main.PostProcessing.Tagging open CCVTAC.Main.IoUtilities -open CCFSharpUtils.Library +open CCFSharpUtils +open CCFSharpUtils.Operators open FsToolkit.ErrorHandling open System.IO open System.Text.RegularExpressions @@ -89,4 +90,4 @@ module TaggingSet = |> List.mapSnd fileName |> List.map createValidated |> List.sequenceResultA - |! List.collect id + |!! List.collect id diff --git a/src/CCVTAC.Main/Printer.fs b/src/CCVTAC.Main/Printer.fs index 65f8a5c..e4a9e88 100644 --- a/src/CCVTAC.Main/Printer.fs +++ b/src/CCVTAC.Main/Printer.fs @@ -1,6 +1,6 @@ namespace CCVTAC.Main -open CCFSharpUtils.Library +open CCFSharpUtils open System open System.Collections.Generic open System.Linq diff --git a/src/CCVTAC.Main/Program.fs b/src/CCVTAC.Main/Program.fs index 50a6bfb..4a68add 100644 --- a/src/CCVTAC.Main/Program.fs +++ b/src/CCVTAC.Main/Program.fs @@ -5,7 +5,7 @@ open CCVTAC.Main.IoUtilities open CCVTAC.Main.Settings open CCVTAC.Main.Settings.Settings open Settings.IO -open CCFSharpUtils.Library +open CCFSharpUtils open Spectre.Console open System open System.IO diff --git a/src/CCVTAC.Main/ResultTracker.fs b/src/CCVTAC.Main/ResultTracker.fs index 8a7f4b5..1aab17f 100644 --- a/src/CCVTAC.Main/ResultTracker.fs +++ b/src/CCVTAC.Main/ResultTracker.fs @@ -1,6 +1,6 @@ namespace CCVTAC.Main -open CCFSharpUtils.Library +open CCFSharpUtils open System open System.Collections.Generic diff --git a/src/CCVTAC.Main/Settings/Settings.fs b/src/CCVTAC.Main/Settings/Settings.fs index 6ded58d..40ae149 100644 --- a/src/CCVTAC.Main/Settings/Settings.fs +++ b/src/CCVTAC.Main/Settings/Settings.fs @@ -1,7 +1,7 @@ namespace CCVTAC.Main.Settings open CCVTAC.Main -open CCFSharpUtils.Library +open CCFSharpUtils open Spectre.Console open System open System.Text.Json.Serialization diff --git a/src/CCVTAC.Tests/CCVTAC.Tests.fsproj b/src/CCVTAC.Tests/CCVTAC.Tests.fsproj index d868ec7..47529a3 100644 --- a/src/CCVTAC.Tests/CCVTAC.Tests.fsproj +++ b/src/CCVTAC.Tests/CCVTAC.Tests.fsproj @@ -14,8 +14,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive @@ -25,7 +25,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/CCVTAC.Tests/TagDetectionTests.fs b/src/CCVTAC.Tests/TagDetectionTests.fs index ccf40e1..10ece0b 100644 --- a/src/CCVTAC.Tests/TagDetectionTests.fs +++ b/src/CCVTAC.Tests/TagDetectionTests.fs @@ -3,7 +3,7 @@ module TagDetectionTests open CCVTAC.Main.PostProcessing.Tagging open CCVTAC.Main.PostProcessing open CCVTAC.Main.Settings.Settings -open CCFSharpUtils.Library +open CCFSharpUtils open System open Xunit