wip net5/6 work

Author: Jeffrey Greene

DataGenerator/DataGenerator.synproj

@@ -2,7 +2,7 @@
   <Import Project="$(SolutionDir)Common.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <DefaultLanguageSourceExtension>.dbl</DefaultLanguageSourceExtension>
     <EnableDefaultItems>false</EnableDefaultItems>
     <Name>DataGenerator</Name>

Harmony.AspNetCore/Harmony.AspNetCore.synproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" DefaultTargets="restore;Build">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <DefaultLanguageSourceExtension>.dbl</DefaultLanguageSourceExtension>
     <EnableDefaultItems>false</EnableDefaultItems>
     <Name>Harmony.AspNetCore</Name>
@@ -39,9 +39,15 @@
   </PropertyGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Synergex.SynergyDE.Build" Version="11.1.1070.3107" />
-    <PackageReference Include="Synergex.SynergyDE.synrnt" Version="11.1.1070" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+    <PackageReference Include="Synergex.SynergyDE.Build">
+      <Version>21.9.3450</Version>
+    </PackageReference>
+    <PackageReference Include="Synergex.SynergyDE.synrnt">
+      <Version>12.0.1.3272</Version>
+    </PackageReference>
+    <PackageReference Include="System.ComponentModel.Annotations">
+      <Version>5.0.0</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Context\IContextMiddleware.dbl" />

Harmony.OData/Adapter/AdapterRoutingAttributes.dbl

@@ -8,10 +8,10 @@ import System.Linq.Expressions
 import System.ComponentModel
 import System.Reflection
 import System.Linq
-import Microsoft.AspNet.OData.Query
-import Microsoft.AspNet.OData.Extensions
+import Microsoft.AspNetCore.OData.Query
+import Microsoft.AspNetCore.OData.Extensions
 import Microsoft.OData.Edm
-import Microsoft.AspNet.OData
+import Microsoft.AspNetCore.OData
 import Harmony.Core.Utility
 import Newtonsoft.Json
 import System.Collections.Concurrent
@@ -88,11 +88,11 @@ namespace Harmony.OData.Adapter
             context, @ActionExecutingContext
         proc
             data feature = context.HttpContext.ODataFeature()
-            data odataPath = feature.Path
-            data svc = feature.RequestContainer.GetService(^typeof(IEdmModel))
+            data odPath = feature.Path
+            data svc = feature.Services.GetService(^typeof(IEdmModel))
             data model = ^as(svc, @IEdmModel)
-            data elementType = odataPath.EdmType .is. IEdmCollectionType ? ((@IEdmCollectionType)odataPath.EdmType).ElementType.Definition : odataPath.EdmType
-            data odataQuery = new ODataQueryOptions(new ODataQueryContext(model, elementType, odataPath), context.HttpContext.Request)
+            data elementType = odPath.FirstSegment.EdmType .is. IEdmCollectionType ? ((@IEdmCollectionType)odPath.FirstSegment.EdmType).ElementType.Definition : odPath.FirstSegment.EdmType
+            data odataQuery = new ODataQueryOptions(new ODataQueryContext(model, elementType, odPath), context.HttpContext.Request)
             data filterClause = odataQuery.Filter?.FilterClause
             data filterLookup = new Dictionary<string, List<AdapterOp>>()
             DebugLogSession.Logging.LogTrace("AdapterActionInvoker: processing expression tree {0}, with lookup {1}", new UriExpressionLogHelper(filterClause?.Expression),  new JsonLogHelper(filterLookup))
@@ -222,7 +222,7 @@ namespace Harmony.OData.Adapter
             odataOptions, @ODataQueryOptions
         proc
             data result = new Dictionary<object, object>(original)
-            data opSeg = ^as(odataOptions.Context.Path.Segments.Last(), @OperationSegment)
+            data opSeg = ^as(odataOptions.Context.Path.Last(), @OperationSegment)
             data param, @OperationSegmentParameter
             foreach param in opSeg.Parameters
             begin