Bump version

Add .NET 9 to target frameworks
Add proper multi-framework support
2026-02-13 13:46:08 +00:00 · 2024-11-13 00:50:36 -05:00 · 2024-11-13 00:50:16 -05:00 · 2024-11-05 19:40:49 -05:00 · 2024-11-05 19:38:24 -05:00
9 changed files with 88 additions and 105 deletions
--- a/.github/workflows/build_nupkg.yml
+++ b/.github/workflows/build_nupkg.yml
@@ -16,7 +16,7 @@ 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
--- a/.github/workflows/check_pr.yml
+++ b/.github/workflows/check_pr.yml
@@ -11,7 +11,7 @@ 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
--- a/SabreTools.ASN1/ObjectIdentifier.ModifiedOIDIRI.cs
+++ b/SabreTools.ASN1/ObjectIdentifier.ModifiedOIDIRI.cs
@@ -1,8 +1,4 @@
-#if NET20 || NET35
-using System.Collections.Generic;
-#else
-using System.Linq;
-#endif
+using System;
 using System.Text;

 #pragma warning disable CS0162 // Unreachable code detected
@@ -52,17 +48,14 @@ namespace SabreTools.ASN1

            // Add trailing items as just values
            nameBuilder.Append("/");
-#if NET20 || NET35
-            var stringValues = new List<string>();
-            for (int i = index; i < values.Length; i++)
-            {
-                stringValues.Add(values[i].ToString());
-            }

-            nameBuilder.Append(string.Join("/", [.. stringValues]));
-#else
-            nameBuilder.Append(string.Join("/", values.Skip(index).Select(v => v.ToString()).ToArray()));
-#endif
+            // Get the remaining values in a new array
+            var remainingValues = new ulong[values.Length - index];
+            Array.Copy(values, index, remainingValues, 0, remainingValues.Length);
+
+            // Convert the values and append to the builder
+            var stringValues = Array.ConvertAll(remainingValues, v => v.ToString());
+            nameBuilder.Append(string.Join("/", stringValues));

            // Create and return the string
            return nameBuilder.ToString();
--- a/SabreTools.ASN1/ObjectIdentifier.OIDIRI.cs
+++ b/SabreTools.ASN1/ObjectIdentifier.OIDIRI.cs
@@ -1,8 +1,4 @@
-#if NET20 || NET35
-using System.Collections.Generic;
-#else
-using System.Linq;
-#endif
+using System;
 using System.Text;

 namespace SabreTools.ASN1
@@ -45,17 +41,14 @@ namespace SabreTools.ASN1

            // Add trailing items as just values
            nameBuilder.Append("/");
-#if NET20 || NET35
-            var stringValues = new List<string>();
-            for (int i = index; i < values.Length; i++)
-            {
-                stringValues.Add(values[i].ToString());
-            }

-            nameBuilder.Append(string.Join("/", [.. stringValues]));
-#else
-            nameBuilder.Append(string.Join("/", values.Skip(index).Select(v => v.ToString()).ToArray()));
-#endif
+            // Get the remaining values in a new array
+            var remainingValues = new ulong[values.Length - index];
+            Array.Copy(values, index, remainingValues, 0, remainingValues.Length);
+
+            // Convert the values and append to the builder
+            var stringValues = Array.ConvertAll(remainingValues, v => v.ToString());
+            nameBuilder.Append(string.Join("/", stringValues));

            // Create and return the string
            return nameBuilder.ToString();
--- a/SabreTools.ASN1/ObjectIdentifier.dot.cs
+++ b/SabreTools.ASN1/ObjectIdentifier.dot.cs
@@ -1,8 +1,4 @@
-#if NET20 || NET35
-using System.Collections.Generic;
-#else
-using System.Linq;
-#endif
+using System;

 namespace SabreTools.ASN1
 {
@@ -22,17 +18,8 @@ namespace SabreTools.ASN1
            if (values == null || values.Length == 0)
                return null;

-#if NET20 || NET35
-            var stringValues = new List<string>();
-            foreach (ulong value in values)
-            {
-                stringValues.Add(value.ToString());
-            }
-
+            var stringValues = Array.ConvertAll(values, v => v.ToString());
            return string.Join(".", [.. stringValues]);
-#else
-            return string.Join(".", values.Select(v => v.ToString()).ToArray());
-#endif
        }
    }
 }
--- a/SabreTools.ASN1/SabreTools.ASN1.csproj
+++ b/SabreTools.ASN1/SabreTools.ASN1.csproj
@@ -1,37 +1,50 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <!-- Assembly Properties -->
-    <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>1.3.3</Version>
+    <PropertyGroup>
+        <!-- Assembly Properties -->
+        <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.4.0</Version>

-    <!-- Package Properties -->
-    <Authors>Matt Nadareski</Authors>
-    <Description>Serialization and deserialization helpers for various types</Description>
-    <Copyright>Copyright (c) Matt Nadareski 2022-2024</Copyright>
-    <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <RepositoryUrl>https://github.com/SabreTools/SabreTools.ASN1</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageTags>asn asn1 dot oid</PackageTags>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-  </PropertyGroup>
+        <!-- Package Properties -->
+        <Authors>Matt Nadareski</Authors>
+        <Description>Serialization and deserialization helpers for various types</Description>
+        <Copyright>Copyright (c) Matt Nadareski 2022-2024</Copyright>
+        <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <RepositoryUrl>https://github.com/SabreTools/SabreTools.ASN1</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>asn asn1 dot oid</PackageTags>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>

-  <ItemGroup>
-    <None Include="../README.md" Pack="true" PackagePath=""/>
-  </ItemGroup>
+    <!-- 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`)) OR $(TargetFramework.StartsWith(`net9`))">
+        <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;net9.0</TargetFrameworks>
+    </PropertyGroup>

-  <!-- Support for old .NET versions -->
-  <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))">
-    <PackageReference Include="NetLegacySupport.Numerics" Version="1.0.1" />
-  </ItemGroup>
+    <ItemGroup>
+        <None Include="../README.md" Pack="true" PackagePath="" />
+    </ItemGroup>

-  <ItemGroup>
-    <PackageReference Include="SabreTools.IO" Version="1.4.12" />
-  </ItemGroup>
+    <!-- Support for old .NET versions -->
+    <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))">
+        <PackageReference Include="NetLegacySupport.Numerics" Version="1.0.1" />
+    </ItemGroup>

-</Project>
+    <ItemGroup>
+        <PackageReference Include="SabreTools.IO" Version="1.5.0" />
+    </ItemGroup>
+
+</Project>
--- a/SabreTools.ASN1/TypeLengthValue.cs
+++ b/SabreTools.ASN1/TypeLengthValue.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-#if NET40_OR_GREATER || NETCOREAPP
-using System.Linq;
-#endif
 using System.Numerics;
 using System.Text;
 using SabreTools.IO.Extensions;
@@ -37,36 +34,36 @@ namespace SabreTools.ASN1
        public TypeLengthValue(byte[] data, ref int index)
        {
            // Get the type and modifiers
-            this.Type = (ASN1Type)data[index++];
+            Type = (ASN1Type)data[index++];

            // If we have an end indicator, we just return
-            if (this.Type == ASN1Type.V_ASN1_EOC)
+            if (Type == ASN1Type.V_ASN1_EOC)
                return;

            // Get the length of the value
-            this.Length = ReadLength(data, ref index);
+            Length = ReadLength(data, ref index);

            // Read the value
 #if NET20 || NET35
-            if ((this.Type & ASN1Type.V_ASN1_CONSTRUCTED) != 0)
+            if ((Type & ASN1Type.V_ASN1_CONSTRUCTED) != 0)
 #else
-            if (this.Type.HasFlag(ASN1Type.V_ASN1_CONSTRUCTED))
+            if (Type.HasFlag(ASN1Type.V_ASN1_CONSTRUCTED))
 #endif
            {
                var valueList = new List<TypeLengthValue>();

                int currentIndex = index;
-                while (index < currentIndex + (int)this.Length)
+                while (index < currentIndex + (int)Length)
                {
                    valueList.Add(new TypeLengthValue(data, ref index));
                }

-                this.Value = valueList.ToArray();
+                Value = valueList.ToArray();
            }
            else
            {
                // TODO: Get more granular based on type
-                this.Value = data.ReadBytes(ref index, (int)this.Length);
+                Value = data.ReadBytes(ref index, (int)Length);
            }
        }

@@ -81,30 +78,30 @@ namespace SabreTools.ASN1
            string padding = new(' ', paddingLevel);

            // If we have an invalid item
-            if (this.Type == 0)
+            if (Type == 0)
                return $"{padding}UNKNOWN TYPE";

            // Create the string builder
            var formatBuilder = new StringBuilder();

            // Append the type
-            formatBuilder.Append($"{padding}Type: {this.Type}");
-            if (this.Type == ASN1Type.V_ASN1_EOC)
+            formatBuilder.Append($"{padding}Type: {Type}");
+            if (Type == ASN1Type.V_ASN1_EOC)
                return formatBuilder.ToString();

            // Append the length
-            formatBuilder.Append($", Length: {this.Length}");
-            if (this.Length == 0)
+            formatBuilder.Append($", Length: {Length}");
+            if (Length == 0)
                return formatBuilder.ToString();

            // If we have a constructed type
 #if NET20 || NET35
-            if ((this.Type & ASN1Type.V_ASN1_CONSTRUCTED) != 0)
+            if ((Type & ASN1Type.V_ASN1_CONSTRUCTED) != 0)
 #else
-            if (this.Type.HasFlag(ASN1Type.V_ASN1_CONSTRUCTED))
+            if (Type.HasFlag(ASN1Type.V_ASN1_CONSTRUCTED))
 #endif
            {
-                if (this.Value is not TypeLengthValue[] valueAsObjectArray)
+                if (Value is not TypeLengthValue[] valueAsObjectArray)
                {
                    formatBuilder.Append(", Value: [INVALID DATA TYPE]");
                    return formatBuilder.ToString();
@@ -122,18 +119,18 @@ namespace SabreTools.ASN1
            }

            // Get the value as a byte array
-            if (this.Value is not byte[] valueAsByteArray)
+            if (Value is not byte[] valueAsByteArray)
            {
                formatBuilder.Append(", Value: [INVALID DATA TYPE]");
                return formatBuilder.ToString();
            }

            // If we have a primitive type
-            switch (this.Type)
+            switch (Type)
            {
                /// <see href="https://learn.microsoft.com/en-us/windows/win32/seccertenroll/about-boolean"/>
                case ASN1Type.V_ASN1_BOOLEAN:
-                    if (this.Length > 1 || valueAsByteArray.Length > 1)
+                    if (Length > 1 || valueAsByteArray.Length > 1)
                        formatBuilder.Append($" [Expected length of 1]");

                    bool booleanValue = valueAsByteArray[0] != 0x00;
@@ -163,7 +160,7 @@ namespace SabreTools.ASN1
                /// <see cref="http://snmpsharpnet.com/index.php/2009/03/02/ber-encoding-and-decoding-oid-values/"/>
                case ASN1Type.V_ASN1_OBJECT:
                    // Derive array of values
-                    ulong[] objectNodes = ObjectIdentifier.ParseDERIntoArray(valueAsByteArray, this.Length);
+                    ulong[] objectNodes = ObjectIdentifier.ParseDERIntoArray(valueAsByteArray, Length);

                    // Append the dot and modified OID-IRI notations
                    string? dotNotationString = ObjectIdentifier.ParseOIDToDotNotation(objectNodes);
@@ -205,7 +202,7 @@ namespace SabreTools.ASN1
                    break;

                default:
-                    formatBuilder.Append($", Value (Unknown Format): {BitConverter.ToString(this.Value as byte[] ?? []).Replace('-', ' ')}");
+                    formatBuilder.Append($", Value (Unknown Format): {BitConverter.ToString(Value as byte[] ?? []).Replace('-', ' ')}");
                    break;
            }

--- a/publish-nix.sh
+++ b/publish-nix.sh
@@ -1,14 +1,14 @@
 #! /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.

 # Optional parameters
 NO_BUILD=false
-while getopts "uba" OPTION
+while getopts "b" OPTION
 do
    case $OPTION in 
    b)
--- 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	070274e33f	Bump version	2024-11-13 00:50:36 -05:00
Matt Nadareski	dd64d6f843	Add .NET 9 to target frameworks	2024-11-13 00:50:16 -05:00
Matt Nadareski	69992f64be	Add proper multi-framework support	2024-11-05 19:40:49 -05:00
Matt Nadareski	e63921fbc2	Linq just isn't needed	2024-11-05 19:38:24 -05:00