Skip to content

Use ComWrappers in some Marshal unit-tests and update platform metadata #56595

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
AaronRobinsonMSFT merged 11 commits into from
Aug 3, 2021
Merged

Use ComWrappers in some Marshal unit-tests and update platform metadata #56595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9883336
Remove the SupportedOSPlatform attribute from the ComWrappers API.
AaronRobinsonMSFT Jul 29, 2021
df27842
Test the Marshal.QueryInterface, Marshal.AddRef, and Marshal.Release
AaronRobinsonMSFT Jul 30, 2021
e1825f7
Update ApiCompat baseline.
AaronRobinsonMSFT Jul 30, 2021
455641a
Update src/libraries/shims/ApiCompat.proj
AaronRobinsonMSFT Jul 30, 2021
69a125e
Missing attribute
AaronRobinsonMSFT Jul 30, 2021
e451558
Review feedback.
AaronRobinsonMSFT Jul 30, 2021
22dc28c
Merge remote-tracking branch 'upstream/main' into runtime_56474
AaronRobinsonMSFT Jul 31, 2021
fa3a7f1
Merge remote-tracking branch 'upstream/main' into runtime_56474
AaronRobinsonMSFT Aug 2, 2021
12e3c60
Update ApiCompat for InteropServices project.
AaronRobinsonMSFT Aug 2, 2021
cdc0154
Test should not run on Mono.
AaronRobinsonMSFT Aug 2, 2021
ac47ce3
Apply suggestions from code review
AaronRobinsonMSFT Aug 3, 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
Next Next commit
Remove the SupportedOSPlatform attribute from the ComWrappers API.
  • Loading branch information
@AaronRobinsonMSFT
AaronRobinsonMSFT committed Jul 29, 2021
commit 988333633a7abe8fd8ed7a9bce54857eab15e388
1 change: 1 addition & 0 deletions src/coreclr/System.Private.CoreLib/src/System/Runtime/InteropServices/ComWrappers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ public static void RegisterForTrackerSupport(ComWrappers instance)
/// * P/Invokes with COM-related types
/// * COM activation
/// </remarks>
[SupportedOSPlatform("windows")]
public static void RegisterForMarshalling(ComWrappers instance)
{
if (instance == null)
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/ComWrappers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ public enum CreateObjectFlags
/// <summary>
/// Class for managing wrappers of COM IUnknown types.
/// </summary>
[SupportedOSPlatform("windows")]
[CLSCompliant(false)]
public abstract partial class ComWrappers
{
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,6 @@ public enum CreateObjectFlags
Aggregation = 4,
Unwrap = 8,
}
[System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
[System.CLSCompliantAttribute(false)]
public abstract class ComWrappers
{
Expand All @@ -1147,6 +1146,7 @@ public struct ComInterfaceDispatch
public object GetOrRegisterObjectForComInstance(System.IntPtr externalComObject, CreateObjectFlags flags, object wrapper, System.IntPtr inner) { throw null; }
protected abstract void ReleaseObjects(System.Collections.IEnumerable objects);
public static void RegisterForTrackerSupport(ComWrappers instance) { }
[System.Runtime.Versioning.SupportedOSPlatformAttribute("windows")]
public static void RegisterForMarshalling(ComWrappers instance) { }
protected static void GetIUnknownImpl(out System.IntPtr fpQueryInterface, out System.IntPtr fpAddRef, out System.IntPtr fpRelease) { throw null; }
}
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/shims/ApiCompatBaseline.PreviousNetCoreApp.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ Compat issues with assembly System.Runtime.InteropServices:
CannotRemoveAttribute : Attribute 'System.Runtime.Versioning.SupportedOSPlatformAttribute' exists on 'System.Runtime.InteropServices.Marshal.AddRef(System.IntPtr)' in the contract but not the implementation.
CannotRemoveAttribute : Attribute 'System.Runtime.Versioning.SupportedOSPlatformAttribute' exists on 'System.Runtime.InteropServices.Marshal.QueryInterface(System.IntPtr, System.Guid, System.IntPtr)' in the contract but not the implementation.
CannotRemoveAttribute : Attribute 'System.Runtime.Versioning.SupportedOSPlatformAttribute' exists on 'System.Runtime.InteropServices.Marshal.Release(System.IntPtr)' in the contract but not the implementation.
CannotRemoveAttribute : Attribute 'System.Runtime.Versioning.SupportedOSPlatformAttribute' exists on 'System.Runtime.InteropServices.ComWrappers' in the contract but not the implementation.
Compat issues with assembly System.Security.Cryptography.Algorithms:
CannotRemoveAttribute : Attribute 'System.Runtime.Versioning.UnsupportedOSPlatformAttribute' exists on 'System.Security.Cryptography.CryptoConfig' in the contract but not the implementation.
Compat issues with assembly System.Threading.Tasks.Extensions:
Expand All @@ -185,4 +186,4 @@ CannotChangeAttribute : Attribute 'System.Runtime.Versioning.UnsupportedOSPlatfo
CannotChangeAttribute : Attribute 'System.Runtime.Versioning.UnsupportedOSPlatformAttribute' on 'System.Security.Cryptography.AesCcm' changed from '[UnsupportedOSPlatformAttribute("browser")]' in the contract to '[UnsupportedOSPlatformAttribute("browser")]' in the implementation.
CannotChangeAttribute : Attribute 'System.Runtime.Versioning.UnsupportedOSPlatformAttribute' on 'System.Security.Cryptography.AesGcm' changed from '[UnsupportedOSPlatformAttribute("browser")]' in the contract to '[UnsupportedOSPlatformAttribute("browser")]' in the implementation.
CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Text.Json.Serialization.JsonConverterAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple=false)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple=false)]' in the implementation.
Total Issues: 171
Total Issues: 172