Merge main into FEAT-ExpressionFactoryExtensionPoint branch

.github/copilot-instructions.md

@@ -27,6 +27,7 @@ dotnet test -c Debug -f net8.0 src/DelegateDecompiler.EntityFramework.Tests
 dotnet test -c Debug -f net8.0 src/DelegateDecompiler.EntityFrameworkCore6.Tests
 dotnet test -c Debug -f net8.0 src/DelegateDecompiler.EntityFrameworkCore8.Tests
 dotnet test -c Debug -f net9.0 src/DelegateDecompiler.EntityFrameworkCore9.Tests
+dotnet test -c Debug -f net10.0 src\DelegateDecompiler.EntityFrameworkCore10.Tests
 ```
 
 Use `-p:DisableGitVersionTask=true` flag to avoid build issues if GitVersion is not set up.

.github/workflows/.NET-Framework.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main ]
 
 jobs:
   dotnet-framework:

.github/workflows/create-release.yml

@@ -0,0 +1,27 @@
+name: Create Release
+
+on:
+  workflow_dispatch:
+
+jobs:
+  create-tag:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        token: ${{ secrets.GH_TOKEN }}
+
+    - name: Install GitVersion
+      uses: gittools/actions/gitversion/setup@v4
+
+    - name: Determine Version
+      id: gitversion
+      uses: gittools/actions/gitversion/execute@v4
+
+    - name: Create Release
+      run: gh release create ${{ steps.gitversion.outputs.majorMinorPatch }} --generate-notes --target $GITHUB_SHA
+      env:
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}

.github/workflows/dotnet-linux.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main ]
   workflow_dispatch:
 
 jobs:
@@ -41,6 +40,7 @@ jobs:
 
       - name: Restore
         run: dotnet restore
+
       - name: Patch App.config
         run: |
           $configPath = 'src/DelegateDecompiler.EntityFramework.Tests/App.config'
@@ -57,6 +57,6 @@ jobs:
           dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.Tests
           dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.Tests.VB
           dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.EntityFramework.Tests
-          dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.EntityFrameworkCore6.Tests
           dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.EntityFrameworkCore8.Tests
           dotnet test --no-build -c Release -f net9.0 src/DelegateDecompiler.EntityFrameworkCore9.Tests
+          dotnet test --no-build -c Release -f net10.0 src\DelegateDecompiler.EntityFrameworkCore10.Tests

.github/workflows/dotnet-windows.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main ]
   workflow_dispatch:
 
 jobs:
@@ -52,6 +51,6 @@ jobs:
           dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.Tests
           dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.Tests.VB
           dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.EntityFramework.Tests
-          dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.EntityFrameworkCore6.Tests
           dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.EntityFrameworkCore8.Tests
           dotnet test --no-build -c Release -f net9.0 src/DelegateDecompiler.EntityFrameworkCore9.Tests
+          dotnet test --no-build -c Release -f net10.0 src\DelegateDecompiler.EntityFrameworkCore10.Tests

.github/workflows/publish-nuget.yml

@@ -5,6 +5,10 @@ on:
     tags:
       - '*'
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   publish:
     runs-on: ubuntu-latest
@@ -29,7 +33,11 @@ jobs:
     - name: Pack
       run: dotnet pack --no-build --configuration Release --output ./Release
 
-    - name: Publish to NuGet
-      run: dotnet nuget push ./Release/*.nupkg -s nuget.org -k ${NUGET_API_KEY}
-      env:
-        NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+    - name: NuGet Login
+      uses: NuGet/login@v1
+      id: login
+      with:
+        user: hazzik
+
+    - name: NuGet Publish
+      run: dotnet nuget push ./Release/*.nupkg -s nuget.org -k ${{ steps.login.outputs.NUGET_API_KEY }}

DelegateDecompiler.sln

@@ -27,14 +27,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DelegateDecompiler.EntityFr
 EndProject
 Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "DelegateDecompiler.Tests.VB", "src\DelegateDecompiler.Tests.VB\DelegateDecompiler.Tests.VB.vbproj", "{19EC81F1-783D-4F53-BCB8-4F87BA3A28EC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DelegateDecompiler.EntityFrameworkCore6.Tests", "src\DelegateDecompiler.EntityFrameworkCore6.Tests\DelegateDecompiler.EntityFrameworkCore6.Tests.csproj", "{0EC42D3F-C97B-4803-96BF-953B0139578C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DelegateDecompiler.EntityFrameworkCore5", "src\DelegateDecompiler.EntityFrameworkCore5\DelegateDecompiler.EntityFrameworkCore5.csproj", "{79DA2FBB-7A35-4AFF-A89B-CF8F5DADC1B2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DelegateDecompiler.EntityFrameworkCore8.Tests", "src\DelegateDecompiler.EntityFrameworkCore8.Tests\DelegateDecompiler.EntityFrameworkCore8.Tests.csproj", "{4B729DD4-7A37-4D16-B241-10DD5B12EDA0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DelegateDecompiler.EntityFrameworkCore9.Tests", "src\DelegateDecompiler.EntityFrameworkCore9.Tests\DelegateDecompiler.EntityFrameworkCore9.Tests.csproj", "{1E051041-B9CB-44AC-B2A2-5D4A4B91B2DB}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DelegateDecompiler.EntityFrameworkCore10.Tests", "src\DelegateDecompiler.EntityFrameworkCore10.Tests\DelegateDecompiler.EntityFrameworkCore10.Tests.csproj", "{5C3905CC-6B38-4C95-80FC-0DB5B72C5ABD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,10 +61,6 @@ Global
 		{19EC81F1-783D-4F53-BCB8-4F87BA3A28EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{19EC81F1-783D-4F53-BCB8-4F87BA3A28EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19EC81F1-783D-4F53-BCB8-4F87BA3A28EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0EC42D3F-C97B-4803-96BF-953B0139578C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EC42D3F-C97B-4803-96BF-953B0139578C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EC42D3F-C97B-4803-96BF-953B0139578C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0EC42D3F-C97B-4803-96BF-953B0139578C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{79DA2FBB-7A35-4AFF-A89B-CF8F5DADC1B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{79DA2FBB-7A35-4AFF-A89B-CF8F5DADC1B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{79DA2FBB-7A35-4AFF-A89B-CF8F5DADC1B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -77,6 +73,10 @@ Global
 		{1E051041-B9CB-44AC-B2A2-5D4A4B91B2DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E051041-B9CB-44AC-B2A2-5D4A4B91B2DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E051041-B9CB-44AC-B2A2-5D4A4B91B2DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C3905CC-6B38-4C95-80FC-0DB5B72C5ABD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C3905CC-6B38-4C95-80FC-0DB5B72C5ABD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C3905CC-6B38-4C95-80FC-0DB5B72C5ABD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C3905CC-6B38-4C95-80FC-0DB5B72C5ABD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.100",
     "rollForward": "latestFeature"
   }
 }

src/DelegateDecompiler.EntityFramework.Tests/DelegateDecompiler.EntityFramework.Tests.csproj

@@ -9,7 +9,7 @@
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit.Analyzers" Version="4.2.0" PrivateAssets="all" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.3" />
   </ItemGroup>
 
   <ItemGroup>

src/DelegateDecompiler.EntityFramework.Tests/GeneratedDocumentation/DetailedListOfSupportedCommands.md

@@ -1,6 +1,6 @@
 Detail of supported commands
 ============
-## Documentation produced for DelegateDecompiler, version 1.0.0.0 on Tuesday, 04 November 2025 00:22
+## Documentation produced for DelegateDecompiler, version 0.34.2.0 on Wednesday, 05 March 2025 13:06
 
 This file documents what linq commands **DelegateDecompiler** supports when
 working with [Entity Framework v6.1](http://msdn.microsoft.com/en-us/data/aa937723) (EF).
@@ -151,11 +151,5 @@ More will appear as we move forward.*
   * Subquery As Context Extension Method (line 72)
 
 
-### Group: Expression Factory Extension Point Features
-#### [Order By Sequence Linq Extension](../TestGroup91ExpressionFactoryExtensionPointFeatures/Test01OrderBySequenceLinqExtension.cs):
-- Supported
-  * Basic Order By Sequence Extension (line 150)
-
-
 
 The End

src/DelegateDecompiler.EntityFramework.Tests/GeneratedDocumentation/DetailedListOfSupportedCommandsWithSQL.md

@@ -1,6 +1,6 @@
 Detail With Sql of supported commands
 ============
-## Documentation produced for DelegateDecompiler, version 1.0.0.0 on Tuesday, 04 November 2025 00:22
+## Documentation produced for DelegateDecompiler, version 0.34.2.0 on Wednesday, 05 March 2025 13:06
 
 This file documents what linq commands **DelegateDecompiler** supports when
 working with [Entity Framework v6.1](http://msdn.microsoft.com/en-us/data/aa937723) (EF).
@@ -679,17 +679,17 @@ SELECT
 
 ```SQL
 SELECT 
-    [GroupBy3].[A1] AS [C1]
+    [GroupBy2].[A1] AS [C1]
     FROM ( SELECT 
         SUM([Extent1].[A1_0]) AS [A1]
         FROM ( SELECT 
             (SELECT 
                 COUNT(1) AS [A1]
-                FROM [dbo].[EfChilds] AS [Extent3]
-                WHERE [Extent1].[EfParentId] = [Extent3].[EfParentId]) AS [A1_0]
+                FROM [dbo].[EfChilds] AS [Extent2]
+                WHERE [Extent1].[EfParentId] = [Extent2].[EfParentId]) AS [A1_0]
             FROM [dbo].[EfParents] AS [Extent1]
         )  AS [Extent1]
-    )  AS [GroupBy3]
+    )  AS [GroupBy2]
 ```
 
   * Sum Count In Children Where Children Can Be None (line 61)
@@ -903,42 +903,5 @@ SELECT
 
 
 
-### Group: Expression Factory Extension Point Features
-#### [Order By Sequence Linq Extension](../TestGroup91ExpressionFactoryExtensionPointFeatures/Test01OrderBySequenceLinqExtension.cs):
-- Supported
-  * Basic Order By Sequence Extension (line 150)
-     * T-Sql executed is
-
-```SQL
-SELECT 
-    [Extent1].[EfParentId] AS [EfParentId], 
-    [Limit1].[EfChildId] AS [EfChildId], 
-    [Limit1].[ChildBool] AS [ChildBool], 
-    [Limit1].[ChildInt] AS [ChildInt], 
-    [Limit1].[ChildDouble] AS [ChildDouble], 
-    [Limit1].[ChildString] AS [ChildString], 
-    [Limit1].[ChildDateTime] AS [ChildDateTime], 
-    [Limit1].[ChildTimeSpan] AS [ChildTimeSpan], 
-    [Limit1].[EfParentId] AS [EfParentId1]
-    FROM  [dbo].[EfParents] AS [Extent1]
-    OUTER APPLY  (SELECT TOP (1) [Project1].[EfChildId] AS [EfChildId], [Project1].[ChildBool] AS [ChildBool], [Project1].[ChildInt] AS [ChildInt], [Project1].[ChildDouble] AS [ChildDouble], [Project1].[ChildString] AS [ChildString], [Project1].[ChildDateTime] AS [ChildDateTime], [Project1].[ChildTimeSpan] AS [ChildTimeSpan], [Project1].[EfParentId] AS [EfParentId]
-        FROM ( SELECT 
-            CASE WHEN (1 = [Extent2].[EfChildId]) THEN 2 WHEN (3 = [Extent2].[EfChildId]) THEN 1 WHEN (2 = [Extent2].[EfChildId]) THEN 0 ELSE 2147483647 END AS [C1], 
-            [Extent2].[EfChildId] AS [EfChildId], 
-            [Extent2].[ChildBool] AS [ChildBool], 
-            [Extent2].[ChildInt] AS [ChildInt], 
-            [Extent2].[ChildDouble] AS [ChildDouble], 
-            [Extent2].[ChildString] AS [ChildString], 
-            [Extent2].[ChildDateTime] AS [ChildDateTime], 
-            [Extent2].[ChildTimeSpan] AS [ChildTimeSpan], 
-            [Extent2].[EfParentId] AS [EfParentId]
-            FROM [dbo].[EfChilds] AS [Extent2]
-            WHERE [Extent1].[EfParentId] = [Extent2].[EfParentId]
-        )  AS [Project1]
-        ORDER BY [Project1].[C1] ASC ) AS [Limit1]
-```
-
-
-
 
 The End

src/DelegateDecompiler.EntityFramework.Tests/GeneratedDocumentation/SummaryOfSupportedCommands.md

@@ -1,6 +1,6 @@
 Summary of supported commands
 ============
-## Documentation produced for DelegateDecompiler, version 1.0.0.0 on Tuesday, 04 November 2025 00:22
+## Documentation produced for DelegateDecompiler, version 0.34.2.0 on Wednesday, 05 March 2025 13:06
 
 This file documents what linq commands **DelegateDecompiler** supports when
 working with [Entity Framework v6.1](http://msdn.microsoft.com/en-us/data/aa937723) (EF).
@@ -58,9 +58,5 @@ More will appear as we move forward.*
 - Supported
   * [Nested Expressions](../TestGroup90AdditionalFeatures/Test01NestedExpressions.cs) (1 tests)
 
-### Group: Expression Factory Extension Point Features
-- Supported
-  * [Order By Sequence Linq Extension](../TestGroup91ExpressionFactoryExtensionPointFeatures/Test01OrderBySequenceLinqExtension.cs) (1 tests)
-
 
 The End

src/DelegateDecompiler.EntityFramework/DelegateDecompiler.EntityFramework.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EntityFramework" Version="6.3.0" />
+    <PackageReference Include="EntityFramework" Version="6.5.1" />
   </ItemGroup>
 
   <ItemGroup>

src/DelegateDecompiler.EntityFrameworkCore10.Tests/DelegateDecompiler.EntityFrameworkCore10.Tests.csproj

@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Copyright>Copyright © Dave Glick 2014, Jon Smith 2014, Alexander Zaytsev 2014 - 2024</Copyright>
+    <DefineConstants>$(DefineConstants);EF_CORE;EF_CORE3;EF_CORE5</DefineConstants>
+    <RootNamespace>DelegateDecompiler.EntityFramework.Tests</RootNamespace>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <Compile Include="..\DelegateDecompiler.EntityFramework.Tests\**\*.cs" Exclude="..\DelegateDecompiler.EntityFramework.Tests\obj\**">
+      <Link>%(Name)</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\DelegateDecompiler.EntityFrameworkCore.Tests\**\*.cs" Exclude="..\DelegateDecompiler.EntityFrameworkCore.Tests\obj\**">
+      <Link>%(Name)</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="..\DelegateDecompiler.EntityFramework.Tests\EntityTypeConfigurationExtensionsTests.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.3" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.2.0" PrivateAssets="all" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="..\DelegateDecompiler.EntityFramework.Tests\App.config" Link="App.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DelegateDecompiler.EntityFrameworkCore5\DelegateDecompiler.EntityFrameworkCore5.csproj" />
+    <ProjectReference Include="..\DelegateDecompiler.Tests\DelegateDecompiler.Tests.csproj" />
+  </ItemGroup>
+
+</Project>