reaqtive · HowardvanRooijen · Oct 19, 2023 · Oct 19, 2023 · Oct 19, 2023 · Oct 19, 2023
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -56,7 +56,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
   </ItemGroup>
 
@@ -71,10 +71,10 @@
           properly to the test project output folder, which then causes the test runner to treat the project
           as a "self-contained app".
     -->
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.4" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.4" />
-    <PackageReference Include="coverlet.collector" Version="3.0.3" PrivateAssets="all" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
     <Compile Include="$(MSBuildThisFileDirectory)\Common\TestUtilities\AssertEx.cs" Link="AssertEx.cs" />
   </ItemGroup>
 

diff --git a/Nuqleon/Core/BCL/Nuqleon.Collections.Specialized/GettingStarted.ipynb b/Nuqleon/Core/BCL/Nuqleon.Collections.Specialized/GettingStarted.ipynb
@@ -35,7 +35,7 @@
       },
       "outputs": [],
       "source": [
-        "#r \"bin/Debug/net6.0/Nuqleon.Collections.Specialized.dll\""
+        "#r \"bin/Debug/net8.0/Nuqleon.Collections.Specialized.dll\""
       ]
     },
     {

diff --git a/Nuqleon/Core/BCL/Nuqleon.Collections.Specialized/Nuqleon.Collections.Specialized.csproj b/Nuqleon/Core/BCL/Nuqleon.Collections.Specialized/Nuqleon.Collections.Specialized.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net8.0</TargetFrameworks>
     <Description>Specialized data structures implemented for performance. Currently includes an optimized BitArray implementation, and a dictionary implementation optimized for enum keys.</Description>
   </PropertyGroup>
 

diff --git a/Nuqleon/Core/BCL/Nuqleon.IO.StreamSegment/GettingStarted.ipynb b/Nuqleon/Core/BCL/Nuqleon.IO.StreamSegment/GettingStarted.ipynb
@@ -35,7 +35,7 @@
       },
       "outputs": [],
       "source": [
-        "#r \"bin/Debug/net6.0/Nuqleon.IO.StreamSegment.dll\""
+        "#r \"bin/Debug/net8.0/Nuqleon.IO.StreamSegment.dll\""
       ]
     },
     {

diff --git a/Nuqleon/Core/BCL/Nuqleon.IO.StreamSegment/Nuqleon.IO.StreamSegment.csproj b/Nuqleon/Core/BCL/Nuqleon.IO.StreamSegment/Nuqleon.IO.StreamSegment.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net8.0</TargetFrameworks>
     <Description>Provides functionality to create a segment over a System.IO.Stream.</Description>
   </PropertyGroup>
 

diff --git a/Nuqleon/Core/BCL/Nuqleon.Memory/GettingStarted.ipynb b/Nuqleon/Core/BCL/Nuqleon.Memory/GettingStarted.ipynb
@@ -35,7 +35,7 @@
       },
       "outputs": [],
       "source": [
-        "#r \"bin/Debug/net6.0/Nuqleon.Memory.dll\""
+        "#r \"bin/Debug/net8.0/Nuqleon.Memory.dll\""
       ]
     },
     {

diff --git a/Nuqleon/Core/BCL/Nuqleon.Memory/Nuqleon.Memory.csproj b/Nuqleon/Core/BCL/Nuqleon.Memory/Nuqleon.Memory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net8.0</TargetFrameworks>
     <Description>A collection of utilities for optimizing memory usage.</Description>
   </PropertyGroup>
 

diff --git a/Nuqleon/Core/BCL/Nuqleon.Memory/System/Memory/ObjectPoolBase.cs b/Nuqleon/Core/BCL/Nuqleon.Memory/System/Memory/ObjectPoolBase.cs
@@ -769,7 +769,7 @@ private void WriteHeader(StringBuilder sb, string header, char separator)
         private void Write(StringBuilder sb, string str)
         {
             var parts =
-#if NET6_0 || NETSTANDARD2_1
+#if NET8_0 || NETSTANDARD2_1
                 str.Replace("\r\n", "\n", StringComparison.Ordinal)
 #else
                 str.Replace("\r\n", "\n")

diff --git a/Nuqleon/Core/BCL/Nuqleon.Reflection.Virtualization/GettingStarted.ipynb b/Nuqleon/Core/BCL/Nuqleon.Reflection.Virtualization/GettingStarted.ipynb
@@ -35,7 +35,7 @@
       },
       "outputs": [],
       "source": [
-        "#r \"bin/Debug/net6.0/Nuqleon.Reflection.Virtualization.dll\""
+        "#r \"bin/Debug/net8.0/Nuqleon.Reflection.Virtualization.dll\""
       ]
     },
     {

diff --git a/Nuqleon/Core/BCL/Nuqleon.Reflection.Virtualization/Nuqleon.Reflection.Virtualization.csproj b/Nuqleon/Core/BCL/Nuqleon.Reflection.Virtualization/Nuqleon.Reflection.Virtualization.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net8.0</TargetFrameworks>
     <Description>Provides a virtualization layer for reflection.</Description>
   </PropertyGroup>
 

diff --git a/...n.Reflection.Virtualization/System/Reflection/Virtualization/DefaultReflectionProvider.cs b/...n.Reflection.Virtualization/System/Reflection/Virtualization/DefaultReflectionProvider.cs
@@ -217,7 +217,7 @@ protected DefaultReflectionProvider() { }
         /// <returns>A <see cref="MethodBase" /> object representing the method or constructor specified by <paramref name="handle" />, in the generic type specified by <paramref name="declaringType" />.</returns>
         public override MethodBase GetMethodFromHandle(RuntimeMethodHandle handle, RuntimeTypeHandle declaringType) => MethodBase.GetMethodFromHandle(handle, declaringType);
 
-#if !NET6_0
+#if !NET8_0
         /// <summary>
         /// Gets the location of the assembly as specified originally, for example, in an <see cref="AssemblyName" /> object.
         /// </summary>
@@ -240,7 +240,7 @@ protected DefaultReflectionProvider() { }
         /// <returns>An object that represents the entry point of this assembly. If no entry point is found (for example, the assembly is a DLL), null is returned.</returns>
         public override MethodInfo GetEntryPoint(Assembly assembly) => assembly.EntryPoint;
 
-#if !NET6_0
+#if !NET8_0
         /// <summary>
         /// Gets the URI, including escape characters, that represents the codebase.
         /// </summary>
@@ -265,7 +265,7 @@ protected DefaultReflectionProvider() { }
         /// <returns>The display name of the assembly.</returns>
         public override string GetFullName(Assembly assembly) => assembly.FullName;
 
-#if !NET6_0
+#if !NET8_0
         /// <summary>
         /// Gets a value indicating whether the assembly was loaded from the global assembly cache.
         /// </summary>
@@ -1637,7 +1637,7 @@ protected DefaultReflectionProvider() { }
         /// <returns>An array of <see cref="MemberInfo" /> objects representing all members defined for the specified type that match the specified binding constraints.-or- An empty array of type <see cref="MemberInfo" />, if no members are defined for the specified type, or if none of the defined members match the binding constraints.</returns>
         public override IReadOnlyList<MemberInfo> GetMembers(Type type, BindingFlags bindingAttr) => type.GetMembers(bindingAttr);
 
-#if NET6_0 || NETSTANDARD2_1
+#if NET8_0 || NETSTANDARD2_1
         /// <summary>
         /// Searches for the specified method whose parameters match the specified generic parameter count, argument types and modifiers, using the specified binding constraints and the specified calling convention.
         /// </summary>

diff --git a/...lection.Virtualization/System/Reflection/Virtualization/IAssemblyIntrospectionProvider.cs b/...lection.Virtualization/System/Reflection/Virtualization/IAssemblyIntrospectionProvider.cs
@@ -26,7 +26,7 @@ namespace System.Reflection
     [GeneratedCode("", "1.0.0.0")] // NB: A mirror image of System.Reflection APIs, so considering this to be "generated".
     public interface IAssemblyIntrospectionProvider
     {
-#if !NET6_0
+#if !NET8_0
         /// <summary>
         /// Gets the location of the assembly as specified originally, for example, in an <see cref="AssemblyName" /> object.
         /// </summary>
@@ -49,7 +49,7 @@ public interface IAssemblyIntrospectionProvider
         /// <returns>An object that represents the entry point of this assembly. If no entry point is found (for example, the assembly is a DLL), null is returned.</returns>
         MethodInfo GetEntryPoint(Assembly assembly);
 
-#if !NET6_0
+#if !NET8_0
         /// <summary>
         /// Gets the URI, including escape characters, that represents the codebase.
         /// </summary>
@@ -74,7 +74,7 @@ public interface IAssemblyIntrospectionProvider
         /// <returns>The display name of the assembly.</returns>
         string GetFullName(Assembly assembly);
 
-#if !NET6_0
+#if !NET8_0
         /// <summary>
         /// Gets a value indicating whether the assembly was loaded from the global assembly cache.
         /// </summary>

diff --git a/....Reflection.Virtualization/System/Reflection/Virtualization/ITypeIntrospectionProvider.cs b/....Reflection.Virtualization/System/Reflection/Virtualization/ITypeIntrospectionProvider.cs
@@ -426,7 +426,7 @@ public interface ITypeIntrospectionProvider : IMemberInfoIntrospectionProvider,
         /// <returns>An array of <see cref="MemberInfo" /> objects representing all members defined for the specified type that match the specified binding constraints.-or- An empty array of type <see cref="MemberInfo" />, if no members are defined for the specified type, or if none of the defined members match the binding constraints.</returns>
         IReadOnlyList<MemberInfo> GetMembers(Type type, BindingFlags bindingAttr);
 
-#if NET6_0 || NETSTANDARD2_1
+#if NET8_0 || NETSTANDARD2_1
         /// <summary>
         /// Searches for the specified method whose parameters match the specified generic parameter count, argument types and modifiers, using the specified binding constraints and the specified calling convention.
         /// </summary>

diff --git a/.../Nuqleon.Reflection.Virtualization/System/Reflection/Virtualization/ReflectionProvider.cs b/.../Nuqleon.Reflection.Virtualization/System/Reflection/Virtualization/ReflectionProvider.cs
@@ -192,7 +192,7 @@ public abstract class ReflectionProvider : IReflectionProvider
         /// <returns>A <see cref="MethodBase" /> object representing the method or constructor specified by <paramref name="handle" />, in the generic type specified by <paramref name="declaringType" />.</returns>
         public abstract MethodBase GetMethodFromHandle(RuntimeMethodHandle handle, RuntimeTypeHandle declaringType);
 
-#if !NET6_0
+#if !NET8_0
         /// <summary>
         /// Gets the location of the assembly as specified originally, for example, in an <see cref="AssemblyName" /> object.
         /// </summary>
@@ -215,7 +215,7 @@ public abstract class ReflectionProvider : IReflectionProvider
         /// <returns>An object that represents the entry point of this assembly. If no entry point is found (for example, the assembly is a DLL), null is returned.</returns>
         public abstract MethodInfo GetEntryPoint(Assembly assembly);
 
-#if !NET6_0
+#if !NET8_0
         /// <summary>
         /// Gets the URI, including escape characters, that represents the codebase.
         /// </summary>
@@ -240,7 +240,7 @@ public abstract class ReflectionProvider : IReflectionProvider
         /// <returns>The display name of the assembly.</returns>
         public abstract string GetFullName(Assembly assembly);
 
-#if !NET6_0
+#if !NET8_0
         /// <summary>
         /// Gets a value indicating whether the assembly was loaded from the global assembly cache.
         /// </summary>
@@ -611,7 +611,7 @@ public abstract class ReflectionProvider : IReflectionProvider
         /// <returns>An array of type <see cref="FieldInfo" /> representing the global fields defined on the module that match the specified binding flags; if no global fields match the binding flags, an empty array is returned.</returns>
         public abstract IReadOnlyList<FieldInfo> GetFields(Module module, BindingFlags bindingFlags);
 
-#if NET6_0 || NETSTANDARD2_1
+#if NET8_0 || NETSTANDARD2_1
         /// <summary>
         /// Searches for the specified method whose parameters match the specified generic parameter count, argument types and modifiers, using the specified binding constraints and the specified calling convention.
         /// </summary>

diff --git a/...on.Virtualization/System/Reflection/Virtualization/TypeIntrospectionProviderExtensions.cs b/...on.Virtualization/System/Reflection/Virtualization/TypeIntrospectionProviderExtensions.cs
@@ -297,7 +297,7 @@ public static class TypeIntrospectionProviderExtensions
         /// <returns>An object representing the method that matches the specified requirements, if found; otherwise, null.</returns>
         public static MethodInfo GetMethod(this ITypeIntrospectionProvider provider, Type type, string name) => NotNull(NotNull(provider)).GetMethod(type, name, BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public);
 
-#if NET6_0 || NETSTANDARD2_1
+#if NET8_0 || NETSTANDARD2_1
         /// <summary>
         /// Searches for the specified public method whose parameters match the specified generic parameter count and argument types.
         /// </summary>

diff --git a/Nuqleon/Core/BCL/Nuqleon.Reflection.Virtualization/System/Reflection/Virtualization/Utils.cs b/Nuqleon/Core/BCL/Nuqleon.Reflection.Virtualization/System/Reflection/Virtualization/Utils.cs
@@ -33,7 +33,7 @@ public static bool SequenceEqual(Type[] left, Type[] right)
 
         public static int GetHashCode<TDefinition>(TDefinition def, Type[] args)
         {
-#if NET6_0
+#if NET8_0
             HashCode h = new();
 
             h.Add(def);

diff --git a/Nuqleon/Core/BCL/Nuqleon.Time/GettingStarted.ipynb b/Nuqleon/Core/BCL/Nuqleon.Time/GettingStarted.ipynb
@@ -35,7 +35,7 @@
       },
       "outputs": [],
       "source": [
-        "#r \"bin/Debug/net6.0/Nuqleon.Time.dll\""
+        "#r \"bin/Debug/net8.0/Nuqleon.Time.dll\""
       ]
     },
     {

diff --git a/Nuqleon/Core/BCL/Nuqleon.Time/Nuqleon.Time.csproj b/Nuqleon/Core/BCL/Nuqleon.Time/Nuqleon.Time.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net8.0</TargetFrameworks>
     <Description>A collection of utilities to deal with physical and virtual time.</Description>
   </PropertyGroup>
 

diff --git a/...sts.Nuqleon.Collections.Specialized/System/Collections/Specialized/EnumDictionaryTests.cs b/...sts.Nuqleon.Collections.Specialized/System/Collections/Specialized/EnumDictionaryTests.cs
@@ -17,7 +17,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 
-#if !NET6_0
+#if !NET8_0
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
 #endif
@@ -789,7 +789,7 @@ private enum EnumUShort : ushort
             Z = ushort.MaxValue,
         }
 
-#if !NET6_0 // https://aka.ms/binaryformatter
+#if !NET8_0 // https://aka.ms/binaryformatter
         [TestMethod]
         public void EnumSizeResolutionException_Serialization()
         {

diff --git a/...re/BCL/Tests.Nuqleon.Collections.Specialized/Tests.Nuqleon.Collections.Specialized.csproj b/...re/BCL/Tests.Nuqleon.Collections.Specialized/Tests.Nuqleon.Collections.Specialized.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Nuqleon/Core/BCL/Tests.Nuqleon.IO.StreamSegment/Tests.Nuqleon.IO.StreamSegment.csproj b/Nuqleon/Core/BCL/Tests.Nuqleon.IO.StreamSegment/Tests.Nuqleon.IO.StreamSegment.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Nuqleon/Core/BCL/Tests.Nuqleon.Memory/System/Collections/Generic/PooledDictionaryTests.cs b/Nuqleon/Core/BCL/Tests.Nuqleon.Memory/System/Collections/Generic/PooledDictionaryTests.cs
@@ -14,7 +14,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-#if !NET6_0
+#if !NET8_0
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
 #endif
@@ -215,7 +215,7 @@ public void PooledDictionary_GetInstance()
             }
         }
 
-#if !NET6_0 // https://aka.ms/binaryformatter
+#if !NET8_0 // https://aka.ms/binaryformatter
         [TestMethod]
         public void PooledDictionary_Serialization()
         {

diff --git a/Nuqleon/Core/BCL/Tests.Nuqleon.Memory/System/Collections/Generic/PooledHashSetTests.cs b/Nuqleon/Core/BCL/Tests.Nuqleon.Memory/System/Collections/Generic/PooledHashSetTests.cs
@@ -14,7 +14,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-#if !NET6_0
+#if !NET8_0
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
 #endif
@@ -203,7 +203,7 @@ public void PooledHashSet_GetInstance()
             }
         }
 
-#if !NET6_0 // https://aka.ms/binaryformatter
+#if !NET8_0 // https://aka.ms/binaryformatter
         [TestMethod]
         public void PooledHashSet_Serialization()
         {

diff --git a/Nuqleon/Core/BCL/Tests.Nuqleon.Memory/Tests.Nuqleon.Memory.csproj b/Nuqleon/Core/BCL/Tests.Nuqleon.Memory/Tests.Nuqleon.Memory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Nuqleon/Core/BCL/Tests.Nuqleon.Reflection.Virtualization/System/Reflection/Tests.cs b/Nuqleon/Core/BCL/Tests.Nuqleon.Reflection.Virtualization/System/Reflection/Tests.cs
@@ -255,7 +255,7 @@ public void Type_Members_Trivial() => WithProviders(p =>
             Assert.AreEqual(substring, p.GetMethod(typeof(string), nameof(string.Substring), BindingFlags.Public | BindingFlags.Instance, binder: null, new[] { typeof(int), typeof(int) }, modifiers: null));
             Assert.AreEqual(substring, p.GetMethod(typeof(string), nameof(string.Substring), BindingFlags.Public | BindingFlags.Instance, binder: null, CallingConventions.Any, new[] { typeof(int), typeof(int) }, modifiers: null));
 
-#if NET6_0 || NETSTANDARD2_1
+#if NET8_0 || NETSTANDARD2_1
             Assert.AreEqual(substring, p.GetMethod(typeof(string), nameof(string.Substring), genericParameterCount: 0, new[] { typeof(int), typeof(int) }));
             Assert.AreEqual(substring, p.GetMethod(typeof(string), nameof(string.Substring), genericParameterCount: 0, new[] { typeof(int), typeof(int) }, modifiers: null));
             Assert.AreEqual(substring, p.GetMethod(typeof(string), nameof(string.Substring), genericParameterCount: 0, BindingFlags.Public | BindingFlags.Instance, binder: null, new[] { typeof(int), typeof(int) }, modifiers: null));
@@ -1068,7 +1068,7 @@ public void Assembly_Properties() => WithProviders(p =>
         {
             var asm = typeof(string).Assembly;
 
-#if !NET6_0
+#if !NET8_0
             Assert.AreEqual(asm.CodeBase, p.GetCodeBase(asm));
             Assert.AreEqual(asm.EscapedCodeBase, p.GetEscapedCodeBase(asm));
             Assert.AreEqual(asm.GlobalAssemblyCache, p.GetGlobalAssemblyCache(asm));

diff --git a/...CL/Tests.Nuqleon.Reflection.Virtualization/Tests.Nuqleon.Reflection.Virtualization.csproj b/...CL/Tests.Nuqleon.Reflection.Virtualization/Tests.Nuqleon.Reflection.Virtualization.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Nuqleon/Core/BCL/Tests.Nuqleon.Time/Tests.Nuqleon.Time.csproj b/Nuqleon/Core/BCL/Tests.Nuqleon.Time/Tests.Nuqleon.Time.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...ataModel/Nuqleon.DataModel.CompilerServices/Bonsai/EntitySubstitution/PropertyDataSlim.cs b/...ataModel/Nuqleon.DataModel.CompilerServices/Bonsai/EntitySubstitution/PropertyDataSlim.cs
@@ -53,7 +53,7 @@ public PropertyDataSlim(string name, TypeSlim type)
         /// <returns>A hash code.</returns>
         public override int GetHashCode() =>
             HashHelpers.Combine(
-#if NET6_0 || NETSTANDARD2_1
+#if NET8_0 || NETSTANDARD2_1
                 Name?.GetHashCode(StringComparison.Ordinal) ?? 0,
 #else
                 Name?.GetHashCode() ?? 0,

diff --git a/...re/DataModel/Nuqleon.DataModel.CompilerServices/Nuqleon.DataModel.CompilerServices.csproj b/...re/DataModel/Nuqleon.DataModel.CompilerServices/Nuqleon.DataModel.CompilerServices.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net8.0</TargetFrameworks>
     <Description>Tools for creating and substituting anonymized versions of data model types in expressions.</Description>
   </PropertyGroup>
 

diff --git a/Nuqleon/Core/DataModel/Nuqleon.DataModel.CompilerServices/TypeSystem/DataType.cs b/Nuqleon/Core/DataModel/Nuqleon.DataModel.CompilerServices/TypeSystem/DataType.cs
@@ -340,7 +340,7 @@ private string PrintCycleRich(DataType type)
                 var sortedTypes =
                     _namedTypes.OrderBy(kv =>
                         int.Parse(
-#if NET6_0 || NETSTANDARD2_1
+#if NET8_0 || NETSTANDARD2_1
                             kv.Value.Name[TYPEPREFIX.Length..],
 #else
                             kv.Value.Name.Substring(TYPEPREFIX.Length),

diff --git a/...taModel/Nuqleon.DataModel.CompilerServices/TypeSystem/DataTypeObjectEqualityComparator.cs b/...taModel/Nuqleon.DataModel.CompilerServices/TypeSystem/DataTypeObjectEqualityComparator.cs
@@ -384,7 +384,7 @@ protected virtual int GetHashCodeStructural(object obj, StructuralDataType dataT
                     }
 #else
                     hash = (int)(hash * Prime) +
-#if NET6_0 || NETSTANDARD2_1
+#if NET8_0 || NETSTANDARD2_1
                         property.Name.GetHashCode(StringComparison.Ordinal)
 #else
                         property.Name.GetHashCode()