Skip to content

Conversation

Copy link

Copilot AI commented Nov 19, 2025

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 optimization
  • Decompile(), Optimize(), Evaluate() - changed to internal visibility
  • DecompiledQueryProvider and DecompiledQueryable - migrated to use Build() API
  • EntityFramework async providers - updated to use Build() API

Main branch updates integrated:

Configuration 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.

// Before (main): Direct decompilation
var result = expression.Decompile().Optimize();

// After (FEAT): Factory expansion included
var result = expression.Build();  // Decompile → ExpandFactories → Optimize

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.crl
    • Triggering command: dotnet 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

Merge main into current branch


💡 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.

# 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
Copilot AI requested a review from magicmoux November 19, 2025 19:24
@magicmoux
Copy link
Owner

magicmoux commented Nov 26, 2025

misconcepted and out of date.
basically testing Copilot

@magicmoux magicmoux closed this Nov 26, 2025
@magicmoux magicmoux deleted the copilot/merge-main-into-current-branch branch November 27, 2025 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants