fix WCF hositing build

OpenRIAServices · Jan 25, 2024 · 7081835 · 7081835
1 parent 542ccca
commit 7081835
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/NuGet/OpenRiaServices.Hosting.Wcf/OpenRiaServices.Hosting.Wcf.nuspec b/NuGet/OpenRiaServices.Hosting.Wcf/OpenRiaServices.Hosting.Wcf.nuspec
@@ -21,6 +21,7 @@
     <tags>WCF RIA Services RIAServices Server aspnet OpenRiaServices</tags>
 	<dependencies>
 		<group targetFramework="net472">
+			<dependency id="System.Memory" version="4.5.5"/>
 			<dependency id="OpenRiaServices.Server" version="$version$"/>
 			<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0"/>
 		</group>
@@ -33,4 +34,4 @@
     <file src="..\..\src\bin\Release\net472\OpenRiaServices.Hosting.Wcf.pdb" target="lib\net472\OpenRiaServices.Hosting.Wcf.pdb" />
     <file src="..\..\src\bin\Release\net472\OpenRiaServices.Hosting.Wcf.xml" target="lib\net472\OpenRiaServices.Hosting.Wcf.xml" />
   </files>
-</package>
+</package>
diff --git a/src/OpenRiaServices.Hosting.Wcf/Framework/Linq/DynamicQueryable.cs b/src/OpenRiaServices.Hosting.Wcf/Framework/Linq/DynamicQueryable.cs
@@ -3,9 +3,18 @@
 using System.Globalization;
 using System.Linq.Expressions;
 using System.Reflection;
+using System;
 
 namespace System.Linq.Dynamic
 {
+#if NETFRAMEWORK
+    static class StringExtensions
+    {
+        static public string Slice(this string str, int startIndex, int length)
+            => str.Substring(startIndex, length);
+    }
+#endif
+
     internal static class DynamicQueryable
     {
         public static IQueryable Where(this IQueryable source, string predicate, QueryResolver queryResolver)
@@ -1460,12 +1469,14 @@ Expression PromoteExpression(Expression expr, Type type, bool exact)
                                     value = ParseNumber(text.Span, target);
                                 break;
                             case TypeCode.String:
+#if !NETFRAMEWORK
                                 if (ce.Value is string str)
                                 {
                                     // We parsed as text but wanted it as something else, probaly an enum
                                     value = ParseEnum(str, target);
                                 }
                                 else
+#endif
                                 {
                                     // We parsed as text but wanted it as something else, probaly an enum
                                     value = ParseEnum(text.Span, target);
@@ -1486,8 +1497,14 @@ Expression PromoteExpression(Expression expr, Type type, bool exact)
             return null;
         }
 
+#if NETFRAMEWORK
+        static object ParseNumber(ReadOnlySpan<char> span, Type type)
+        {
+            string text = span.ToString();
+#else
         static object ParseNumber(ReadOnlySpan<char> text, Type type)
         {
+#endif
             switch (Type.GetTypeCode(GetNonNullableType(type)))
             {
                 case TypeCode.SByte:
@@ -1556,8 +1573,16 @@ static object ParseEnum(ReadOnlySpan<char> name, Type type)
 #if NET
                 Enum.TryParse(type, name, ignoreCase: true, out var result);
 #else
+                object result;
+                try
+                {
+                    result = Enum.Parse(type, name.ToString(), ignoreCase: true);
 
-                Enum.TryParse(type, name.ToString(), ignoreCase: true, out var result);
+                }
+                catch (Exception)
+                {
+                    result = null;
+                }
 #endif
                 return result;
             }
@@ -2093,7 +2118,7 @@ bool TokenIdentifierIs(string id)
             Token token = this.token;
             return _tokenId == TokenId.Identifier 
                 && token.length == id.Length
-                && GetText(token).Equals(id, StringComparison.OrdinalIgnoreCase);
+                && GetText(token).Equals(id.AsSpan(), StringComparison.OrdinalIgnoreCase);
         }
 
         string GetIdentifier()

diff --git a/src/OpenRiaServices.Hosting.Wcf/Framework/OpenRiaServices.Hosting.Wcf.csproj b/src/OpenRiaServices.Hosting.Wcf/Framework/OpenRiaServices.Hosting.Wcf.csproj
@@ -19,6 +19,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\OpenRiaServices.Client.Web\Framework\Data\Behaviors\MessageUtility.cs" Link="WCF\Behaviors\MessageUtility.cs" />