Bump version

Port extension attribute instead of framework gating
Framework only matters for executable
2026-02-08 13:49:55 +00:00 · 2024-11-15 20:32:23 -05:00 · 2024-11-15 20:30:15 -05:00 · 2024-11-15 20:20:33 -05:00 · 2024-11-13 00:43:29 -05:00 · 2024-11-13 00:42:49 -05:00
12 changed files with 56 additions and 109 deletions
--- a/.github/workflows/build_nupkg.yml
+++ b/.github/workflows/build_nupkg.yml
@@ -16,10 +16,16 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v4
      with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
        
    - name: Restore dependencies
      run: dotnet restore
+
+    - name: Build library
+      run: dotnet build
+
+    - name: Run tests
+      run: dotnet test
      
    - name: Pack
      run: dotnet pack
--- a/.github/workflows/check_pr.yml
+++ b/.github/workflows/check_pr.yml
@@ -11,7 +11,10 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v4
      with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
      
    - name: Build
-      run: dotnet build
+      run: dotnet build
+
+    - name: Run tests
+      run: dotnet test
--- a/SabreTools.Matching.Test/SabreTools.Matching.Test.csproj
+++ b/SabreTools.Matching.Test/SabreTools.Matching.Test.csproj
@@ -1,29 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-    <IsPackable>false</IsPackable>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\SabreTools.Matching\SabreTools.Matching.csproj" />
-  </ItemGroup>
-  
+    <PropertyGroup>
+        <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+        <IsPackable>false</IsPackable>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <WarningsNotAsErrors>NU1903</WarningsNotAsErrors>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="6.0.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="xunit" Version="2.6.2" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\SabreTools.Matching\SabreTools.Matching.csproj" />
+    </ItemGroup>
+
 </Project>
  
--- a/SabreTools.Matching/Compare/NaturalComparer.cs
+++ b/SabreTools.Matching/Compare/NaturalComparer.cs
@@ -47,7 +47,7 @@ namespace SabreTools.Matching.Compare
            if (!_table.TryGetValue(x, out string[]? x1))
            {
                //x1 = Regex.Split(x.Replace(" ", string.Empty), "([0-9]+)");
-                x1 = Regex.Split(y.ToLowerInvariant(), "([0-9]+)");
+                x1 = Regex.Split(x.ToLowerInvariant(), "([0-9]+)");
                x1 = Array.FindAll(x1, s => !string.IsNullOrEmpty(s));
                _table.Add(x, x1);
            }
--- a/SabreTools.Matching/Compare/NaturalReversedComparer.cs
+++ b/SabreTools.Matching/Compare/NaturalReversedComparer.cs
@@ -47,7 +47,7 @@ namespace SabreTools.Matching.Compare
            if (!_table.TryGetValue(x, out string[]? x1))
            {
                //x1 = Regex.Split(x.Replace(" ", string.Empty), "([0-9]+)");
-                x1 = Regex.Split(y.ToLowerInvariant(), "([0-9]+)");
+                x1 = Regex.Split(x.ToLowerInvariant(), "([0-9]+)");
                x1 = Array.FindAll(x1, s => !string.IsNullOrEmpty(s));
                _table.Add(x, x1);
            }
--- a/SabreTools.Matching/Delegates.cs
+++ b/SabreTools.Matching/Delegates.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;

--- a/SabreTools.Matching/ExtensionAttribute.cs
+++ b/SabreTools.Matching/ExtensionAttribute.cs
@@ -0,0 +1,9 @@
+#if NET20
+
+namespace System.Runtime.CompilerServices
+{
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
+    internal sealed class ExtensionAttribute : Attribute {}
+}
+
+#endif
--- a/SabreTools.Matching/Extensions.cs
+++ b/SabreTools.Matching/Extensions.cs
@@ -9,11 +9,7 @@ namespace SabreTools.Matching
        /// <summary>
        /// Indicates whether the specified array is null or has a length of zero
        /// </summary>
-#if NET20
-        public static bool IsNullOrEmpty(Array? array)
-#else
        public static bool IsNullOrEmpty(this Array? array)
-#endif
        {
            return array == null || array.Length == 0;
        }
@@ -21,11 +17,7 @@ namespace SabreTools.Matching
        /// <summary>
        /// Find all positions of one array in another, if possible, if possible
        /// </summary>
-#if NET20
-        public static List<int> FindAllPositions(byte[] stack, byte?[]? needle, int start = 0, int end = -1)
-#else
        public static List<int> FindAllPositions(this byte[] stack, byte?[]? needle, int start = 0, int end = -1)
-#endif
        {
            // Get the outgoing list
            List<int> positions = [];
@@ -51,11 +43,7 @@ namespace SabreTools.Matching
        /// <summary>
        /// Find the first position of one array in another, if possible
        /// </summary>
-#if NET20
-        public static bool FirstPosition(byte[] stack, byte[]? needle, out int position, int start = 0, int end = -1)
-#else
        public static bool FirstPosition(this byte[] stack, byte[]? needle, out int position, int start = 0, int end = -1)
-#endif
        {
            // Convert the needle to a nullable byte array
            byte?[]? nullableNeedle = null;
@@ -68,11 +56,7 @@ namespace SabreTools.Matching
        /// <summary>
        /// Find the first position of one array in another, if possible
        /// </summary>
-#if NET20
-        public static bool FirstPosition(byte[] stack, byte?[]? needle, out int position, int start = 0, int end = -1)
-#else
        public static bool FirstPosition(this byte[] stack, byte?[]? needle, out int position, int start = 0, int end = -1)
-#endif
        {
            var matcher = new ContentMatch(needle, start, end);
            position = matcher.Match(stack, false);
@@ -82,11 +66,7 @@ namespace SabreTools.Matching
        /// <summary>
        /// Find the last position of one array in another, if possible
        /// </summary>
-#if NET20
-        public static bool LastPosition(byte[] stack, byte[]? needle, out int position, int start = 0, int end = -1)
-#else
        public static bool LastPosition(this byte[] stack, byte[]? needle, out int position, int start = 0, int end = -1)
-#endif
        {
            // Convert the needle to a nullable byte array
            byte?[]? nullableNeedle = null;
@@ -99,11 +79,7 @@ namespace SabreTools.Matching
        /// <summary>
        /// Find the last position of one array in another, if possible
        /// </summary>
-#if NET20
-        public static bool LastPosition(byte[] stack, byte?[]? needle, out int position, int start = 0, int end = -1)
-#else
        public static bool LastPosition(this byte[] stack, byte?[]? needle, out int position, int start = 0, int end = -1)
-#endif
        {
            var matcher = new ContentMatch(needle, start, end);
            position = matcher.Match(stack, true);
@@ -113,11 +89,7 @@ namespace SabreTools.Matching
        /// <summary>
        /// See if a byte array starts with another
        /// </summary>
-#if NET20
-        public static bool StartsWith(byte[] stack, byte[]? needle, bool exact = false)
-#else
        public static bool StartsWith(this byte[] stack, byte[]? needle, bool exact = false)
-#endif
        {
            // If we have any invalid inputs, we return false
            if (needle == null
@@ -134,11 +106,7 @@ namespace SabreTools.Matching
        /// <summary>
        /// See if a byte array starts with another
        /// </summary>
-#if NET20
-        public static bool StartsWith(byte[] stack, byte?[]? needle, bool exact = false)
-#else
        public static bool StartsWith(this byte[] stack, byte?[]? needle, bool exact = false)
-#endif
        {
            // If we have any invalid inputs, we return false
            if (needle == null
@@ -155,11 +123,7 @@ namespace SabreTools.Matching
        /// <summary>
        /// See if a byte array ends with another
        /// </summary>
-#if NET20
-        public static bool EndsWith(byte[] stack, byte[]? needle, bool exact = false)
-#else
        public static bool EndsWith(this byte[] stack, byte[]? needle, bool exact = false)
-#endif
        {
            // If we have any invalid inputs, we return false
            if (needle == null
@@ -176,11 +140,7 @@ namespace SabreTools.Matching
        /// <summary>
        /// See if a byte array ends with another
        /// </summary>
-#if NET20
-        public static bool EndsWith(byte[] stack, byte?[]? needle, bool exact = false)
-#else
        public static bool EndsWith(this byte[] stack, byte?[]? needle, bool exact = false)
-#endif
        {
            // If we have any invalid inputs, we return false
            if (needle == null
--- a/SabreTools.Matching/MatchUtil.cs
+++ b/SabreTools.Matching/MatchUtil.cs
@@ -67,16 +67,7 @@ namespace SabreTools.Matching
                    continue;

                // Format the list of all positions found
-#if NET20 || NET35
-                var positionStrs = new List<string>();
-                foreach (int pos in positions)
-                {
-                    positionStrs.Add(pos.ToString());
-                }
-                string positionsString = string.Join(", ", [.. positionStrs]);
-#else
-                string positionsString = string.Join(", ", positions);
-#endif
+                string positionsString = string.Join(", ", [.. positions.ConvertAll(p => p.ToString())]);

                // If we there is no version method, just return the match name
                if (matcher.GetArrayVersion == null)
@@ -162,16 +153,7 @@ namespace SabreTools.Matching
                    continue;

                // Format the list of all positions found
-#if NET20 || NET35
-                var positionStrs = new List<string>();
-                foreach (int pos in positions)
-                {
-                    positionStrs.Add(pos.ToString());
-                }
-                string positionsString = string.Join(", ", [.. positionStrs]);
-#else
-                string positionsString = string.Join(", ", positions);
-#endif
+                string positionsString = string.Join(", ", [.. positions.ConvertAll(p => p.ToString())]);

                // If we there is no version method, just return the match name
                if (matcher.GetStreamVersion == null)
--- a/SabreTools.Matching/SabreTools.Matching.csproj
+++ b/SabreTools.Matching/SabreTools.Matching.csproj
@@ -2,11 +2,11 @@

    <PropertyGroup>
        <!-- Assembly Properties -->
-        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
        <LangVersion>latest</LangVersion>
        <Nullable>enable</Nullable>
        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.3.4</Version>
+        <Version>1.4.1</Version>

        <!-- Package Properties -->
        <Authors>Matt Nadareski</Authors>
@@ -18,20 +18,7 @@
        <RepositoryType>git</RepositoryType>
        <PackageTags>byte array stream match matching</PackageTags>
        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    </PropertyGroup>
-
-    <!-- Support All Frameworks -->
-    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net4`))">
-        <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
-    </PropertyGroup>
-    <PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
-        <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
-    </PropertyGroup>
-    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`))">
-        <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
-    </PropertyGroup>
-    <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <WarningsNotAsErrors>NU1903</WarningsNotAsErrors>
    </PropertyGroup>

    <ItemGroup>
--- a/publish-nix.sh
+++ b/publish-nix.sh
@@ -1,7 +1,7 @@
 #! /bin/bash

 # This batch file assumes the following:
-# - .NET 8.0 (or newer) SDK is installed and in PATH
+# - .NET 9.0 (or newer) SDK is installed and in PATH
 #
 # If any of these are not satisfied, the operation may fail
 # in an unpredictable way and result in an incomplete output.
--- a/publish-win.ps1
+++ b/publish-win.ps1
@@ -1,5 +1,5 @@
 # This batch file assumes the following:
-# - .NET 8.0 (or newer) SDK is installed and in PATH
+# - .NET 9.0 (or newer) SDK is installed and in PATH
 #
 # If any of these are not satisfied, the operation may fail
 # in an unpredictable way and result in an incomplete output.
Author	SHA1	Message	Date
Matt Nadareski	e596c7c2c1	Bump version	2024-11-15 20:32:23 -05:00
Matt Nadareski	910e963d13	Port extension attribute instead of framework gating	2024-11-15 20:30:15 -05:00
Matt Nadareski	751519fadb	Framework only matters for executable	2024-11-15 20:20:33 -05:00
Matt Nadareski	f86f565136	Ensure tests pass	2024-11-13 00:43:29 -05:00
Matt Nadareski	1ad45c6d59	Ensure tests pass	2024-11-13 00:42:49 -05:00
Matt Nadareski	38796776ee	Add .NET 9 to target frameworks	2024-11-13 00:34:24 -05:00
Matt Nadareski	c60f587b69	Bump version	2024-11-13 00:31:36 -05:00
Matt Nadareski	8844ba0ae3	Fix ordering bug in comparers	2024-11-13 00:31:00 -05:00
Matt Nadareski	cdd41e8bec	Add .NET 9 to target frameworks	2024-11-13 00:26:42 -05:00