.NET 9 Migration (#205)

.editorconfig

@@ -73,6 +73,17 @@ dotnet_diagnostic.SA1118.severity = none
 # force static members to appear before non-static
 dotnet_diagnostic.SA1204.severity = none
 
+# style warnings
+dotnet_diagnostic.IDE0008.severity = none
+dotnet_diagnostic.IDE0021.severity = none
+dotnet_diagnostic.IDE0022.severity = none
+dotnet_diagnostic.IDE0024.severity = none
+dotnet_diagnostic.IDE0027.severity = none
+dotnet_diagnostic.IDE0046.severity = none
+dotnet_diagnostic.IDE0060.severity = none
+dotnet_diagnostic.IDE0130.severity = none
+dotnet_diagnostic.IDE0055.severity = none
+
 # force abstraction over implementation
 dotnet_diagnostic.MA0016.severity = none
 csharp_using_directive_placement = outside_namespace:silent

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
     - name: 🔨 set up .net
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
 
     - name: 🧪 run tests
       run: |

benchmarks/BaroquenMelody.Benchmarks/BaroquenMelody.Benchmarks.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

src/BaroquenMelody.App/App.xaml.cs

@@ -15,10 +15,12 @@ public App(IThemeProvider themeProvider)
 
         _themeProvider = themeProvider;
 
-        _themeProvider.IsDarkMode = Preferences.Default.Get("IsDarkMode", true);
+        _themeProvider.IsDarkMode = Preferences.Default.Get("IsDarkMode", defaultValue: true);
 
-        MainPage = new MainPage();
-        MainPage.Title = "Baroquen Melody";
+        MainPage = new MainPage
+        {
+            Title = "Baroquen Melody"
+        };
     }
 
     protected override Window CreateWindow(IActivationState? activationState)

src/BaroquenMelody.App/MauiProgram.cs

@@ -9,7 +9,9 @@
 using BaroquenMelody.Library.Midi;
 using CommunityToolkit.Maui;
 using Microsoft.AspNetCore.Components.WebView.Maui;
+#pragma warning disable IDE0005 // Using directive is unnecessary.
 using Microsoft.Extensions.Logging;
+#pragma warning restore IDE0005 // Using directive is unnecessary.
 
 namespace BaroquenMelody.App;
 

src/BaroquenMelody.App/Platforms/Android/MainApplication.cs

@@ -5,12 +5,7 @@
 namespace BaroquenMelody.App;
 
 [Application]
-public class MainApplication : MauiApplication
+public class MainApplication(IntPtr handle, JniHandleOwnership ownership) : MauiApplication(handle, ownership)
 {
-    public MainApplication(IntPtr handle, JniHandleOwnership ownership)
-        : base(handle, ownership)
-    {
-    }
-
     protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 }

src/BaroquenMelody.App/Platforms/Android/WebViewSoftInputPatch.cs

@@ -44,14 +44,7 @@ private static void PossiblyResizeChildOfContent()
                 heightDifference = usableHeightSansKeyboard - usableHeightNow;
             }
 
-            if (heightDifference > usableHeightSansKeyboard / 4)
-            {
-                _frameLayoutParams!.Height = usableHeightSansKeyboard - heightDifference;
-            }
-            else
-            {
-                _frameLayoutParams!.Height = usableHeightNow;
-            }
+            _frameLayoutParams!.Height = heightDifference > usableHeightSansKeyboard / 4 ? usableHeightSansKeyboard - heightDifference : usableHeightNow;
         }
 
         _mChildOfContent!.RequestLayout();

src/BaroquenMelody.Library/Choices/ChordChoice.cs

@@ -18,15 +18,7 @@ public IList<NoteChoice> NoteChoices
         init { _noteChoices = [.. value.OrderBy(static noteChoice => noteChoice.Instrument)]; }
     }
 
-    public bool Equals(ChordChoice? other)
-    {
-        if (other is null)
-        {
-            return false;
-        }
-
-        return ReferenceEquals(this, other) || NoteChoices.SequenceEqual(other.NoteChoices);
-    }
+    public bool Equals(ChordChoice? other) => other is not null && (ReferenceEquals(this, other) || NoteChoices.SequenceEqual(other.NoteChoices));
 
     public override int GetHashCode()
     {

src/BaroquenMelody.Library/Choices/SoloChordChoiceRepository.cs

@@ -21,7 +21,7 @@ public SoloChordChoiceRepository(CompositionConfiguration compositionConfigurati
             );
         }
 
-        _noteChoices = noteChoiceGenerator.GenerateNoteChoices(compositionConfiguration.Instruments[0]).ToList();
+        _noteChoices = [.. noteChoiceGenerator.GenerateNoteChoices(compositionConfiguration.Instruments[0])];
     }
 
     public BigInteger Count => _noteChoices.Count;

src/BaroquenMelody.Library/Domain/BaroquenChord.cs

@@ -44,15 +44,7 @@ public void ResetOrnamentation(MusicalTimeSpan defaultTimeSpan)
     /// </summary>
     /// <param name="other">The other <see cref="BaroquenChord"/> to compare against.</param>
     /// <returns>Whether the <see cref="BaroquenChord"/> is equal to the other <see cref="BaroquenChord"/>.</returns>
-    public bool Equals(BaroquenChord? other)
-    {
-        if (other is null)
-        {
-            return false;
-        }
-
-        return ReferenceEquals(this, other) || Notes.SequenceEqual(other.Notes);
-    }
+    public bool Equals(BaroquenChord? other) => other is not null && (ReferenceEquals(this, other) || Notes.SequenceEqual(other.Notes));
 
     /// <summary>
     ///     Determines if the <see cref="BaroquenChord"/> is equal to another object.
@@ -75,20 +67,7 @@ public bool Equals(BaroquenChord? other)
     /// <param name="chord">The first <see cref="BaroquenChord"/> to compare.</param>
     /// <param name="otherChord">The second <see cref="BaroquenChord"/> to compare.</param>
     /// <returns>Whether the <see cref="BaroquenChord"/> is equal to the other <see cref="BaroquenChord"/>.</returns>
-    public static bool operator ==(BaroquenChord? chord, BaroquenChord? otherChord)
-    {
-        if (ReferenceEquals(chord, otherChord))
-        {
-            return true;
-        }
-
-        if (chord is null || otherChord is null)
-        {
-            return false;
-        }
-
-        return chord.Equals(otherChord);
-    }
+    public static bool operator ==(BaroquenChord? chord, BaroquenChord? otherChord) => ReferenceEquals(chord, otherChord) || (chord is not null && otherChord is not null && chord.Equals(otherChord));
 
     /// <summary>
     ///     Determines if the <see cref="BaroquenChord"/> is not equal to another <see cref="BaroquenChord"/>.

src/BaroquenMelody.Library/Domain/BaroquenNote.cs

@@ -125,20 +125,7 @@ public bool Equals(BaroquenNote? other)
     /// <param name="note">The first <see cref="BaroquenNote"/> to compare.</param>
     /// <param name="otherNote">The second <see cref="BaroquenNote"/> to compare.</param>
     /// <returns>Whether the <see cref="BaroquenNote"/> is equal to the other <see cref="BaroquenNote"/>.</returns>
-    public static bool operator ==(BaroquenNote? note, BaroquenNote? otherNote)
-    {
-        if (ReferenceEquals(note, otherNote))
-        {
-            return true;
-        }
-
-        if (note is null || otherNote is null)
-        {
-            return false;
-        }
-
-        return note.Equals(otherNote);
-    }
+    public static bool operator ==(BaroquenNote? note, BaroquenNote? otherNote) => ReferenceEquals(note, otherNote) || (note is not null && otherNote is not null && note.Equals(otherNote));
 
     /// <summary>
     ///     Determines if the <see cref="BaroquenNote"/> is not equal to another <see cref="BaroquenNote"/>.

src/BaroquenMelody.Library/Dynamics/Engine/Processors/InitialDynamicsProcessor.cs

@@ -11,16 +11,9 @@ public void Process(DynamicsApplicationItem item)
         var instrumentConfiguration = configuration.InstrumentConfigurationsByInstrument[item.Instrument];
         var note = item.CurrentBeat[item.Instrument];
 
-        double velocity;
-
-        if (instrumentConfiguration.HasSizeableVelocityRange)
-        {
-            velocity = instrumentConfiguration.MinVelocity + instrumentConfiguration.VelocityRange * velocityRangeTarget;
-        }
-        else
-        {
-            velocity = instrumentConfiguration.MaxVelocity;
-        }
+        var velocity = instrumentConfiguration.HasSizeableVelocityRange
+            ? instrumentConfiguration.MinVelocity + instrumentConfiguration.VelocityRange * velocityRangeTarget
+            : instrumentConfiguration.MaxVelocity;
 
         note.Velocity = new SevenBitNumber(Convert.ToByte(velocity));
 

src/BaroquenMelody.Library/Enums/Extensions/NoteMotionExtensions.cs

@@ -22,13 +22,9 @@ internal static class NoteMotionExtensions
     /// <param name="previousNote">The first note.</param>
     /// <param name="currentNote">The second note.</param>
     /// <returns>A <see cref="NoteMotion"/> representing the motion between the two notes.</returns>
-    public static NoteMotion FromNotes(Note previousNote, Note currentNote)
-    {
-        if (previousNote == currentNote)
-        {
-            return NoteMotion.Oblique;
-        }
-
-        return previousNote.NoteNumber > currentNote.NoteNumber ? NoteMotion.Descending : NoteMotion.Ascending;
-    }
+    public static NoteMotion FromNotes(Note previousNote, Note currentNote) => previousNote == currentNote
+        ? NoteMotion.Oblique
+        : previousNote.NoteNumber > currentNote.NoteNumber
+            ? NoteMotion.Descending
+            : NoteMotion.Ascending;
 }