Embedded sources: cswinrt

src/Authoring/WinRT.Host.Shim/Module.cs

@@ -5,7 +5,7 @@
 using System.Collections.Concurrent;
 using System.Reflection;
 
-#if !NETSTANDARD2_0
+#if NET
 using System.Runtime.Loader;
 [assembly: global::System.Runtime.Versioning.SupportedOSPlatform("Windows")]
 #endif
@@ -56,7 +56,7 @@ public static unsafe int GetActivationFactory(IntPtr hstrTargetAssembly, IntPtr
             }
         }
 
-#if NETSTANDARD2_0
+#if !NET
         private static class ActivationLoader
         {
             public static Assembly LoadAssembly(string targetAssembly) => Assembly.LoadFrom(targetAssembly);

src/Projections/Test/Module.cs

@@ -1,3 +1,3 @@
-#if !NETSTANDARD2_0
+#if NET
 [assembly: global::System.Runtime.Versioning.SupportedOSPlatform("Windows")]
 #endif

src/Projections/TestHost.ProbeByClass/Module.cs

@@ -1,3 +1,3 @@
-#if !NETSTANDARD2_0
+#if NET
 [assembly: global::System.Runtime.Versioning.SupportedOSPlatform("Windows")]
 #endif

src/Projections/Windows/Module.cs

@@ -1,3 +1,3 @@
-#if !NETSTANDARD2_0
+#if NET
 [assembly: global::System.Runtime.Versioning.SupportedOSPlatform("Windows")]
 #endif

src/Tests/AuthoringTest/Module.cs

@@ -1,3 +1,3 @@
-#if !NETSTANDARD2_0
+#if NET
 [assembly: global::System.Runtime.Versioning.SupportedOSPlatform("Windows")]
 #endif

src/WinRT.Runtime/AgileReference.cs

@@ -4,15 +4,20 @@
 
 namespace WinRT
 {
-    public class AgileReference : IDisposable
+#if EMBED
+    internal
+#else
+    public
+#endif 
+    class AgileReference : IDisposable
     {
         private readonly static Guid CLSID_StdGlobalInterfaceTable = new(0x00000323, 0, 0, 0xc0, 0, 0, 0, 0, 0, 0, 0x46);
         private readonly static Lazy<IGlobalInterfaceTable> Git = new Lazy<IGlobalInterfaceTable>(() => GetGitTable());
         private readonly IAgileReference _agileReference;
         private readonly IntPtr _cookie;
         private bool disposed;
 
-        public unsafe AgileReference(IObjectReference instance)
+        public unsafe AgileReference(IObjectReference instance) 
         {
             if(instance?.ThisPtr == null)
             {
@@ -43,7 +48,6 @@ public unsafe AgileReference(IObjectReference instance)
                 MarshalInterface<IAgileReference>.DisposeAbi(agileReference);
             }
         }
-
         public IObjectReference Get() => _cookie == IntPtr.Zero ? _agileReference?.Resolve(typeof(IUnknownVftbl).GUID) : Git.Value?.GetInterfaceFromGlobal(_cookie, typeof(IUnknownVftbl).GUID);
 
         protected virtual void Dispose(bool disposing)
@@ -99,7 +103,12 @@ public void Dispose()
         }
     }
 
-    public sealed class AgileReference<T> : AgileReference
+#if EMBED
+    internal
+#else
+    public 
+#endif
+    sealed class AgileReference<T> : AgileReference
         where T : class
     {
         public unsafe AgileReference(IObjectReference instance)

src/WinRT.Runtime/Attributes.cs

@@ -1,13 +1,16 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Text;
 
 namespace WinRT
 {
     [EditorBrowsable(EditorBrowsableState.Never)]
-    [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
-    public sealed class ProjectedRuntimeClassAttribute : Attribute
+    [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+#if EMBED
+    internal
+#else
+    public        
+#endif
+    sealed class ProjectedRuntimeClassAttribute : Attribute
     {
         public ProjectedRuntimeClassAttribute(string defaultInterfaceProp)
         {
@@ -25,7 +28,12 @@ public ProjectedRuntimeClassAttribute(Type defaultInterface)
 
     [EditorBrowsable(EditorBrowsableState.Never)]
     [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
-    public sealed class ObjectReferenceWrapperAttribute : Attribute
+#if EMBED
+    internal
+#else
+    public        
+#endif
+    sealed class ObjectReferenceWrapperAttribute : Attribute
     {
         public ObjectReferenceWrapperAttribute(string objectReferenceField)
         {
@@ -40,7 +48,12 @@ public ObjectReferenceWrapperAttribute(string objectReferenceField)
     /// </summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Delegate | AttributeTargets.Struct | AttributeTargets.Enum, Inherited = false, AllowMultiple = false)]
-    public sealed class WindowsRuntimeTypeAttribute : Attribute
+#if EMBED
+    internal
+#else
+    public        
+#endif 
+    sealed class WindowsRuntimeTypeAttribute : Attribute
     {
         public WindowsRuntimeTypeAttribute(string sourceMetadata = null)
         {

src/WinRT.Runtime/CastExtensions.cs

@@ -1,14 +1,15 @@
 using System;
-using System.Collections.Generic;
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Text;
 using WinRT.Interop;
 
 namespace WinRT
 {
-    public static class CastExtensions
+#if EMBED
+    internal 
+#else
+    public
+#endif 
+    static class CastExtensions
     {
         /// <summary>
         /// Cast a WinRT object to an interface type it implements in its implementation
@@ -103,7 +104,7 @@ private static IObjectReference GetRefForObject(object value)
 
         private static bool TryGetComposedRefForQI(object value, out IObjectReference objRef)
         {
-#if NETSTANDARD2_0
+#if !NET
             var getReferenceMethod = value.GetType().GetMethod("GetDefaultReference", BindingFlags.NonPublic | BindingFlags.Instance).MakeGenericMethod(typeof(IUnknownVftbl));
             if (getReferenceMethod is null)
             {

src/WinRT.Runtime/ComWrappersSupport.cs

@@ -1,30 +1,30 @@
+using ABI.Microsoft.UI.Xaml.Data;
+using ABI.Windows.Foundation;
 using System;
-using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Numerics;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading;
-using System.Linq.Expressions;
 using WinRT.Interop;
-using ABI.Windows.Foundation;
-using ABI.Microsoft.UI.Xaml.Data;
 
-#if !NETSTANDARD2_0
+#if NET
 using ComInterfaceEntry = System.Runtime.InteropServices.ComWrappers.ComInterfaceEntry;
 #endif
 
 #pragma warning disable 0169 // The field 'xxx' is never used
 #pragma warning disable 0649 // Field 'xxx' is never assigned to, and will always have its default value
 
 namespace WinRT
-{
-    public static partial class ComWrappersSupport
+{
+#if EMBED
+    internal
+#else
+    public 
+#endif
+    static partial class ComWrappersSupport
     {
         private readonly static ConcurrentDictionary<string, Func<IInspectable, object>> TypedObjectFactoryCache = new ConcurrentDictionary<string, Func<IInspectable, object>>(StringComparer.Ordinal);
         private readonly static ConditionalWeakTable<object, object> CCWTable = new ConditionalWeakTable<object, object>();

src/WinRT.Runtime/ComWrappersSupport.net5.cs

@@ -11,7 +11,12 @@
 
 namespace WinRT
 {
-    public static partial class ComWrappersSupport
+#if EMBED
+    internal
+#else
+    public
+#endif
+    static partial class ComWrappersSupport
     {
         // Instance field and property for Singleton pattern: ComWrappers `set` method should be idempotent 
         private static DefaultComWrappers _instance;
@@ -43,7 +48,9 @@ private static ComWrappers ComWrappers
                         if (_comWrappers is null)
                         {
                             var comWrappersToSet = DefaultComWrappersInstance;
+#if !EMBED 
                             ComWrappers.RegisterForTrackerSupport(comWrappersToSet);
+#endif
                             _comWrappers = comWrappersToSet;
                         }
                     }
@@ -59,7 +66,9 @@ private static ComWrappers ComWrappers
                         return;
                     }
                     var comWrappersToSet = value ?? DefaultComWrappersInstance; 
+#if !EMBED 
                     ComWrappers.RegisterForTrackerSupport(comWrappersToSet);
+#endif
                     _comWrappers = comWrappersToSet; 
                 }
             }
@@ -206,7 +215,12 @@ private static Func<IInspectable, object> CreateFactoryForImplementationType(str
         }
     }
 
-    public class ComWrappersHelper
+#if EMBED
+    internal 
+#else
+    public
+#endif     
+    class ComWrappersHelper
     {
         public unsafe static void Init(
             bool isAggregation,
@@ -355,7 +369,12 @@ public unsafe static void Init(IObjectReference objRef, bool addRefFromTrackerSo
         }
     }
 
-    public class DefaultComWrappers : ComWrappers
+#if EMBED
+    internal 
+#else
+    public 
+#endif     
+    class DefaultComWrappers : ComWrappers
     {
         private static readonly ConditionalWeakTable<Type, VtableEntries> TypeVtableEntryTable = new ConditionalWeakTable<Type, VtableEntries>();
         public static unsafe IUnknownVftbl IUnknownVftbl => Unsafe.AsRef<IUnknownVftbl>(IUnknownVftblPtr.ToPointer());

src/WinRT.Runtime/ComWrappersSupport.netstandard2.0.cs

@@ -10,7 +10,12 @@
 
 namespace WinRT
 {
-    public static partial class ComWrappersSupport
+#if EMBED 
+    internal 
+#else
+    public 
+#endif     
+    static partial class ComWrappersSupport
     {
         private static ConditionalWeakTable<object, ComCallableWrapper> ComWrapperCache = new ConditionalWeakTable<object, ComCallableWrapper>();
 
@@ -285,10 +290,10 @@ internal static T FindObject<T>(IntPtr thisPtr)
             GCHandle thisHandle = GCHandle.FromIntPtr(unmanagedObject._gchandlePtr);
             return (T)thisHandle.Target;
         }
-    }
+    }
 
     internal class ComCallableWrapper
-    {
+    {
         private Dictionary<Guid, IntPtr> _managedQITable;
         private GCHandle _qiTableHandle;
         private volatile IntPtr _strongHandle;

src/WinRT.Runtime/Context.cs

@@ -4,6 +4,9 @@
 
 namespace WinRT
 {
+#if EMBED
+    internal
+#endif
     static class Context
     {
         [DllImport("api-ms-win-core-com-l1-1-0.dll")]

src/WinRT.Runtime/DerivedComposed.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
+using System.ComponentModel;
 
 namespace WinRT
 {
@@ -10,7 +7,12 @@ namespace WinRT
     /// as a base class of another composable object.
     /// </summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public class DerivedComposed
+#if EMBED
+    internal
+#else
+    public
+#endif 
+    class DerivedComposed
     {
         public static readonly DerivedComposed Instance = new DerivedComposed();
 

src/WinRT.Runtime/EventRegistrationToken.cs

@@ -1,10 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace WinRT
 {
-    public struct EventRegistrationToken : IEquatable<EventRegistrationToken>
+#if EMBED
+    internal
+#else 
+    public
+#endif
+    struct EventRegistrationToken : IEquatable<EventRegistrationToken>
     {
         public long Value;