Fixed: Resolved some compiler warnings.

TheGershon · Aug 9, 2022 · df925d3 · df925d3
1 parent 033a5aa
commit df925d3
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/source/Reloaded.Mod.Launcher/Pages/BaseSubpages/ApplicationPage.xaml.cs b/source/Reloaded.Mod.Launcher/Pages/BaseSubpages/ApplicationPage.xaml.cs
@@ -18,11 +18,11 @@ public ApplicationPage()
         SwappedOut += Dispose;
         InitializeComponent();
         ViewModel = new ApplicationViewModel(Lib.IoC.Get<MainPageViewModel>().SelectedApplication!, Lib.IoC.Get<ModConfigService>(), Lib.IoC.Get<ModUserConfigService>(), Lib.IoC.Get<LoaderConfig>());
-        ViewModel.PropertyChanged += OnPageChanged;
+        ViewModel.PropertyChanged += WhenPageChanged;
         ViewModel.ChangeApplicationPage(ApplicationSubPage.ApplicationSummary);
     }
 
-    private void OnPageChanged(object? sender, PropertyChangedEventArgs e)
+    private void WhenPageChanged(object? sender, PropertyChangedEventArgs e)
     {
         if (e.PropertyName == nameof(ViewModel.Page))
             SwitchPage(ViewModel.Page);
@@ -39,7 +39,7 @@ public void Dispose()
             return;
 
         _disposed = true;
-        ViewModel.PropertyChanged -= OnPageChanged;
+        ViewModel.PropertyChanged -= WhenPageChanged;
         ActionWrappers.ExecuteWithApplicationDispatcherAsync(() =>
         {
             if (PageHost.CurrentPage is IDisposable disposable)

diff --git a/...Reloaded.Mod.Launcher/Pages/BaseSubpages/DownloadPackagesPages/PackagePreviewPage.xaml.cs b/...Reloaded.Mod.Launcher/Pages/BaseSubpages/DownloadPackagesPages/PackagePreviewPage.xaml.cs
@@ -25,7 +25,7 @@ public PackagePreviewPage(DownloadPackagePreviewViewModel viewModel, Action clos
         _close = close;
         InitializeComponent();
         this.AnimateInFinished -= OnAnimateInFinished;
-        PreviewCarousel.OnPageIndexChanged += OnPageIndexChanged;
+        PreviewCarousel.OnPageIndexChanged += WhenPageIndexChanged;
         ControllerSupport.SubscribePreviewCustomInputs(SubscribePreviewCustomInputs);
 
         // We need to explicitly set focus in case person changes page on controller without 
@@ -211,7 +211,7 @@ protected override Animation[] MakeExitAnimations()
     // Don't navigate hyperlinks in our markdown, thanks!
     private void Page_Click(object sender, RoutedEventArgs e) => e.Handled = true;
 
-    private void OnPageIndexChanged(int pageIndex)
+    private void WhenPageIndexChanged(int pageIndex)
     {
         if (ViewModel.Package.Images != null)
             ViewModel.SelectedImage = ViewModel.Package.Images[pageIndex];

diff --git a/source/Reloaded.Mod.Loader.Tests/Reloaded.Mod.Loader.Tests.csproj b/source/Reloaded.Mod.Loader.Tests/Reloaded.Mod.Loader.Tests.csproj
@@ -7,6 +7,7 @@
     <LangVersion>preview</LangVersion>
     <OutputPath>..\Output\Tests\</OutputPath>
     <Nullable>disable</Nullable>
+    <NoWarn>$(NoWarn);NU1605;NU1701;MSB3270</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/source/Reloaded.Mod.Loader.Tests/Update/Mocks/DummyDownloadablePackage.cs b/source/Reloaded.Mod.Loader.Tests/Update/Mocks/DummyDownloadablePackage.cs
@@ -27,7 +27,7 @@ public class DummyDownloadablePackage : IDownloadablePackage
     public long? ViewCount { get; } = null;
     public long? DownloadCount { get; } = null;
     public DateTime? Published { get; set; } = null!;
-    public string? Changelog { get; } = null!;
+    public string Changelog { get; } = null!;
 
     public Task<string> DownloadAsync(string packageFolder, IProgress<double> progress, CancellationToken token = default)
     {

diff --git a/source/Reloaded.Mod.Loader.Update.Index/Structures/Package.cs b/source/Reloaded.Mod.Loader.Update.Index/Structures/Package.cs
@@ -10,7 +10,9 @@ namespace Reloaded.Mod.Loader.Update.Index.Structures;
 [Equals(DoNotAddEqualityOperators = true)]
 public class Package : IDownloadablePackage
 {
+#pragma warning disable CS0067
     public event PropertyChangedEventHandler? PropertyChanged;
+#pragma warning restore CS0067
 
     /// <inheritdoc />
     public string Name { get; set; } = "";

diff --git a/source/Reloaded.Mod.Loader.Update/Caching/AkavacheContentStore.cs b/source/Reloaded.Mod.Loader.Update/Caching/AkavacheContentStore.cs
@@ -97,7 +97,7 @@ public async Task<bool> TryRemoveAsync(CacheKey key)
             await observable;
             return result;
         }
-        catch (KeyNotFoundException e)
+        catch (KeyNotFoundException)
         {
             return false;
         }

diff --git a/source/Reloaded.Mod.Loader/Reloaded.Mod.Loader.csproj b/source/Reloaded.Mod.Loader/Reloaded.Mod.Loader.csproj
@@ -10,7 +10,7 @@
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <NoWarn>$(NoWarn);NU1605</NoWarn>
+    <NoWarn>$(NoWarn);NU1605;NU1701</NoWarn>
 	  <Version>1.19.2</Version>
     <Platforms>x86;x64</Platforms>
     <Deterministic>true</Deterministic>