Net6

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "CodeGen"]
+	path = CodeGen
+	url = https://github.com/Synergex/CodeGen.git
+	branch = hcnet6

Application1/Application1.synproj

@@ -0,0 +1,60 @@
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(SolutionDir)Common.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Configuration)' == '' ">x86</Platform>
+    <Name>Application1</Name>
+    <StartupObject>&lt;Synergy Main&gt;</StartupObject>
+    <OutputName>Application1</OutputName>
+    <ProjectGuid>{5fae2bb6-ba77-4204-a910-4ef4d801d7e0}</ProjectGuid>
+    <ProjectTypeGuids>{7B8CF543-378A-4EC1-BB1B-98E4DC6E6820};{BBD0F5D1-1CC4-42fd-BA4C-A96779C64378}</ProjectTypeGuids>
+    <OutputType>application</OutputType>
+    <DBL_qTrim>True</DBL_qTrim>
+    <DBL_qAlign>True</DBL_qAlign>
+    <EnableCommonProperties>True</EnableCommonProperties>
+    <CommonPropertiesFileLocation>$(SolutionDir)Common.props</CommonPropertiesFileLocation>
+    <RootNamespace>Application1</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <IncludeDebugInformation>true</IncludeDebugInformation>
+    <OutputPath>$(SolutionDir)\$(Configuration)\$(Platform)</OutputPath>
+    <UnevaluatedOutputPath>EXEDIR:</UnevaluatedOutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <DebugOptimize>Debug</DebugOptimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <IncludeDebugInformation>true</IncludeDebugInformation>
+    <OutputPath>$(SolutionDir)\$(Configuration)\$(Platform)</OutputPath>
+    <UnevaluatedOutputPath>EXEDIR:</UnevaluatedOutputPath>
+    <PlatformTarget>x64</PlatformTarget>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <DebugOptimize>Debug</DebugOptimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <IncludeDebugInformation>true</IncludeDebugInformation>
+    <OutputPath>$(SolutionDir)\$(Configuration)\$(Platform)</OutputPath>
+    <UnevaluatedOutputPath>EXEDIR:</UnevaluatedOutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <DebugOptimize>Optimize</DebugOptimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <IncludeDebugInformation>true</IncludeDebugInformation>
+    <OutputPath>$(SolutionDir)\$(Configuration)\$(Platform)</OutputPath>
+    <UnevaluatedOutputPath>EXEDIR:</UnevaluatedOutputPath>
+    <PlatformTarget>x64</PlatformTarget>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <DebugOptimize>Optimize</DebugOptimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Program.dbl" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Synergex\dbl\Synergex.SynergyDE.Traditional.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>

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>

Generators/Enabled/ODataGenerator.csx

@@ -0,0 +1,22 @@
+
+public class CustomODataGenerator : ODataGenerator
+{
+    public override void ApplyDefaults(Solution solution)
+    {
+
+    }
+
+    public override List<string> ValidateSolution(Solution solution)
+    {
+        return new List<string>();
+    }
+
+    public override List<CodeGenTask> GenerateTasks(Solution solution)
+    {
+        var baseTasks = base.GenerateTasks(solution);
+        baseTasks.Add(StructureTaskHelper(solution, "Generate controller properties partial classes", solution.ControllersNamespace, solution.ControllersFolder, false, nameof(ODataGenerator), new string[] { "ODataControllerPropertyEndpoints" }, null));
+		return baseTasks;
+	}
+}
+
+new CustomODataGenerator()

Harmony.AspNetCore/Context/IMultiTenantMiddleware.dbl

@@ -30,8 +30,15 @@ namespace Harmony.AspNetCore.Context
 		public static extension method UseMultiTenancy, @IApplicationBuilder 
 			builder, @IApplicationBuilder
 			identifier, @Func<HttpContext, string>
-		proc
-			builder.Use(lambda(context, next) { InvokeMiddleware(identifier, context, next) })
+        proc
+            lambda implementation(context, next)
+            begin
+				mreturn InvokeMiddleware(identifier, context, next)
+            end
+
+			data implementationInstance, @Func<HttpContext, Func<Task>, Task>, implementation
+
+			builder.Use(implementationInstance)
 			mreturn builder
 		endmethod
 	endclass

Harmony.AspNetCore/Harmony.AspNetCore.synproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" DefaultTargets="restore;Build">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.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>22.8.1287</Version>
+    </PackageReference>
+    <PackageReference Include="Synergex.SynergyDE.synrnt">
+      <Version>12.1.1.3278</Version>
+    </PackageReference>
+    <PackageReference Include="System.ComponentModel.Annotations">
+      <Version>5.0.0</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Context\IContextMiddleware.dbl" />

Harmony.Core.AspNetCore.nuspec

@@ -14,8 +14,8 @@
 	</dependencies>
   </metadata>
   <files>
-	<file src="Harmony.AspNetCore\bin\Release\netcoreapp3.1\Harmony.AspNetCore.dll" target="lib\netcoreapp3.1\Harmony.AspNetCore.dll" />
-	<file src="Harmony.AspNetCore\bin\Release\netcoreapp3.1\Harmony.AspNetCore.pdb" target="lib\netcoreapp3.1\Harmony.AspNetCore.pdb" />
+	<file src="Harmony.AspNetCore\bin\Release\net6.0\Harmony.AspNetCore.dll" target="lib\net6.0\Harmony.AspNetCore.dll" />
+	<file src="Harmony.AspNetCore\bin\Release\net6.0\Harmony.AspNetCore.pdb" target="lib\net6.0\Harmony.AspNetCore.pdb" />
 	<file src="Harmony.AspNetCore\**\*.dbl" target="src\Harmony.AspNetCore\" />
   </files>
 

Harmony.Core.CodeGen.json

@@ -0,0 +1,236 @@
+{
+  "CreatedWithToolVersion": "1.0",
+  "WrittenWithToolVersion": "1.0",
+  "RPSMFIL": "HarmonyCore.Test.Repository\\bin\\Debug\\rpsmain.ism",
+  "RPSTFIL": "HarmonyCore.Test.Repository\\bin\\Debug\\rpstext.ism",
+  "RepositoryProject": "HarmonyCore.Test.Repository\\HarmonyCore.Test.Repository.synproj",
+  "EnableNewtonsoftJson": true,
+  "TraditionalBridge": {
+    "XFServerSMCPath": "XfplEnvironment\\smc.xml"
+  },
+  "ServicesNamespace": "Services",
+  "ControllersNamespace": "Services.Controllers",
+  "ModelsNamespace": "Services.Models",
+  "ClientModelsNamespace": "Services.Test.Models",
+  "UnitTestsNamespace": "Services.Test.UnitTests",
+  "UnitTestsBaseNamespace": "Services.Test",
+  "SelfHostNamespace": "Services.Host",
+  "TraditionalBridgeNamespace": "TraditionalBridge",
+  "DataFolder": "SampleData",
+  "APIDocsPath": "api-docs",
+  "APITitle": "Harmony Core Sample API",
+  "APIVersion": "1",
+  "APIDescription": "This environment presents an example of using Harmony Core to expose a collection of RESTful Web Service endpoints that allow you to interact with a small sample dataset.",
+  "APITerms": "Open Source",
+  "APIContactName": "Jodah Veloper",
+  "APIContactEmail": "jodah.veloper@synergexpsg.com",
+  "APILicenseName": "BSD-2-Clause",
+  "APILicenseUrl": "https://opensource.org/licenses/BSD-2-Clause",
+  "APIEnableQueryParams": "(MaxExpansionDepth=4)",
+  "ServerName": "localhost",
+  "ServerHttpPort": "8085",
+  "ServerHttpsPort": "8086",
+  "ServerBasePath": "odata",
+  "OAuthServer": "http://localhost:5000",
+  "OAuthApi": "api1",
+  "OAuthClient": "ro.client",
+  "OAuthSecret": "CBF7EBE6-D46E-41A7-903B-766A280616C3",
+  "OAuthTestUser": "jodah",
+  "OAuthTestPassword": "P@ssw0rd",
+  "CustomAuthController": "Authentication",
+  "CustomAuthEndpointPath": "GetToken",
+  "CustomAuthUserName": "username",
+  "CustomAuthPassword": "password",
+  "SignalRPath": "/hub/radley",
+  "TemplatesFolder": "Templates",
+  "ServicesFolder": "Services",
+  "ControllersFolder": "Services.Controllers",
+  "ModelsFolder": "Services.Models",
+  "SelfHostFolder": "Services.Host",
+  "UnitTestFolder": "Services.Test",
+  "IsolatedFolder": "Isolated",
+  "TraditionalBridgeFolder": "TraditionalBridge",
+  "ServicesProject": "Services",
+  "ControllersProject": "Services.Controllers",
+  "ModelsProject": "Services.Models",
+  "SelfHostProject": "Services.Host",
+  "UnitTestProject": "Services.Test",
+  "IsolatedProject": "Isolated",
+  "TraditionalBridgeProject": "TraditionalBridge",
+  "FullCollectionEndpoints": true,
+  "PrimaryKeyEndpoints": true,
+  "AlternateKeyEndpoints": true,
+  "CollectionCountEndpoints": true,
+  "PutEndpoints": true,
+  "PostEndpoints": true,
+  "PatchEndpoints": true,
+  "DeleteEndpoints": true,
+  "ODataSelect": true,
+  "ODataFilter": true,
+  "ODataOrderBy": true,
+  "ODataTop": true,
+  "ODataSkip": true,
+  "ODataRelations": true,
+  "ODataRelationValidation": true,
+  "GenerateSelfHost": true,
+  "CreateTestFiles": true,
+  "GeneratePostmanTests": true,
+  "GenerateUnitTests": true,
+  "GenerateOData": true,
+  "AdapterRouting": true,
+  "StoredProcedureRouting": true,
+  "FieldOverlays": true,
+  "ExtendedStructures": [
+    {
+      "Name": "CUSTOMERS",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ],
+      "RelationsSpecs": [
+        {
+          "FromStructure": "CUSTOMERS",
+          "FromKey": "CUSTOMER_NUMBER",
+          "ToStructure": "ORDERS",
+          "ToKey": "CUSTOMER_NUMBER",
+          "RelationName": "CustomerOrders",
+          "RequiresMatch": false,
+          "ValidationMode": "None",
+          "BackRelation": "ORDERS-CUSTOMERS-CUSTOMER_NUMBER-CUSTOMER_NUMBER",
+          "RelationType": "D",
+          "CustomValidatorName": ""
+        },
+        {
+          "FromStructure": "CUSTOMERS",
+          "FromKey": "FAVORITE_ITEM",
+          "ToStructure": "ITEMS",
+          "ToKey": "ITEM_NUMBER",
+          "RelationName": "CustomerFavoriteItem",
+          "RequiresMatch": false,
+          "ValidationMode": "ValuePresent",
+          "BackRelation": "ITEMS-CUSTOMERS-ITEM_NUMBER-FAVORITE_ITEM",
+          "RelationType": "C",
+          "CustomValidatorName": ""
+        },
+        {
+          "FromStructure": "CUSTOMERS",
+          "FromKey": "CUSTOMER_NUMBER",
+          "ToStructure": "CUSTOMER_NOTES",
+          "ToKey": "CUSTOMER_NUMBER",
+          "RelationName": "CustomerNotes",
+          "RequiresMatch": false,
+          "ValidationMode": "None",
+          "BackRelation": "CUSTOMER_NOTES-CUSTOMERS-CUSTOMER_NUMBER-CUSTOMER_NUMBER",
+          "RelationType": "D",
+          "CustomValidatorName": ""
+        }
+      ]
+    },
+    {
+      "Name": "CUSTOMER_NOTES",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ]
+    },
+    {
+      "Name": "ITEMS",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ]
+    },
+    {
+      "Name": "ORDERS",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ]
+    },
+    {
+      "Name": "ORDER_ITEMS",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ]
+    },
+    {
+      "Name": "VENDORS",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ]
+    },
+    {
+      "Name": "CUSTOMER_EX",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ]
+    },
+    {
+      "Name": "NONUNIQUEPK",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ]
+    },
+    {
+      "Name": "DIFFERENTPK",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ]
+    },
+    {
+      "Name": "TESTCAR",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ]
+    },
+    {
+      "Name": "TESTCARLOT",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ]
+    },
+    {
+      "Name": "TESTCAROWNER1",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ]
+    },
+    {
+      "Name": "TESTCAROWNER2",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ]
+    },
+    {
+      "Name": "TESTCAROWNER3",
+      "EnabledGenerators": [
+        "ModelGenerator",
+        "ODataGenerator",
+        "EFCoreGenerator"
+      ]
+    }
+  ],
+  "ExtendedInterfaces": []
+}