Support .NET 8

melanchall · Dec 18, 2023 · dfa4550 · dfa4550
1 parent 01a2300
commit dfa4550
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 36 deletions.
diff --git a/Docs/articles/dev/Support.md b/Docs/articles/dev/Support.md
@@ -16,7 +16,7 @@ Things to pay attention for are:
 3. Provide your code (as text, not as a screenshot!) and point me to the place there where the error occurred or where you need to do something.
 4. What is your operating system?
 5. What version of the library do you use?
-6. Use proper MIDI terminology. Official MIDI specification can be found on the [midi.org](https://midi.org/specifications/midi1-specifications/m1-v4-2-1-midi-1-0-detailed-specification-96-1-4).
+6. Use proper MIDI terminology. Official MIDI specification can be found on the [midi.org](https://www.midi.org/specifications/midi1-specifications/midi-1-0-core-specifications/midi-1-0-detailed-specification-2).
 7. Use formatting for your messages (especially for code blocks):  
     * on GitHub use [Markdown](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax);
     * on emails use formatting provided by your mail client.

diff --git a/DryWetMidi.Benchmarks/Melanchall.DryWetMidi.Benchmarks.csproj b/DryWetMidi.Benchmarks/Melanchall.DryWetMidi.Benchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net48;net7.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net48;net8.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <Configurations>Debug;Release;Coverage;DebugTest;ReleaseTest</Configurations>
     <SignAssembly>true</SignAssembly>

diff --git a/DryWetMidi.Tests/Melanchall.DryWetMidi.Tests.csproj b/DryWetMidi.Tests/Melanchall.DryWetMidi.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net48;net7.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net48;net8.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <Configurations>Debug;Release;Coverage;DebugTest;ReleaseTest</Configurations>
     <SignAssembly>true</SignAssembly>

diff --git a/DryWetMidi/Tools/Splitter/MidiFileSlicer.cs b/DryWetMidi/Tools/Splitter/MidiFileSlicer.cs
@@ -14,6 +14,8 @@ private sealed class TimedEventsHolder : IDisposable
         {
             #region Fields
 
+            private readonly IEnumerator<TimedEvent> _enumerator;
+
             private bool _disposed = false;
 
             #endregion
@@ -22,22 +24,36 @@ private sealed class TimedEventsHolder : IDisposable
 
             public TimedEventsHolder(IEnumerator<TimedEvent> timedEventsEnumerator)
             {
-                Enumerator = timedEventsEnumerator;
-                Enumerator.MoveNext();
+                _enumerator = timedEventsEnumerator;
+                CanBeEnumerated = _enumerator.MoveNext();
             }
 
             #endregion
 
             #region Properties
 
-            public IEnumerator<TimedEvent> Enumerator { get; }
+            public bool CanBeEnumerated { get; private set; }
 
             public List<TimedEvent> EventsToCopyToNextPart { get; } = new List<TimedEvent>();
 
             public List<TimedEvent> EventsToStartNextPart { get; } = new List<TimedEvent>();
 
             #endregion
 
+            #region Methods
+
+            public bool MoveToNextEvent()
+            {
+                return CanBeEnumerated = _enumerator.MoveNext();
+            }
+
+            public TimedEvent GetCurrentEvent()
+            {
+                return _enumerator.Current;
+            }
+
+            #endregion
+
             #region IDisposable
 
             private void Dispose(bool disposing)
@@ -46,7 +62,7 @@ private void Dispose(bool disposing)
                     return;
 
                 if (disposing)
-                    Enumerator.Dispose();
+                    _enumerator.Dispose();
 
                 _disposed = true;
             }
@@ -142,7 +158,7 @@ private MidiFileSlicer(TimeDivision timeDivision, IEnumerator<TimedEvent>[] time
 
         #region Properties
 
-        public bool AllEventsProcessed => _timedEventsHolders.All(c => !c.EventsToStartNextPart.Any() && c.Enumerator.Current == null);
+        public bool AllEventsProcessed => _timedEventsHolders.All(c => !c.EventsToStartNextPart.Any() && !c.CanBeEnumerated);
 
         #endregion
 
@@ -191,7 +207,6 @@ private IEnumerable<IEnumerable<TimedEvent>> GetNextTimedEvents(
             {
                 var timedEventsHolder = _timedEventsHolders[i];
 
-                var timedEventsEnumerator = timedEventsHolder.Enumerator;
                 var eventsToCopyToNextPart = timedEventsHolder.EventsToCopyToNextPart;
                 var eventsToStartNextPart = timedEventsHolder.EventsToStartNextPart;
 
@@ -202,29 +217,32 @@ private IEnumerable<IEnumerable<TimedEvent>> GetNextTimedEvents(
                     eventsToStartNextPart,
                     out newEventsStartIndex);
 
-                do
+                if (timedEventsHolder.CanBeEnumerated)
                 {
-                    var timedEvent = timedEventsEnumerator.Current;
-                    if (timedEvent == null)
-                        break;
+                    do
+                    {
+                        var timedEvent = timedEventsHolder.GetCurrentEvent();
+                        if (timedEvent == null)
+                            break;
 
-                    var time = timedEvent.Time;
-                    if (time > endTime)
-                        break;
+                        var time = timedEvent.Time;
+                        if (time > endTime)
+                            break;
 
-                    if (time == endTime)
-                    {
-                        if (!TryToMoveEdgeNoteOffsToPreviousPart(timedEvent, takenTimedEvents))
-                            eventsToStartNextPart.Add(timedEvent);
+                        if (time == endTime)
+                        {
+                            if (!TryToMoveEdgeNoteOffsToPreviousPart(timedEvent, takenTimedEvents))
+                                eventsToStartNextPart.Add(timedEvent);
 
-                        continue;
-                    }
+                            continue;
+                        }
 
-                    UpdateEventsToCopyToNextPart(eventsToCopyToNextPart, timedEvent);
+                        UpdateEventsToCopyToNextPart(eventsToCopyToNextPart, timedEvent);
 
-                    takenTimedEvents.Add(timedEvent);
+                        takenTimedEvents.Add(timedEvent);
+                    }
+                    while (timedEventsHolder.MoveToNextEvent());
                 }
-                while (timedEventsEnumerator.MoveNext());
 
                 isPartEmpty &= newEventsStartIndex >= takenTimedEvents.Count;
 

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 DryWetMIDI is the .NET library to work with MIDI data and MIDI devices. It allows:
 
-* Read, write and create [Standard MIDI Files (SMF)](https://www.midi.org/specifications/category/smf-specifications). It is also possible to read [RMID](https://www.loc.gov/preservation/digital/formats/fdd/fdd000120.shtml) files where SMF wrapped to RIFF chunk. You can easily catch specific error when reading or writing MIDI file since all possible errors in a MIDI file are presented as separate exception classes.
+* Read, write and create [Standard MIDI Files (SMF)](https://www.midi.org/specifications/file-format-specifications/standard-midi-files). It is also possible to read [RMID](https://www.loc.gov/preservation/digital/formats/fdd/fdd000120.shtml) files where SMF wrapped to RIFF chunk. You can easily catch specific error when reading or writing MIDI file since all possible errors in a MIDI file are presented as separate exception classes.
 * [Send](https://melanchall.github.io/drywetmidi/articles/devices/Output-device.html) MIDI events to/[receive](https://melanchall.github.io/drywetmidi/articles/devices/Input-device.html) them from MIDI devices, [play](https://melanchall.github.io/drywetmidi/articles/playback/Overview.html) MIDI data and [record](https://melanchall.github.io/drywetmidi/articles/recording/Overview.html) it. This APIs support Windows and macOS.
 * Finely adjust process of reading and writing. It allows, for example, to read corrupted files and repair them, or build MIDI file validators.
 * Implement [custom meta events](https://melanchall.github.io/drywetmidi/articles/custom-data-structures/Custom-meta-events.html) and [custom chunks](https://melanchall.github.io/drywetmidi/articles/custom-data-structures/Custom-chunks.html) that can be written to and read from MIDI files.

diff --git a/Resources/CI/Templates/job-build-utility.yaml b/Resources/CI/Templates/job-build-utility.yaml
@@ -42,7 +42,7 @@ jobs:
     - task: ArchiveFiles@2
       displayName: Archive utility
       inputs:
-        rootFolderOrFile: 'Utilities\${{ parameters.projectName }}\bin\$(BuildConfiguration)\net7.0\${{ rid }}\publish'
+        rootFolderOrFile: 'Utilities\${{ parameters.projectName }}\bin\$(BuildConfiguration)\$(Build.Framework.Net.Tfm)\${{ rid }}\publish'
         includeRootFolder: false
         archiveType: 'zip'
         archiveFile: '$(Build.ArtifactStagingDirectory)\Utility\Melanchall.${{ parameters.projectName }}.$(LibraryVersion)-${{ rid }}.zip'

diff --git a/Resources/CI/test-net-selfcontained-package-integration.yaml b/Resources/CI/test-net-selfcontained-package-integration.yaml
@@ -81,6 +81,14 @@ stages:
       parameters:
         enabled: contains(variables.vmImage, 'macos')
 
+    - task: PowerShell@2
+      displayName: Restore NuGet packages
+      inputs:
+        targetType: 'inline'
+        script: |
+          $path = Resolve-Path 'Resources\PackageIntegrationTestUtilities\DwmNetSelfContainedConsoleApp\DwmNetSelfContainedConsoleApp\DwmNetSelfContainedConsoleApp.csproj'
+          dotnet restore "$path" -s "https://api.nuget.org/v3/index.json"
+    
     - task: PowerShell@2
       displayName: Add package to the project
       inputs:

diff --git a/...PackageIntegrationTestUtilities/DwmNetConsoleApp/DwmNetConsoleApp/DwmNetConsoleApp.csproj b/...PackageIntegrationTestUtilities/DwmNetConsoleApp/DwmNetConsoleApp/DwmNetConsoleApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...elfContainedConsoleApp/DwmNetSelfContainedConsoleApp/DwmNetSelfContainedConsoleApp.csproj b/...elfContainedConsoleApp/DwmNetSelfContainedConsoleApp/DwmNetSelfContainedConsoleApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PublishSingleFile>true</PublishSingleFile>
     <SelfContained>true</SelfContained>
     <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>

diff --git a/...ertReSharperReportToHtml/ConvertReSharperReportToHtml/ConvertReSharperReportToHtml.csproj b/...ertReSharperReportToHtml/ConvertReSharperReportToHtml/ConvertReSharperReportToHtml.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/...ces/Utilities/ExportGitHubStatistics/ExportGitHubStatistics/ExportGitHubStatistics.csproj b/...ces/Utilities/ExportGitHubStatistics/ExportGitHubStatistics/ExportGitHubStatistics.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Resources/Utilities/ExportNuGetStatistics/ExportNuGetStatistics/ExportNuGetStatistics.csproj b/Resources/Utilities/ExportNuGetStatistics/ExportNuGetStatistics/ExportNuGetStatistics.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...tackExchangeStatistics/ExportStackExchangeStatistics/ExportStackExchangeStatistics.csproj b/...tackExchangeStatistics/ExportStackExchangeStatistics/ExportStackExchangeStatistics.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Utilities/Common/Melanchall.Common.csproj b/Utilities/Common/Melanchall.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/Utilities/ReceiveMidiData/Melanchall.ReceiveMidiData.csproj b/Utilities/ReceiveMidiData/Melanchall.ReceiveMidiData.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PublishSingleFile>true</PublishSingleFile>
     <PublishTrimmed>true</PublishTrimmed>
     <RuntimeIdentifiers>win-x64;osx-x64</RuntimeIdentifiers>

diff --git a/Utilities/SendMidiData/Melanchall.SendMidiData.csproj b/Utilities/SendMidiData/Melanchall.SendMidiData.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PublishSingleFile>true</PublishSingleFile>
     <PublishTrimmed>true</PublishTrimmed>
     <RuntimeIdentifiers>win-x64;osx-x64</RuntimeIdentifiers>