Merge main into FEAT-ExpressionFactoryExtensionPoint branch#3
Closed
Copilot wants to merge 15 commits intoFEAT-ExpressionFactoryExtensionPointfrom
Closed
Merge main into FEAT-ExpressionFactoryExtensionPoint branch#3Copilot wants to merge 15 commits intoFEAT-ExpressionFactoryExtensionPointfrom
Copilot wants to merge 15 commits intoFEAT-ExpressionFactoryExtensionPointfrom
Conversation
+semver:patch
+semver:patch
+semver:patch
+semver:patch
- Add missing GH_TOKEN env variable to Create Release step - Add missing step id to NuGet Login step +semver:fix
Fixes hazzik#303 +semver:fix
+semver:patch
+semver:feature
+semver:patch
+semver:fix
+semver:patch
# Conflicts: # .github/copilot-instructions.md # .github/workflows/.NET-Framework.yml # .github/workflows/dotnet-linux.yml # .github/workflows/dotnet-windows.yml # .github/workflows/publish-nuget.yml # DelegateDecompiler.sln # global.json # src/DelegateDecompiler.EntityFramework.Tests/DelegateDecompiler.EntityFramework.Tests.csproj # src/DelegateDecompiler.EntityFramework.Tests/GeneratedDocumentation/DetailedListOfSupportedCommands.md # src/DelegateDecompiler.EntityFramework.Tests/GeneratedDocumentation/DetailedListOfSupportedCommandsWithSQL.md # src/DelegateDecompiler.EntityFramework.Tests/GeneratedDocumentation/SummaryOfSupportedCommands.md # src/DelegateDecompiler.EntityFramework/AsyncDecompiledQueryProvider.cs # src/DelegateDecompiler.EntityFramework/DelegateDecompiler.EntityFramework.csproj # src/DelegateDecompiler.EntityFrameworkCore5/AsyncDecompiledQueryProvider.cs # src/DelegateDecompiler.EntityFrameworkCore5/DelegateDecompileEntityQueryProvider.cs # src/DelegateDecompiler.EntityFrameworkCore8.Tests/DelegateDecompiler.EntityFrameworkCore8.Tests.csproj # src/DelegateDecompiler.EntityFrameworkCore8.Tests/GeneratedDocumentation/DetailedListOfSupportedCommands.md # src/DelegateDecompiler.EntityFrameworkCore8.Tests/GeneratedDocumentation/DetailedListOfSupportedCommandsWithSQL.md # src/DelegateDecompiler.EntityFrameworkCore8.Tests/GeneratedDocumentation/SummaryOfSupportedCommands.md # src/DelegateDecompiler.EntityFrameworkCore9.Tests/DelegateDecompiler.EntityFrameworkCore9.Tests.csproj # src/DelegateDecompiler.EntityFrameworkCore9.Tests/GeneratedDocumentation/DetailedListOfSupportedCommands.md # src/DelegateDecompiler.EntityFrameworkCore9.Tests/GeneratedDocumentation/DetailedListOfSupportedCommandsWithSQL.md # src/DelegateDecompiler.EntityFrameworkCore9.Tests/GeneratedDocumentation/SummaryOfSupportedCommands.md # src/DelegateDecompiler.Tests.VB/DelegateDecompiler.Tests.VB.vbproj # src/DelegateDecompiler.Tests/DelegateDecompiler.Tests.csproj # src/DelegateDecompiler/DecompiledQueryProvider.cs # src/DelegateDecompiler/DecompiledQueryable.cs # src/DelegateDecompiler/DelegateDecompiler.csproj # src/DelegateDecompiler/ExpressionExtensions.cs # src/DelegateDecompiler/Processor.cs # src/DelegateDecompiler/Processors/ConvertTypeProcessor.cs # src/Directory.Build.props # test.cmd
Copilot
AI
changed the title
[WIP] Merge main into current branch
Merge main into FEAT-ExpressionFactoryExtensionPoint branch
Nov 19, 2025
Owner
|
misconcepted and out of date. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges 470 commits from main into the FEAT-ExpressionFactoryExtensionPoint branch, reconciling divergent histories.
Key Conflict Resolutions
Core API changes (FEAT branch preserved):
ExpressionExtensions.Build()- new public API combining decompilation, factory expansion, and optimizationDecompile(),Optimize(),Evaluate()- changed to internal visibilityDecompiledQueryProviderandDecompiledQueryable- migrated to useBuild()APIBuild()APIMain branch updates integrated:
Processor.cs- added ldobj and prefix opcode support from Add support for ldobj opcode hazzik/DelegateDecompiler#309, Fix support for prefix opcodes hazzik/DelegateDecompiler#304Configuration files: Accepted main versions for solution files, workflows, and build properties to ensure compatibility with latest CI/CD infrastructure.
What This Enables
The FEAT branch introduces expression factory expansion as a new pipeline stage, allowing custom expression transformations to be registered via
[ExpressionFactory]attribute. The merge ensures this functionality benefits from all recent main branch improvements including new opcode support and updated dependencies.Warning
Firewall rules blocked me from connecting to one or more addresses (expand for details)
I tried to connect to the following addresses, but was blocked by firewall rules:
http://crl3.digicert.com:443/DigiCertTrustedG4TimeStampingRSA4096SHA2562025CA1.crldotnet build -c Debug -p:DisableGitVersionTask=true(http block)If you need me to access, download, or install something from one of these locations, you can either:
Original prompt
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.