diff options
Diffstat (limited to 'mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime')
45 files changed, 100 insertions, 237 deletions
diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/IClosable.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/IClosable.cs index 3a2f02690ee..e15957adfcc 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/IClosable.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/IClosable.cs @@ -18,7 +18,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime [ComImport] [Guid("30d5a829-7fa4-4026-83bb-d75bae4ea99e")] [WindowsRuntimeImport] - [ForceTokenStabilization] internal interface IClosable { void Close(); @@ -33,7 +32,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime } [SecurityCritical] - [ForceTokenStabilization] public void Close() { IDisposable _this = JitHelpers.UnsafeCast<IDisposable>(this); @@ -50,7 +48,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime Contract.Assert(false, "This class is never instantiated"); } - [ForceTokenStabilization] [SecurityCritical] private void Dispose() { diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/attributes.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/attributes.cs index 8be810c5641..8dfd4c70ca5 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/attributes.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/attributes.cs @@ -4,9 +4,9 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> using System; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortocollectionadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortocollectionadapter.cs index 215e0d159cd..248643a3c15 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortocollectionadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortocollectionadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Runtime; @@ -36,7 +36,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // int Count { get } [Pure] [SecurityCritical] - [ForceTokenStabilization] internal int Count() { IBindableVector _this = JitHelpers.UnsafeCast<IBindableVector>(this); @@ -52,7 +51,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // bool IsSynchronized { get } [Pure] [SecurityCritical] - [ForceTokenStabilization] internal bool IsSynchronized() { return false; @@ -61,7 +59,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // object SyncRoot { get } [Pure] [SecurityCritical] - [ForceTokenStabilization] internal object SyncRoot() { return this; @@ -70,7 +67,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // void CopyTo(Array array, int index) [Pure] [SecurityCritical] - [ForceTokenStabilization] internal void CopyTo(Array array, int arrayIndex) { if (array == null) @@ -89,7 +85,7 @@ namespace System.Runtime.InteropServices.WindowsRuntime throw new ArgumentOutOfRangeException("arrayIndex"); // Does the dimension in question have sufficient space to copy the expected number of entries? - // We perform this check before valid index check to ensure the exception message is in [....] with + // We perform this check before valid index check to ensure the exception message is in sync with // the following snippet that uses regular framework code: // // ArrayList list = new ArrayList(); diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortolistadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortolistadapter.cs index 9842d24a937..e8aa7ecb1fb 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortolistadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortolistadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Runtime; @@ -35,7 +35,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // object this[int index] { get } [SecurityCritical] - [ForceTokenStabilization] internal object Indexer_Get(int index) { if (index < 0) @@ -47,7 +46,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // object this[int index] { set } [SecurityCritical] - [ForceTokenStabilization] internal void Indexer_Set(int index, object value) { if (index < 0) @@ -59,7 +57,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // int Add(object value) [SecurityCritical] - [ForceTokenStabilization] internal int Add(object value) { IBindableVector _this = JitHelpers.UnsafeCast<IBindableVector>(this); @@ -76,7 +73,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // bool Contains(object item) [SecurityCritical] - [ForceTokenStabilization] internal bool Contains(object item) { IBindableVector _this = JitHelpers.UnsafeCast<IBindableVector>(this); @@ -87,7 +83,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // void Clear() [SecurityCritical] - [ForceTokenStabilization] internal void Clear() { IBindableVector _this = JitHelpers.UnsafeCast<IBindableVector>(this); @@ -97,7 +92,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // bool IsFixedSize { get } [Pure] [SecurityCritical] - [ForceTokenStabilization] internal bool IsFixedSize() { return false; @@ -106,7 +100,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // bool IsReadOnly { get } [Pure] [SecurityCritical] - [ForceTokenStabilization] internal bool IsReadOnly() { return false; @@ -114,7 +107,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // int IndexOf(object item) [SecurityCritical] - [ForceTokenStabilization] internal int IndexOf(object item) { IBindableVector _this = JitHelpers.UnsafeCast<IBindableVector>(this); @@ -135,7 +127,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // void Insert(int index, object item) [SecurityCritical] - [ForceTokenStabilization] internal void Insert(int index, object item) { if (index < 0) @@ -147,7 +138,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // bool Remove(object item) [SecurityCritical] - [ForceTokenStabilization] internal void Remove(object item) { IBindableVector _this = JitHelpers.UnsafeCast<IBindableVector>(this); @@ -168,7 +158,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // void RemoveAt(int index) [SecurityCritical] - [ForceTokenStabilization] internal void RemoveAt(int index) { if (index < 0) diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/clrikeyvaluepairimpl.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/clrikeyvaluepairimpl.cs index 25c3184066d..44b63f91154 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/clrikeyvaluepairimpl.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/clrikeyvaluepairimpl.cs @@ -4,8 +4,8 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Collections.Generic; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/clripropertyvalueimpl.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/clripropertyvalueimpl.cs index c7781abf070..3dc29580b28 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/clripropertyvalueimpl.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/clripropertyvalueimpl.cs @@ -4,9 +4,9 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Diagnostics.Contracts; @@ -475,7 +475,7 @@ namespace System.Runtime.InteropServices.WindowsRuntime return (T)(object)ipv.GetDouble(); } else { - BCLDebug.Assert(false, "T in coersion function wasn't understood as a type that can be coerced - make sure that CoerceScalarValue and NumericScalarTypes are in [....]"); + BCLDebug.Assert(false, "T in coersion function wasn't understood as a type that can be coerced - make sure that CoerceScalarValue and NumericScalarTypes are in sync"); } } diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/clrireferenceimpl.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/clrireferenceimpl.cs index b8730c204ec..831358e2d52 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/clrireferenceimpl.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/clrireferenceimpl.cs @@ -4,14 +4,13 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Collections; using System.Diagnostics.Contracts; -using System.Diagnostics.Tracing; using System.Reflection; using System.Security; @@ -78,6 +77,10 @@ namespace System.Runtime.InteropServices.WindowsRuntime // We have T in an IReference<T>. Need to QI for IReference<T> with the appropriate GUID, call // the get_Value property, allocate an appropriately-sized managed object, marshal the native object // to the managed object, and free the native method. Also we want the return value boxed (aka normal value type boxing). + // + // This method is called by VM. Mark the method with FriendAccessAllowed attribute to ensure that the unreferenced method + // optimization skips it and the code will be saved into NGen image. + [System.Runtime.CompilerServices.FriendAccessAllowed] internal static Object UnboxHelper(Object wrapper) { Contract.Requires(wrapper != null); @@ -104,7 +107,7 @@ namespace System.Runtime.InteropServices.WindowsRuntime _value = obj; // This should not fail but I'm making a cast here anyway just in case - // we have a bug (that _value is not an array) or there is a runtime failure + // we have a _list = (IList) _value; } @@ -263,6 +266,10 @@ namespace System.Runtime.InteropServices.WindowsRuntime // We have T in an IReferenceArray<T>. Need to QI for IReferenceArray<T> with the appropriate GUID, call // the get_Value property, allocate an appropriately-sized managed object, marshal the native object // to the managed object, and free the native method. + // + // This method is called by VM. Mark the method with FriendAccessAllowed attribute to ensure that the unreferenced method + // optimization skips it and the code will be saved into NGen image. + [System.Runtime.CompilerServices.FriendAccessAllowed] internal static Object UnboxHelper(Object wrapper) { Contract.Requires(wrapper != null); @@ -286,28 +293,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime Contract.Requires(obj != null, "Null should not be boxed."); Contract.Ensures(Contract.Result<Object>() != null); -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.BeginCreateIReference(); - } -#endif - - Object returnObj = CreateIReferenceWorker(obj); - -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.EndCreateIReference(returnObj != null ? returnObj.GetType().GetFullNameForEtw() : ""); - } -#endif - - return returnObj; - } - - [SecuritySafeCritical] - private static Object CreateIReferenceWorker(Object obj) - { Type type = obj.GetType(); if (type.IsArray) diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/custompropertyimpl.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/custompropertyimpl.cs index 6344d096343..bf762dbefe9 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/custompropertyimpl.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/custompropertyimpl.cs @@ -4,13 +4,12 @@ // // ==--== // -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; using System.Reflection; using System.Diagnostics.Contracts; -using System.Diagnostics.Tracing; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; using System.Runtime.Serialization; @@ -69,77 +68,26 @@ namespace System.Runtime.InteropServices.WindowsRuntime public object GetValue(object target) { -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.BeginCustomPropertyImplGetValue(target != null ? target.GetType().GetFullNameForEtw() : "", m_property.GetFullNameForEtw()); - } -#endif - object o = InvokeInternal(target, null, true); -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.EndCustomPropertyImplGetValue(target != null ? target.GetType().GetFullNameForEtw() : "", m_property.GetFullNameForEtw()); - } -#endif - return o; + return InvokeInternal(target, null, true); } // Unlike normal .Net, Jupiter properties can have at most one indexer parameter. A null // indexValue here means that the property has an indexer argument and its value is null. public object GetValue(object target, object indexValue) { -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.BeginCustomPropertyImplGetValueIndexValue(target != null ? target.GetType().GetFullNameForEtw() : "", indexValue != null ? indexValue.GetType().GetFullNameForEtw() : ""); - } -#endif - object o = InvokeInternal(target, new object[] { indexValue }, true); -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.EndCustomPropertyImplGetValueIndexValue(target != null ? target.GetType().GetFullNameForEtw() : "", indexValue != null ? indexValue.GetType().GetFullNameForEtw() : ""); - } -#endif - return o; + return InvokeInternal(target, new object[] { indexValue }, true); } public void SetValue(object target, object value) { -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.BeginCustomPropertyImplSetValue(target != null ? target.GetType().GetFullNameForEtw() : "", value != null ? value.GetType().GetFullNameForEtw() : ""); - } -#endif InvokeInternal(target, new object[] { value }, false); -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.EndCustomPropertyImplSetValue(target != null ? target.GetType().GetFullNameForEtw() : "", value != null ? value.GetType().GetFullNameForEtw() : ""); - } -#endif } // Unlike normal .Net, Jupiter properties can have at most one indexer parameter. A null // indexValue here means that the property has an indexer argument and its value is null. public void SetValue(object target, object value, object indexValue) { -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.BeginCustomPropertyImplSetValueIndexValue(target != null ? target.GetType().GetFullNameForEtw() : "", value != null ? value.GetType().GetFullNameForEtw() : "", indexValue != null ? indexValue.GetType().GetFullNameForEtw() : ""); - } -#endif InvokeInternal(target, new object[] { indexValue, value }, false); -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.EndCustomPropertyImplSetValueIndexValue(target != null ? target.GetType().GetFullNameForEtw() : "", value != null ? value.GetType().GetFullNameForEtw() : "", indexValue != null ? indexValue.GetType().GetFullNameForEtw() : ""); - } -#endif - } [SecuritySafeCritical] diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/dictionarytomapadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/dictionarytomapadapter.cs index db7e014764b..94a0d9e60c5 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/dictionarytomapadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/dictionarytomapadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/enumeratortoiteratoradapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/enumeratortoiteratoradapter.cs index a4ee4b1ed8a..60e229954f0 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/enumeratortoiteratoradapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/enumeratortoiteratoradapter.cs @@ -4,9 +4,9 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Collections; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtoken.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtoken.cs index 5f96a90e75d..092e43a2bcc 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtoken.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtoken.cs @@ -4,9 +4,9 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> using System; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtokentable.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtokentable.cs index 2de657df7f7..152e46f3403 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtokentable.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtokentable.cs @@ -4,9 +4,9 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Collections.Generic; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iactivationfactory.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iactivationfactory.cs index b0cfa61eead..bdcfc012d91 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iactivationfactory.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iactivationfactory.cs @@ -4,9 +4,9 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>LadiPro</OWNER> +// <OWNER>RByers</OWNER> +// <OWNER>ShawnFa</OWNER> using System; using System.Runtime.InteropServices; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/icustomproperty.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/icustomproperty.cs index 0d199998982..4eafca925e7 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/icustomproperty.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/icustomproperty.cs @@ -4,7 +4,7 @@ // // ==--== // -// <OWNER>[....]</OWNER> +// <OWNER>yzha</OWNER> using System; using System.Diagnostics.Contracts; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/icustompropertyprovider.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/icustompropertyprovider.cs index bc692915c60..d505dfac3bb 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/icustompropertyprovider.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/icustompropertyprovider.cs @@ -4,13 +4,12 @@ // // ==--== // -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.StubHelpers; using System.Reflection; using System.Diagnostics.Contracts; -using System.Diagnostics.Tracing; using System.Runtime.InteropServices; using System.Collections; using System.Collections.Generic; @@ -54,24 +53,11 @@ namespace System.Runtime.InteropServices.WindowsRuntime Contract.Requires(target != null); Contract.Requires(propertyName != null); -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.BeginICustomPropertyProviderCreateProperty(target.GetType().GetFullNameForEtw(), propertyName); - } -#endif // Only return public instance/static properties PropertyInfo propertyInfo = target.GetType().GetProperty( propertyName, BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public); -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.EndICustomPropertyProviderCreateProperty(target.GetType().GetFullNameForEtw(), propertyName); - } -#endif - if (propertyInfo == null) return null; else @@ -99,13 +85,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime Contract.Requires(target != null); Contract.Requires(propertyName != null); -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.BeginICustomPropertyProviderCreateIndexedProperty(target.GetType().GetFullNameForEtw(), propertyName, indexedParamType != null ? indexedParamType.GetFullNameForEtw() : ""); - } -#endif - // Only return public instance/static properties PropertyInfo propertyInfo = target.GetType().GetProperty( propertyName, @@ -116,13 +95,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime null // ignore type modifier ); -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.EndICustomPropertyProviderCreateIndexedProperty(target.GetType().GetFullNameForEtw(), propertyName, indexedParamType != null ? indexedParamType.GetFullNameForEtw() : ""); - } -#endif - if (propertyInfo == null) return null; else @@ -250,7 +222,7 @@ namespace System.Runtime.InteropServices.WindowsRuntime { return _target.GetType(); } - } + } // // override ToString() to make sure callers get correct IStringable.ToString() behavior in native code @@ -259,7 +231,7 @@ namespace System.Runtime.InteropServices.WindowsRuntime { return WindowsRuntime.IStringableHelper.ToString(_target); } - + // // IGetProxyTarget - unwraps the target object and use it for data binding // diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iiterable.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iiterable.cs index ff1ad9c9229..58db0a50ade 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iiterable.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iiterable.cs @@ -4,8 +4,8 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>LadiPro</OWNER> +// <OWNER>ShawnFa</OWNER> using System; using System.Collections.Generic; @@ -18,7 +18,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime [ComImport] [Guid("faa585ea-6214-4217-afda-7f46de5869b3")] [WindowsRuntimeImport] - [System.Runtime.ForceTokenStabilization] internal interface IIterable<T> : IEnumerable<T> { [Pure] @@ -28,7 +27,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime [ComImport] [Guid("036d2c08-df29-41af-8aa2-d774be62ba6f")] [WindowsRuntimeImport] - [System.Runtime.ForceTokenStabilization] internal interface IBindableIterable { [Pure] diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iiterator.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iiterator.cs index 157e907da04..ab9251987c9 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iiterator.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iiterator.cs @@ -4,9 +4,9 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>LadiPro</OWNER> +// <OWNER>RByers</OWNER> +// <OWNER>ShawnFa</OWNER> using System; using System.Diagnostics.Contracts; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/imap.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/imap.cs index b3a62c8c79e..dda04d6350c 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/imap.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/imap.cs @@ -4,8 +4,8 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>LadiPro</OWNER> +// <OWNER>ShawnFa</OWNER> using System; using System.Collections.Generic; @@ -19,7 +19,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime [ComImport] [Guid("3c2925fe-8519-45c1-aa79-197b6718c1c1")] [WindowsRuntimeImport] - [System.Runtime.ForceTokenStabilization] internal interface IMap<K, V> : IIterable<IKeyValuePair<K, V>> { [Pure] @@ -38,7 +37,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime [ComImport] [Guid("e480ce40-a338-4ada-adcf-272272e48cb9")] [WindowsRuntimeImport] - [System.Runtime.ForceTokenStabilization] internal interface IMapView<K, V> : IIterable<IKeyValuePair<K, V>> { [Pure] @@ -54,7 +52,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime [ComImport] [Guid("02b51929-c1c4-4a7e-8940-0312b5c18500")] [WindowsRuntimeImport] - [System.Runtime.ForceTokenStabilization] internal interface IKeyValuePair<K, V> { [Pure] diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/imapviewtoireadonlydictionaryadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/imapviewtoireadonlydictionaryadapter.cs index 4817cbcf25c..cd73d355f8c 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/imapviewtoireadonlydictionaryadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/imapviewtoireadonlydictionaryadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; @@ -98,7 +98,7 @@ namespace System.Runtime.InteropServices.WindowsRuntime value = _this.Lookup(key); return true; } - catch (Exception ex) // Still may hit this case due to a ----, or a potential bug. + catch (Exception ex) // Still may hit this case due to a ----, or a potential { if (__HResults.E_BOUNDS == ex._HResult) { diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ipropertyvalue.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ipropertyvalue.cs index cdec88e445f..086f209f758 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ipropertyvalue.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ipropertyvalue.cs @@ -4,9 +4,9 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>LadiPro</OWNER> +// <OWNER>RByers</OWNER> +// <OWNER>ShawnFa</OWNER> using System; using System.Diagnostics.Contracts; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlydictionarytoimapviewadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlydictionarytoimapviewadapter.cs index 32433c99c73..9a9c98ab416 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlydictionarytoimapviewadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlydictionarytoimapviewadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlylisttoivectorviewadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlylisttoivectorviewadapter.cs index bec4e3e70d0..1bf26b164de 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlylisttoivectorviewadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlylisttoivectorviewadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ireference.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ireference.cs index 04e568a8f99..bf53a3a6a96 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ireference.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ireference.cs @@ -4,9 +4,9 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>LadiPro</OWNER> +// <OWNER>RByers</OWNER> +// <OWNER>ShawnFa</OWNER> using System; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/irestrictederrorinfo.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/irestrictederrorinfo.cs index e07268eb805..1c1f66c7d03 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/irestrictederrorinfo.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/irestrictederrorinfo.cs @@ -4,12 +4,15 @@ // // ==--== // -// <OWNER>[....]</OWNER> +// <OWNER>ShawnFa</OWNER> using System; namespace System.Runtime.InteropServices.WindowsRuntime { +#if FEATURE_CORECLR + [System.Runtime.CompilerServices.FriendAccessAllowed] +#endif [ComImport] [Guid("82BA7092-4C88-427D-A7BC-16DD93FEB67E")] [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iteratortoenumeratoradapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iteratortoenumeratoradapter.cs index ab7dce2e033..e1460806c42 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iteratortoenumeratoradapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iteratortoenumeratoradapter.cs @@ -4,8 +4,8 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Collections; @@ -92,7 +92,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // This method is invoked when GetEnumerator is called on a WinRT-backed implementation of IEnumerable. [SecurityCritical] - [ForceTokenStabilization] internal IEnumerator GetEnumerator_Stub() { IBindableIterable _this = JitHelpers.UnsafeCast<IBindableIterable>(this); diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ivector.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ivector.cs index dc931010608..9f74c73ef48 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ivector.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ivector.cs @@ -4,8 +4,8 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>LadiPro</OWNER> +// <OWNER>ShawnFa</OWNER> using System; using System.Collections.Generic; @@ -19,7 +19,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime [ComImport] [Guid("913337e9-11a1-4345-a3a2-4e7f956e222d")] [WindowsRuntimeImport] - [System.Runtime.ForceTokenStabilization] internal interface IVector<T> : IIterable<T> { [Pure] @@ -45,7 +44,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime [ComImport] [Guid("913337e9-11a1-4345-a3a2-4e7f956e222d")] [WindowsRuntimeImport] - [System.Runtime.ForceTokenStabilization] internal interface IVector_Raw<T> : IIterable<T> { [Pure] @@ -70,7 +68,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime [ComImport] [Guid("bbe1fa4c-b0e3-4583-baef-1f1b2e483e56")] [WindowsRuntimeImport] - [System.Runtime.ForceTokenStabilization] internal interface IVectorView<T> : IIterable<T> { [Pure] @@ -86,7 +83,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime [ComImport] [Guid("393de7de-6fd0-4c0d-bb71-47244a113e93")] [WindowsRuntimeImport] - [System.Runtime.ForceTokenStabilization] internal interface IBindableVector : IBindableIterable { [Pure] diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ivectorviewtoireadonlylistadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ivectorviewtoireadonlylistadapter.cs index 2e0631196df..14e43b37e0a 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ivectorviewtoireadonlylistadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/ivectorviewtoireadonlylistadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iwinrtclassactivator.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iwinrtclassactivator.cs index 8cc05316e35..c049d558057 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iwinrtclassactivator.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iwinrtclassactivator.cs @@ -4,7 +4,7 @@ // // ==--== // -// <OWNER>[....]</OWNER> +// <OWNER>ShawnFa</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectoradapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectoradapter.cs index 7212db3e4f3..fa9e01eb236 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectoradapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectoradapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectorviewadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectorviewadapter.cs index 80cd46fb64d..08e99c52631 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectorviewadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectorviewadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/listtovectoradapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/listtovectoradapter.cs index 7f5e9cf83fa..a093837c5af 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/listtovectoradapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/listtovectoradapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/managedactivationfactory.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/managedactivationfactory.cs index a519b59eac5..dd963c54a2b 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/managedactivationfactory.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/managedactivationfactory.cs @@ -4,13 +4,12 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Diagnostics.Contracts; -using System.Diagnostics.Tracing; using System.Reflection; using System.Runtime.InteropServices; using System.Security; @@ -48,12 +47,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime // with at least one ActivatableAttribute or StaticAttribute. if (!(type is RuntimeType) || !type.IsExportedToWindowsRuntime) throw new ArgumentException(Environment.GetResourceString("Argument_TypeNotActivatableViaWindowsRuntime", type), "type"); -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.ManagedActivationFactoryConstructor(type.GetFullNameForEtw()); - } -#endif m_type = type; } diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/maptocollectionadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/maptocollectionadapter.cs index ecaedd87be0..c04a9a0cf63 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/maptocollectionadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/maptocollectionadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/maptodictionaryadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/maptodictionaryadapter.cs index 320397249b3..8b68eca2b56 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/maptodictionaryadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/maptodictionaryadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/mapviewtoreadonlycollectionadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/mapviewtoreadonlycollectionadapter.cs index d9ea83ecbe7..8854c87e36f 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/mapviewtoreadonlycollectionadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/mapviewtoreadonlycollectionadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/nativemethods.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/nativemethods.cs index 7f94167b414..f9cec78699e 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/nativemethods.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/nativemethods.cs @@ -4,9 +4,9 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>LadiPro</OWNER> +// <OWNER>RByers</OWNER> +// <OWNER>ShawnFa</OWNER> using System; using System.Runtime.InteropServices; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/propertyvalue.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/propertyvalue.cs index 047b4112770..3cd8d0fd79b 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/propertyvalue.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/propertyvalue.cs @@ -4,10 +4,10 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>BLanders</OWNER> +// <OWNER>LadiPro</OWNER> +// <OWNER>RByers</OWNER> +// <OWNER>ShawnFa</OWNER> using System; using System.Diagnostics.Contracts; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/runtimeclass.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/runtimeclass.cs index bb5a3e4604c..3d55152acc4 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/runtimeclass.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/runtimeclass.cs @@ -25,7 +25,6 @@ namespace System.Runtime.InteropServices.WindowsRuntime { [ComImport] [Guid("96369f54-8eb6-48f0-abce-c1b211e627c3")] [WindowsRuntimeImport] - [ForceTokenStabilization] internal interface IStringable { string ToString(); diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/vectortocollectionadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/vectortocollectionadapter.cs index af4674c3a0d..0443ed2d142 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/vectortocollectionadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/vectortocollectionadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/vectortolistadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/vectortolistadapter.cs index edc20f2b6ba..51858b00038 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/vectortolistadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/vectortolistadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/vectorviewtoreadonlycollectionadapter.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/vectorviewtoreadonlycollectionadapter.cs index b704460e7f9..f1e95611b3a 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/vectorviewtoreadonlycollectionadapter.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/vectorviewtoreadonlycollectionadapter.cs @@ -5,7 +5,7 @@ // ==--== // // <OWNER>GPaperin</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsfoundationeventhandler.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsfoundationeventhandler.cs index 611fd89c955..66a9662514b 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsfoundationeventhandler.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsfoundationeventhandler.cs @@ -4,7 +4,7 @@ // // ==--== // -// <OWNER>[....]</OWNER> +// <OWNER>ShawnFa</OWNER> using System; @@ -13,6 +13,5 @@ namespace System.Runtime.InteropServices.WindowsRuntime // WindowsFoundationEventHandler<T> a copy of the definition for the Windows.Foundation.EventHandler<T> delegate [Guid("9de1c535-6ae1-11e0-84e1-18a905bcc53f")] [WindowsRuntimeImport] - [System.Runtime.ForceTokenStabilization] internal delegate void WindowsFoundationEventHandler<T>(object sender, T args); } diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemarshal.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemarshal.cs index a27bc01bad4..c186cf73fe5 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemarshal.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemarshal.cs @@ -4,14 +4,13 @@ // // ==--== // -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Collections.Generic; using System.Diagnostics.Contracts; -using System.Diagnostics.Tracing; using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -1203,7 +1202,7 @@ namespace System.Runtime.InteropServices.WindowsRuntime return false; } -#if FEATURE_COMINTEROP_MANAGED_ACTIVATION +#if FEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION // Get an IActivationFactory * for a managed type [SecurityCritical] internal static IntPtr GetActivationFactoryForType(Type type) @@ -1279,25 +1278,18 @@ namespace System.Runtime.InteropServices.WindowsRuntime if (type == null) throw new ArgumentNullException("type"); -#if !FEATURE_CORECLR - if (FrameworkEventSource.IsInitialized && FrameworkEventSource.Log.IsEnabled(EventLevel.Informational, FrameworkEventSource.Keywords.DynamicTypeUsage)) - { - FrameworkEventSource.Log.WindowsRuntimeMarshalGetActivationFactory(type.GetFullNameForEtw()); - } -#endif - if (type.IsWindowsRuntimeObject && type.IsImport) { return (IActivationFactory)Marshal.GetNativeActivationFactory(type); } else { -#if !FEATURE_CORECLR +#if FEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION return GetManagedActivationFactory(type); -#else // FEATURE_CORECLR +#else // Managed factories are not supported so as to minimize public surface (and test effort) throw new NotSupportedException(); -#endif // !FEATURE_CORECLR +#endif } } diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemetadata.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemetadata.cs index 137a190b607..ff320ed95cd 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemetadata.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemetadata.cs @@ -4,7 +4,7 @@ // // ==--== // -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> namespace System.Runtime.InteropServices.WindowsRuntime { diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/winrtclassactivator.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/winrtclassactivator.cs index 3de33410c57..0aa99ce421f 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/winrtclassactivator.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/winrtclassactivator.cs @@ -4,7 +4,7 @@ // // ==--== // -// <OWNER>[....]</OWNER> +// <OWNER>Microsoft</OWNER> using System; using System.Security; |