#363 - Begin working on dual moniker support

Author: mdesalvo

RDFSharp/Model/RDFModelShims.cs

@@ -0,0 +1,43 @@
+/*
+   Copyright 2012-2025 Marco De Salvo
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+using System.Text.RegularExpressions;
+
+namespace RDFSharp.Model
+{
+    /// <summary>
+    /// RDFModelShims represents a collector for all the shims used by the "RDFSharp.Model" namespace
+    /// </summary>
+    public static partial class RDFModelShims
+    {
+        #region Regex
+
+        private const string PrefixRegexShimMask = @"^[a-zA-Z0-9_\-]+$";
+        internal static Regex PrefixRegexShim =>
+#if NET8_0_OR_GREATER
+            PrefixRegex();
+#else
+            new Regex(PrefixRegexShimMask, RegexOptions.Compiled);
+#endif
+
+#if NET8_0_OR_GREATER
+        [GeneratedRegex(PrefixRegexShimMask)]
+        private static partial Regex PrefixRegex();
+#endif
+
+        #endregion
+    }
+}

RDFSharp/Model/RDFNamespace.cs

@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 using System;
-using System.Text.RegularExpressions;
 
 namespace RDFSharp.Model
 {
@@ -25,11 +24,6 @@ namespace RDFSharp.Model
     public sealed class RDFNamespace : IEquatable<RDFNamespace>
     {
         #region Properties
-        /// <summary>
-        /// Regex for validation of prefixes
-        /// </summary>
-        internal static readonly Lazy<Regex> PrefixRegex = new Lazy<Regex>(() => new Regex(@"^[a-zA-Z0-9_\-]+$", RegexOptions.Compiled));
-
         /// <summary>
         /// Unique representation of the namespace
         /// </summary>
@@ -69,7 +63,7 @@ public RDFNamespace(string prefix, string uri)
 
             //Prefix must contain only letters/numbers and cannot be "bnode" or "xmlns"
             string finalPrefix = prefix.Trim();
-            if (!PrefixRegex.Value.Match(finalPrefix).Success)
+            if (!RDFModelShims.PrefixRegexShim.Match(finalPrefix).Success)
                 throw new RDFModelException("Cannot create RDFNamespace because \"prefix\" parameter contains unallowed characters");
             if (finalPrefix.Equals("bnode", StringComparison.OrdinalIgnoreCase) || finalPrefix.Equals("xmlns", StringComparison.OrdinalIgnoreCase))
                 throw new RDFModelException("Cannot create RDFNamespace because \"prefix\" parameter cannot be \"bnode\" or \"xmlns\"");
@@ -110,7 +104,7 @@ public RDFNamespace SetDereferenceUri(Uri dereferenceUri)
             if (dereferenceUri != null &&
                   dereferenceUri.IsAbsoluteUri &&
                     !dereferenceUri.ToString().StartsWith("bnode:", StringComparison.OrdinalIgnoreCase) &&
-                      !dereferenceUri.ToString().StartsWith("xmlns:", StringComparison.OrdinalIgnoreCase))
+                    !dereferenceUri.ToString().StartsWith("xmlns:", StringComparison.OrdinalIgnoreCase))
             {
                 DereferenceUri = dereferenceUri;
             }

RDFSharp/RDFSharp.csproj

@@ -7,7 +7,7 @@
     <Authors>Marco De Salvo</Authors>
     <Copyright>Marco De Salvo</Copyright>
     <Description>Lightweight and friendly .NET library for realizing Semantic Web applications</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <SignAssembly>false</SignAssembly>
     <Product>RDFSharp</Product>
     <PackageId>RDFSharp</PackageId>
@@ -47,6 +47,8 @@
       </PackageReference>
       <PackageReference Include="NetTopologySuite" Version="2.6.0" />
       <PackageReference Include="ProjNet" Version="2.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
       <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
-</Project>
+</Project>