diff options
| author | Sebastien Pouliot <sebastien@ximian.com> | 2011-03-09 17:51:53 +0300 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@ximian.com> | 2011-03-10 22:33:31 +0300 |
| commit | 7e6233e011a1cf37f4338652bb40c78d652cb308 (patch) | |
| tree | 137c4ec1a5cfdfcab0ebf88599b9ca4935e23052 /mcs/class/corlib | |
| parent | 4bb6db5f040572c253bee17e9972ea765ec3a0d1 (diff) | |
Add some missing API into Moonlight
* System.Runtime.Versioning/ComponentGuaranteesAttribute.cs:
* System.Runtime.Versioning/ComponentGuaranteesOptions.cs:
Add || MOONLIGHT
* System.Security.Permissions/SecurityAction.cs
* System/ContextStaticAttribute.cs
* System/ExecutionEngineException.cs
Make sure the [Obsolete] attributes are present in moonlight
* moonlight_raw_corlib.dll.sources: Include both System.Runtime.Versioning
ComponentGuarantees[Attribute|Options] into moonlight build
Diffstat (limited to 'mcs/class/corlib')
6 files changed, 13 insertions, 8 deletions
diff --git a/mcs/class/corlib/System.Runtime.Versioning/ComponentGuaranteesAttribute.cs b/mcs/class/corlib/System.Runtime.Versioning/ComponentGuaranteesAttribute.cs index f84f9a9b05d..969a1305458 100644 --- a/mcs/class/corlib/System.Runtime.Versioning/ComponentGuaranteesAttribute.cs +++ b/mcs/class/corlib/System.Runtime.Versioning/ComponentGuaranteesAttribute.cs @@ -26,7 +26,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_4_0 +#if NET_4_0 || MOONLIGHT namespace System.Runtime.Versioning { @@ -50,4 +50,4 @@ namespace System.Runtime.Versioning } } -#endif
\ No newline at end of file +#endif diff --git a/mcs/class/corlib/System.Runtime.Versioning/ComponentGuaranteesOptions.cs b/mcs/class/corlib/System.Runtime.Versioning/ComponentGuaranteesOptions.cs index df843aeff87..d068e653b4c 100644 --- a/mcs/class/corlib/System.Runtime.Versioning/ComponentGuaranteesOptions.cs +++ b/mcs/class/corlib/System.Runtime.Versioning/ComponentGuaranteesOptions.cs @@ -26,7 +26,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_4_0 +#if NET_4_0 || MOONLIGHT namespace System.Runtime.Versioning { diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs b/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs index 8e9caf0026b..6d579b30ed3 100644 --- a/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs +++ b/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs @@ -43,22 +43,22 @@ namespace System.Security.Permissions { public enum SecurityAction { Demand = 2, Assert = 3, -#if NET_4_0 +#if NET_4_0 || MOONLIGHT [Obsolete ("This requests should not be used")] #endif Deny = 4, PermitOnly = 5, LinkDemand = 6, InheritanceDemand = 7, -#if NET_4_0 +#if NET_4_0 || MOONLIGHT [Obsolete ("This requests should not be used")] #endif RequestMinimum = 8, -#if NET_4_0 +#if NET_4_0 || MOONLIGHT [Obsolete ("This requests should not be used")] #endif RequestOptional = 9, -#if NET_4_0 +#if NET_4_0 || MOONLIGHT [Obsolete ("This requests should not be used")] #endif RequestRefuse = 10, diff --git a/mcs/class/corlib/System/ContextStaticAttribute.cs b/mcs/class/corlib/System/ContextStaticAttribute.cs index 9593d24a2df..b4906122acd 100644 --- a/mcs/class/corlib/System/ContextStaticAttribute.cs +++ b/mcs/class/corlib/System/ContextStaticAttribute.cs @@ -36,6 +36,9 @@ namespace System /// <summary> /// The ContextStatic attribute is used to flag fields as being unique /// </summary> +#if MOONLIGHT + [Obsolete ("Not supported by the Silverlight runtime", true)] +#endif [AttributeUsage (AttributeTargets.Field, Inherited=false)] [Serializable] [ComVisible (true)] diff --git a/mcs/class/corlib/System/ExecutionEngineException.cs b/mcs/class/corlib/System/ExecutionEngineException.cs index f23140d9594..980d85155a0 100644 --- a/mcs/class/corlib/System/ExecutionEngineException.cs +++ b/mcs/class/corlib/System/ExecutionEngineException.cs @@ -35,7 +35,7 @@ using System.Runtime.InteropServices; namespace System { -#if NET_4_0 +#if NET_4_0 || MOONLIGHT [Obsolete] #endif [Serializable] diff --git a/mcs/class/corlib/moonlight_raw_corlib.dll.sources b/mcs/class/corlib/moonlight_raw_corlib.dll.sources index f1bf056dd0e..27e01fbcfbb 100644 --- a/mcs/class/corlib/moonlight_raw_corlib.dll.sources +++ b/mcs/class/corlib/moonlight_raw_corlib.dll.sources @@ -854,6 +854,8 @@ System.Runtime.Serialization.Formatters.Binary/CodeGenerator.cs System.Runtime.Serialization.Formatters.Binary/ObjectReader.cs System.Runtime.Serialization.Formatters.Binary/ObjectWriter.cs System.Runtime.Serialization.Formatters.Binary/MessageFormatter.cs +System.Runtime.Versioning/ComponentGuaranteesAttribute.cs +System.Runtime.Versioning/ComponentGuaranteesOptions.cs System.Runtime.Versioning/ResourceExposureAttribute.cs System.Runtime.Versioning/ResourceScope.cs System.Runtime.Versioning/TargetFrameworkAttribute.cs |