[Macromullet]

Fixes #127678

Summary

• Make generated strongly typed WMI collection wrappers implement IDisposable and dispose their underlying ManagementObjectCollection.
• Make generated enumerator wrappers implement IDisposable and dispose their underlying ManagementObjectEnumerator.
• Add regression coverage that verifies both generated CodeDOM types preserve the disposable ownership contract.

This is additive to generated source and exposes the lifetime contract already implemented by the wrapped System.Management types. Existing finalizer fallback remains unchanged, while consumers can now release COM-backed WMI resources deterministically.

Testing

• build.cmd clr+libs -rc Release (0 warnings, 0 errors)
• Full System.Management.Tests project via dotnet build /t:test
  • .NET 11: 27 total, 0 failed, 4 environment-dependent skips
  • .NET Framework: 25 total, 0 failed, 4 environment-dependent skips
• Generated and compiled a C# Win32_LogicalDisk wrapper, enumerated it, disposed both generated wrappers, and verified both wrapped System.Management objects were disposed.
• Generated and compiled the equivalent Visual Basic wrapper.

Note

This pull request description was generated with GitHub Copilot.

[azure-pipelines]

Azure Pipelines:
Successfully started running 3 pipeline(s).
13 pipeline(s) were filtered out due to trigger conditions.
There may be pipelines that require an authorized user to comment /azp run to run.

[dotnet-policy-service]

Tagging subscribers to this area: @dotnet/area-system-management
See info in area-owners.md if you want to be subscribed.

[Copilot]

Pull request overview

Updates the System.Management strongly typed WMI CodeDOM generator to preserve the disposal contract of the underlying WMI collection/enumerator types, and adds regression tests that validate the generated CodeDOM shape.

Changes:

• Generate nested WMI collection wrappers that implement IDisposable and forward Dispose() to the wrapped ManagementObjectCollection.
• Generate nested enumerator wrappers that implement IDisposable and forward Dispose() to the wrapped ManagementObjectEnumerator.
• Add a regression test that validates both generated wrapper types implement IDisposable and contain a Dispose() implementation that disposes the wrapped field.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File	Description
src/libraries/System.Management/tests/System/Management/ManagementClassTests.cs	Adds regression coverage asserting the generated collection/enumerator CodeDOM types implement IDisposable and dispose their wrapped fields.
src/libraries/System.Management/src/System/Management/WMIGenerator.cs	Updates the WMI wrapper generator to emit IDisposable on generated collection/enumerator wrappers and emit a forwarding Dispose() method.

Suppressed comments (1)

src/libraries/System.Management/src/System/Management/WMIGenerator.cs:4476

• The pseudo-code comment for the generated Dispose method uses ObjectEnumerator, but the generated field/method body uses privObjEnum. This comment is now misleading after the change and should match the emitted member names.

            //public void Dispose()
            //{
            //    ObjectEnumerator.Dispose();
            //}

[Copilot]

Pull request overview

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

Suppressed comments (2)

src/libraries/System.Management/src/System/Management/WMIGenerator.cs:4446

• The comment describing the generated enumerator wrapper’s implemented interfaces is now stale after adding IDisposable. Updating it helps keep the generator’s intent clear and avoids future confusion.

            //public class ServiceEnumerator : IEnumerator
            ecc = new CodeTypeDeclaration(PrivateNamesUsed["EnumeratorClass"].ToString());
            ecc.TypeAttributes = TypeAttributes.NestedPublic;

            ecc.BaseTypes.Add("System.Object");
            ecc.BaseTypes.Add("System.Collections.IEnumerator");
            ecc.BaseTypes.Add("System.IDisposable");

src/libraries/System.Management/src/System/Management/WMIGenerator.cs:4249

• The comment describing the generated collection wrapper’s implemented interfaces is now stale after adding IDisposable. This can mislead future edits of the generator; please update it to match the generated BaseTypes.

This issue also appears on line 4440 of the same file.

            //public class ServiceCollection : ICollection, IEnumerable
            ccc = new CodeTypeDeclaration(PrivateNamesUsed["CollectionClass"].ToString());

            ccc.BaseTypes.Add("System.Object");
            ccc.BaseTypes.Add("ICollection");
            ccc.BaseTypes.Add("System.IDisposable");

[Copilot]

Pull request overview

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

[jeffhandley]

I want to wait for CI to finish before committing this suggestion. But afterward applying this suggestion, this looks good to me. Thanks, @Macromullet!

[jeffhandley]

/ba-g The errors are System.Net.Tests.InvalidClientRequestTests.GetContext_InvalidRequest_DoesNotGetContext times out (dotnet/runtime#132336)

[Copilot]

Pull request overview

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

Suppressed comments (2)

src/libraries/System.Management/src/System/Management/WMIGenerator.cs:4481

• Same issue as the collection Dispose: MemberAttributes.Public | MemberAttributes.Final | MemberAttributes.Override is not a valid scope combination and can cause the CodeDOM C# generator to emit virtual unexpectedly. Use a single scope value (e.g., Final) for a non-virtual Dispose implementation.

            cmm = new CodeMemberMethod();
            cmm.Attributes = MemberAttributes.Public | MemberAttributes.Final | MemberAttributes.Override;
            cmm.Name = "Dispose";
            cmm.ImplementationTypes.Add("System.IDisposable");

src/libraries/System.Management/src/System/Management/WMIGenerator.cs:4282

• MemberAttributes values under ScopeMask are mutually exclusive (not flags). Public | Final | Override produces an undefined scope value, and the C# CodeDOM generator falls back to emitting virtual (see CSharpCodeGenerator.OutputMemberScopeModifier). For Dispose, that means generated wrappers will have a virtual Dispose method unintentionally. Drop Override (and keep Final if desired) so the emitted code is non-virtual.

This issue also appears on line 4478 of the same file.

            cmm = new CodeMemberMethod();
            cmm.Attributes = MemberAttributes.Public | MemberAttributes.Final | MemberAttributes.Override;
            cmm.Name = "Dispose";
            cmm.ImplementationTypes.Add("System.IDisposable");

[jeffhandley]

/backport to release/11.0

[github-actions]

Started backporting to release/11.0 (link to workflow run)