Skip to content

Remove IL2050 in System.Management #54810

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

Merged
marek-safar merged 2 commits into from
Jul 13, 2021
Merged

Remove IL2050 in System.Management #54810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9ede71
Remove IL2050 in System.Management
kant2002 Jun 28, 2021
54ea8a8
Fix location of variables
kant2002 Jun 28, 2021
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
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/Ole32/Interop.CoGetObjectContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ internal static partial class Interop
{
internal static partial class Ole32
{
[DllImport(Libraries.Ole32, PreserveSig = false)]
internal static extern IStream CreateStreamOnHGlobal(IntPtr hGlobal, bool fDeleteOnRelease);
[DllImport(Libraries.Ole32)]
internal static extern int CoGetObjectContext([MarshalAs(UnmanagedType.LPStruct)] Guid riid, out IntPtr ppv);
}
}
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/Ole32/Interop.CreateStreamOnHGlobal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ internal static partial class Interop
{
internal static partial class Ole32
{
[DllImport(Libraries.Ole32)]
internal static extern int CoGetObjectContext([MarshalAs(UnmanagedType.LPStruct)] Guid riid, out IntPtr ppv);
[DllImport(Libraries.Ole32, PreserveSig = false)]
internal static extern IStream CreateStreamOnHGlobal(IntPtr hGlobal, bool fDeleteOnRelease);
Copy link
Member

@stephentoub stephentoub Jun 28, 2021

Choose a reason for hiding this comment

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

Took me a sec to figure out what was going on here. Thanks for fixing the swap.

Copy link
Contributor Author

@kant2002 kant2002 Jun 28, 2021

Choose a reason for hiding this comment

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

I hear you. I was in similar position before :)

}
}
26 changes: 1 addition & 25 deletions src/libraries/System.Management/src/ILLink/ILLink.Suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,5 @@
<property name="Scope">member</property>
<property name="Target">M:System.Management.MTAHelper.WorkerThread</property>
</attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2050</argument>
<property name="Scope">member</property>
<property name="Target">M:Interop.Ole32.CoMarshalInterface(System.Runtime.InteropServices.ComTypes.IStream,System.Guid,System.IntPtr,System.UInt32,System.IntPtr,System.UInt32)</property>
</attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2050</argument>
<property name="Scope">member</property>
<property name="Target">M:Interop.Ole32.CoUnmarshalInterface(System.Runtime.InteropServices.ComTypes.IStream,System.Guid)</property>
</attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2050</argument>
<property name="Scope">member</property>
<property name="Target">M:Interop.Ole32.CreateStreamOnHGlobal(System.IntPtr,System.Boolean)</property>
</attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2050</argument>
<property name="Scope">member</property>
<property name="Target">M:Interop.Ole32.GetHGlobalFromStream(System.Runtime.InteropServices.ComTypes.IStream)</property>
</attribute>
</assembly>
</linker>
</linker>
8 changes: 0 additions & 8 deletions src/libraries/System.Management/src/System.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@
Link="Common\Interop\Windows\Kernel32\Interop.LoadLibrary.cs" />
<Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.CoGetObjectContext.cs"
Link="Common\Interop\Windows\Ole32\Interop.CoGetObjectContext.cs" />
<Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.CoMarshalInterface.cs"
Link="Common\Interop\Windows\Ole32\Interop.CoMarshalInterface.cs" />
<Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.CoUnmarshalInterface.cs"
Link="Common\Interop\Windows\Ole32\Interop.CoUnmarshalInterface.cs" />
<Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.CreateStreamOnHGlobal.cs"
Link="Common\Interop\Windows\Ole32\Interop.CreateStreamOnHGlobal.cs" />
<Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.GetHGlobalFromStream.cs"
Link="Common\Interop\Windows\Ole32\Interop.GetHGlobalFromStream.cs" />
<Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs"
Link="Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs" />
<Compile Include="System\Management\ManagementBaseObject.cs" />
Expand Down