Support .NET 9

melanchall · Nov 20, 2024 · d7b907f · d7b907f
1 parent e6b5243
commit d7b907f
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 11 deletions.
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;net8.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net48;net9.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;net8.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net48;net9.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <Configurations>Debug;Release;Coverage;DebugTest;ReleaseTest</Configurations>
     <SignAssembly>true</SignAssembly>

diff --git a/DryWetMidi/Composing/Actions/AddChannelEventAction.cs b/DryWetMidi/Composing/Actions/AddChannelEventAction.cs
@@ -1,7 +1,7 @@
 using Melanchall.DryWetMidi.Core;
 using Melanchall.DryWetMidi.Interaction;
 
-namespace Melanchall.DryWetMidi.Composing.Actions
+namespace Melanchall.DryWetMidi.Composing
 {
     internal abstract class AddChannelEventAction<TEvent> : PatternAction
         where TEvent : ChannelEvent

diff --git a/DryWetMidi/Composing/Actions/AddControlChangeEventAction.cs b/DryWetMidi/Composing/Actions/AddControlChangeEventAction.cs
@@ -1,5 +1,4 @@
 using Melanchall.DryWetMidi.Common;
-using Melanchall.DryWetMidi.Composing.Actions;
 using Melanchall.DryWetMidi.Core;
 
 namespace Melanchall.DryWetMidi.Composing

diff --git a/DryWetMidi/Composing/Actions/AddPitchBendEventAction.cs b/DryWetMidi/Composing/Actions/AddPitchBendEventAction.cs
@@ -1,5 +1,4 @@
-using Melanchall.DryWetMidi.Composing.Actions;
-using Melanchall.DryWetMidi.Core;
+using Melanchall.DryWetMidi.Core;
 
 namespace Melanchall.DryWetMidi.Composing
 {

diff --git a/Resources/CI/test-core.yaml b/Resources/CI/test-core.yaml
@@ -70,14 +70,14 @@ stages:
       inputs:
         command: 'test'
         projects: 'DryWetMidi.Tests/Melanchall.DryWetMidi.Tests.csproj'
-        arguments: '--blame --no-build --configuration $(TestBuildConfiguration) --filter (FullyQualifiedName~Melanchall.DryWetMidi.Tests.Core|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Common|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Composing|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Interaction|FullyQualifiedName~Melanchall.DryWetMidi.Tests.MusicTheory|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Standards|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Tools) --framework $(Tfm) --verbosity normal --diag diagnostic.log --logger "console;verbosity=normal"'
+        arguments: '--blame --no-build --configuration $(TestBuildConfiguration) --filter (FullyQualifiedName~Melanchall.DryWetMidi.Tests.Core|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Common|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Composing|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Interaction|FullyQualifiedName~Melanchall.DryWetMidi.Tests.MusicTheory|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Standards|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Tools|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Utilities) --framework $(Tfm) --verbosity normal --diag diagnostic.log --logger "console;verbosity=normal"'
 
     - task: DotNetCoreCLI@2
       displayName: Run unit tests (non-Windows)
       condition: eq(variables.VmImage, 'macos-latest')
       inputs:
         command: 'test'
         projects: 'DryWetMidi.Tests/Melanchall.DryWetMidi.Tests.csproj'
-        arguments: '--blame --no-build --configuration $(TestBuildConfiguration) --filter ((FullyQualifiedName~Melanchall.DryWetMidi.Tests.Core|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Common|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Composing|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Interaction|FullyQualifiedName~Melanchall.DryWetMidi.Tests.MusicTheory|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Standards|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Tools)&Name!=CheckValidFilesReadingByReferences) --framework $(Tfm) --verbosity normal --diag diagnostic.log --logger "console;verbosity=normal"'
+        arguments: '--blame --no-build --configuration $(TestBuildConfiguration) --filter ((FullyQualifiedName~Melanchall.DryWetMidi.Tests.Core|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Common|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Composing|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Interaction|FullyQualifiedName~Melanchall.DryWetMidi.Tests.MusicTheory|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Standards|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Tools|FullyQualifiedName~Melanchall.DryWetMidi.Tests.Utilities)&Name!=CheckValidFilesReadingByReferences) --framework $(Tfm) --verbosity normal --diag diagnostic.log --logger "console;verbosity=normal"'
 
     - template: Templates/step-collect-logs.yaml
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>net8.0</TargetFramework>
+    <TargetFramework>net9.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>net8.0</TargetFramework>
+    <TargetFramework>net9.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>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <PublishSingleFile>true</PublishSingleFile>
     <PublishTrimmed>true</PublishTrimmed>
     <RuntimeIdentifiers>win-x64;osx-x64</RuntimeIdentifiers>