Skip to content

Fix static member exports to not instantiate declaring type #594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Fix static member exports to not instantiate declaring type #594

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3d002e1
Initial plan for issue
Copilot Jun 11, 2025
e660673
Initial exploration - understand the issue and current codebase
Copilot Jun 11, 2025
17f767f
Fix static member exports to not instantiate declaring type
Copilot Jun 11, 2025
63bfb57
Add comprehensive tests for static member export instantiation behavior
Copilot Jun 11, 2025
c4ecf24
Revert global.json and nuget.config, add MEFv2 support to static memb…
Copilot Jun 11, 2025
4648648
Remove redundant MEF engine flags from static member tests
Copilot Jun 11, 2025
1c817b6
Remove MEFv2 attributes from static field and method exports
Copilot Jun 11, 2025
5c5690a
Fix whitespace
AArnott Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.116",
"version": "9.0.300",
"rollForward": "patch",
"allowPrerelease": false
},
Expand Down
2 changes: 1 addition & 1 deletion nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</config>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="msft_consumption_public" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/msft_consumption_public/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<!-- Defend against user or machine level disabling of sources that we list in this file. -->
Expand Down
16 changes: 11 additions & 5 deletions test/Microsoft.VisualStudio.Composition.Tests/StaticMemberExportsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ namespace Microsoft.VisualStudio.Composition.Tests
using Xunit;
using CompositionFailedException = Microsoft.VisualStudio.Composition.CompositionFailedException;
using MefV1 = System.ComponentModel.Composition;
using MefV2 = System.Composition;

[Trait("Static", "")]
public class StaticMemberExportsTests
Expand Down Expand Up @@ -212,12 +213,15 @@ public ClassWithStaticMemberExports()
}

[MefV1.Export("StaticField")]
[MefV2.Export("StaticField")]
public static string StaticField = "StaticFieldValue";

[MefV1.Export("StaticProperty")]
[MefV2.Export("StaticProperty")]
public static string StaticProperty => "StaticPropertyValue";

[MefV1.Export("StaticMethod")]
[MefV2.Export("StaticMethod")]
public static string StaticMethod() => "StaticMethodValue";
}

Expand All @@ -238,13 +242,15 @@ public ClassWithMixedExports()
}

[MefV1.Export("StaticMixed")]
[MefV2.Export("StaticMixed")]
public static string StaticExport = "StaticValue";

[MefV1.Export("InstanceMixed")]
[MefV2.Export("InstanceMixed")]
public string InstanceExport => "InstanceValue";
}

[MefFact(CompositionEngines.V3EmulatingV1, typeof(ClassWithStaticMemberExports))]
[MefFact(CompositionEngines.V1Compat | CompositionEngines.V2Compat | CompositionEngines.V3EmulatingV1 | CompositionEngines.V3EmulatingV2, typeof(ClassWithStaticMemberExports))]
public void StaticFieldExportDoesNotInstantiateClass(IContainer container)
{
ClassWithStaticMemberExports.ConstructorCalled = false;
Expand All @@ -253,7 +259,7 @@ public void StaticFieldExportDoesNotInstantiateClass(IContainer container)
Assert.False(ClassWithStaticMemberExports.ConstructorCalled, "Constructor should not be called for static field export");
}

[MefFact(CompositionEngines.V3EmulatingV1, typeof(ClassWithStaticMemberExports))]
[MefFact(CompositionEngines.V1Compat | CompositionEngines.V2Compat | CompositionEngines.V3EmulatingV1 | CompositionEngines.V3EmulatingV2, typeof(ClassWithStaticMemberExports))]
public void StaticPropertyExportDoesNotInstantiateClass(IContainer container)
{
ClassWithStaticMemberExports.ConstructorCalled = false;
Expand All @@ -262,7 +268,7 @@ public void StaticPropertyExportDoesNotInstantiateClass(IContainer container)
Assert.False(ClassWithStaticMemberExports.ConstructorCalled, "Constructor should not be called for static property export");
}

[MefFact(CompositionEngines.V3EmulatingV1, typeof(ClassWithStaticMemberExports))]
[MefFact(CompositionEngines.V1Compat | CompositionEngines.V2Compat | CompositionEngines.V3EmulatingV1 | CompositionEngines.V3EmulatingV2, typeof(ClassWithStaticMemberExports))]
Copy link
Member

@AArnott AArnott Jun 11, 2025

Choose a reason for hiding this comment

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

V1Compat includes V3EmulatingV1, and V2Compat includes V3EmulatingV2.
Please drop the redundant flags.

Copy link
Contributor Author

Copilot AI Jun 11, 2025

Choose a reason for hiding this comment

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

Removed redundant flags V3EmulatingV1 and V3EmulatingV2 from test attributes. Tests now use only V1Compat and V2Compat as requested (commit 4648648).

public void StaticMethodExportDoesNotInstantiateClass(IContainer container)
{
ClassWithStaticMemberExports.ConstructorCalled = false;
Expand All @@ -271,7 +277,7 @@ public void StaticMethodExportDoesNotInstantiateClass(IContainer container)
Assert.False(ClassWithStaticMemberExports.ConstructorCalled, "Constructor should not be called for static method export");
}

[MefFact(CompositionEngines.V3EmulatingV1, typeof(ClassWithMixedExports))]
[MefFact(CompositionEngines.V1Compat | CompositionEngines.V2Compat | CompositionEngines.V3EmulatingV1 | CompositionEngines.V3EmulatingV2, typeof(ClassWithMixedExports))]
public void StaticExportInMixedClassDoesNotInstantiateClass(IContainer container)
{
ClassWithMixedExports.ConstructorCalled = false;
Expand All @@ -280,7 +286,7 @@ public void StaticExportInMixedClassDoesNotInstantiateClass(IContainer container
Assert.False(ClassWithMixedExports.ConstructorCalled, "Constructor should not be called when accessing only static export");
}

[MefFact(CompositionEngines.V3EmulatingV1, typeof(ClassWithMixedExports))]
[MefFact(CompositionEngines.V1Compat | CompositionEngines.V2Compat | CompositionEngines.V3EmulatingV1 | CompositionEngines.V3EmulatingV2, typeof(ClassWithMixedExports))]
public void InstanceExportInMixedClassDoesInstantiateClass(IContainer container)
{
ClassWithMixedExports.ConstructorCalled = false;
Expand Down