From 47b5bbe7e7ca80dc5bfd6a8314fd7c254637ad5d Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 22 Jan 2021 12:03:12 -0800 Subject: [PATCH] Update to BurnOutSharp 1.5.1 --- CHANGELIST.md | 1 + MPF.Check/MPF.Check.csproj | 2 +- MPF.Check/Program.cs | 4 ++-- MPF.Library/MPF.Library.csproj | 4 ++-- MPF.Library/Utilities/DumpEnvironment.cs | 6 +++--- MPF.Library/Utilities/Validators.cs | 2 +- MPF.Test/MPF.Test.csproj | 4 ++-- MPF/MPF.csproj | 4 ++-- MPF/Windows/MainWindow.xaml.cs | 8 ++++---- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index 4198c908..d5bcc1c9 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -17,6 +17,7 @@ - Add hashing for UMDs from UIC outputs - Fix information gathering for UIC outputs - Fix issue with duplicate security sector data in XGD DiscImageCreator outputs +- Update to BurnOutSharp 1.5.1 ### 1.18 (2020-11-10) - Add more information extraction and generation for Aaru diff --git a/MPF.Check/MPF.Check.csproj b/MPF.Check/MPF.Check.csproj index be598466..a7718bfb 100644 --- a/MPF.Check/MPF.Check.csproj +++ b/MPF.Check/MPF.Check.csproj @@ -22,7 +22,7 @@ - + runtime; compile; build; native; analyzers; buildtransitive diff --git a/MPF.Check/Program.cs b/MPF.Check/Program.cs index 96ec680c..5839ccfc 100644 --- a/MPF.Check/Program.cs +++ b/MPF.Check/Program.cs @@ -123,7 +123,7 @@ namespace MPF.Check // Make new Progress objects var resultProgress = new Progress(); resultProgress.ProgressChanged += ProgressUpdated; - var protectionProgress = new Progress(); + var protectionProgress = new Progress(); protectionProgress.ProgressChanged += ProgressUpdated; // If credentials are invalid, alert the user @@ -261,7 +261,7 @@ namespace MPF.Check /// /// Simple process counter to write to console /// - private static void ProgressUpdated(object sender, FileProtection value) + private static void ProgressUpdated(object sender, ProtectionProgress value) { Console.WriteLine($"{value.Percentage * 100:N2}%: {value.Filename} - {value.Protection}"); } diff --git a/MPF.Library/MPF.Library.csproj b/MPF.Library/MPF.Library.csproj index 50bf2393..ac93b818 100644 --- a/MPF.Library/MPF.Library.csproj +++ b/MPF.Library/MPF.Library.csproj @@ -67,11 +67,11 @@ - + runtime; compile; build; native; analyzers; buildtransitive - + diff --git a/MPF.Library/Utilities/DumpEnvironment.cs b/MPF.Library/Utilities/DumpEnvironment.cs index 26213750..87bf82a7 100644 --- a/MPF.Library/Utilities/DumpEnvironment.cs +++ b/MPF.Library/Utilities/DumpEnvironment.cs @@ -501,7 +501,7 @@ namespace MPF.Utilities /// Result instance with the outcome public async Task VerifyAndSaveDumpOutput( IProgress resultProgress = null, - IProgress protectionProgress = null, + IProgress protectionProgress = null, bool? ejectDisc = null, bool resetDrive = false, Func showUserPrompt = null) @@ -631,7 +631,7 @@ namespace MPF.Utilities /// SubmissionInfo populated based on outputs, null on error private async Task ExtractOutputInformation( IProgress resultProgress = null, - IProgress protectionProgress = null) + IProgress protectionProgress = null) { // Ensure the current disc combination should exist if (!Validators.GetValidMediaTypes(System).Contains(Type)) @@ -1369,7 +1369,7 @@ namespace MPF.Utilities /// /// Optional progress callback /// Copy protection scheme if possible, null on error - private async Task GetCopyProtection(IProgress progress = null) + private async Task GetCopyProtection(IProgress progress = null) { if (ScanForProtection) return await Validators.RunProtectionScanOnPath($"{Drive.Letter}:\\", progress); diff --git a/MPF.Library/Utilities/Validators.cs b/MPF.Library/Utilities/Validators.cs index dca643c4..4f3c6025 100644 --- a/MPF.Library/Utilities/Validators.cs +++ b/MPF.Library/Utilities/Validators.cs @@ -1007,7 +1007,7 @@ namespace MPF.Utilities /// Path to scan for protection /// Optional progress callback /// Copy protection detected in the envirionment, if any - public static async Task RunProtectionScanOnPath(string path, IProgress progress = null) + public static async Task RunProtectionScanOnPath(string path, IProgress progress = null) { try { diff --git a/MPF.Test/MPF.Test.csproj b/MPF.Test/MPF.Test.csproj index 7053935d..e78afc08 100644 --- a/MPF.Test/MPF.Test.csproj +++ b/MPF.Test/MPF.Test.csproj @@ -17,8 +17,8 @@ - - + + diff --git a/MPF/MPF.csproj b/MPF/MPF.csproj index 9cd81bd4..f71ccfe0 100644 --- a/MPF/MPF.csproj +++ b/MPF/MPF.csproj @@ -21,10 +21,10 @@ - + runtime; compile; build; native; analyzers; buildtransitive - + diff --git a/MPF/Windows/MainWindow.xaml.cs b/MPF/Windows/MainWindow.xaml.cs index 80ca28c8..e3b99ae5 100644 --- a/MPF/Windows/MainWindow.xaml.cs +++ b/MPF/Windows/MainWindow.xaml.cs @@ -492,7 +492,7 @@ namespace MPF.Windows MediaScanButton.IsEnabled = false; CopyProtectScanButton.IsEnabled = false; - var progress = new Progress(); + var progress = new Progress(); progress.ProgressChanged += ProgressUpdated; string protections = await Validators.RunProtectionScanOnPath(drive.Letter + ":\\", progress); @@ -620,7 +620,7 @@ namespace MPF.Windows // Get progress indicators var resultProgress = new Progress(); resultProgress.ProgressChanged += ProgressUpdated; - var protectionProgress = new Progress(); + var protectionProgress = new Progress(); protectionProgress.ProgressChanged += ProgressUpdated; // Run the program with the parameters @@ -882,9 +882,9 @@ namespace MPF.Windows } /// - /// Handler for FileProtection ProgressChanged event + /// Handler for ProtectionProgress ProgressChanged event /// - private void ProgressUpdated(object sender, FileProtection value) + private void ProgressUpdated(object sender, ProtectionProgress value) { string message = $"{value.Percentage * 100:N2}%: {value.Filename} - {value.Protection}"; StatusLabel.Content = message;