Skip to content

Return assembly-scan change#12968

Merged
YuliiaKovalova merged 1 commit intomainfrom
revert-12945-revert-12823
Dec 29, 2025
Merged

Return assembly-scan change#12968
YuliiaKovalova merged 1 commit intomainfrom
revert-12945-revert-12823

Conversation

@YuliiaKovalova
Copy link
Member

@YuliiaKovalova YuliiaKovalova commented Dec 29, 2025

Reverts #12945

It's unrelated to the reported regression since the counter degrades even without my change: https://dev.azure.com/devdiv/DevDiv/_git/VS/pullRequest/696870#1766395219

Copilot AI review requested due to automatic review settings December 29, 2025 08:51
@YuliiaKovalova YuliiaKovalova enabled auto-merge (squash) December 29, 2025 08:55
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This pull request reverts #12945, restoring assembly scanning functionality in the TypeLoader that was previously removed. The main purpose is to bring back support for scanning executable files and older CLR versions on .NET Framework.

Key Changes

  • Restored scanning for both .dll and .exe files in assembly directories when creating MetadataLoadContext
  • Re-introduced .NET Framework-specific logic to include CLR 2.0 and 3.5 assemblies in the assembly resolver
  • Added a helper method AddAssembliesToDictionary to handle assembly deduplication with configurable priority

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
src/Shared/TypeLoader.cs Restored assembly scanning logic including .exe file scanning, CLR 2.0/3.5 support on .NET Framework, and added helper method for assembly deduplication
src/MSBuild/MSBuild.csproj Added reference to FrameworkLocationHelper.cs which is required by the restored TypeLoader code to locate older .NET Framework versions

@YuliiaKovalova YuliiaKovalova merged commit 0784a91 into main Dec 29, 2025
16 checks passed
@YuliiaKovalova YuliiaKovalova deleted the revert-12945-revert-12823 branch December 29, 2025 10:37
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