diff options
| author | Ludovic Henry <ludovic@xamarin.com> | 2016-08-17 18:40:30 +0300 |
|---|---|---|
| committer | Ludovic Henry <ludovic@xamarin.com> | 2016-08-18 17:34:36 +0300 |
| commit | 249daf43de9c64fefe9f103fc15bb462665b0167 (patch) | |
| tree | 9c18ba262b604ee5b6d153444ffdee94eb4ec8c3 /mcs/class/System.Xaml | |
| parent | 86e6221becd662c7e4f8f5e1284146c66da5c4a1 (diff) | |
[mcs] Replace NET_2_1 by MOBILE
NET_2_1 is also defined whenever we define MOBILE, so they have the same effect. Silverlight was 2.1 but it's been dead for a while now, and we do not even support it.
Diffstat (limited to 'mcs/class/System.Xaml')
| -rw-r--r-- | mcs/class/System.Xaml/Assembly/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/System.Xaml/Assembly/AssemblyInfo.cs b/mcs/class/System.Xaml/Assembly/AssemblyInfo.cs index 54cd8471352..8581509e354 100644 --- a/mcs/class/System.Xaml/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Xaml/Assembly/AssemblyInfo.cs @@ -54,7 +54,7 @@ using System.Runtime.InteropServices; [assembly: NeutralResourcesLanguage ("en-US")] [assembly: CLSCompliant (true)] [assembly: AssemblyDelaySign (true)] -#if NET_2_1 +#if MOBILE [assembly: AssemblyKeyFile ("../silverlight.pub")] #else [assembly: AssemblyKeyFile ("../ecma.pub")] diff --git a/mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs b/mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs index c7002e5c8ee..ccf8e0f703a 100644 --- a/mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs +++ b/mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs @@ -124,7 +124,7 @@ namespace System.Xaml return TypeDescriptor.GetConverter (type); } - // FIXME: I want this to cover all the existing types and make it valid in both NET_2_1 and !NET_2_1. + // FIXME: I want this to cover all the existing types and make it valid in both MOBILE and !MOBILE. class ConvertibleTypeConverter<T> : TypeConverter { Type type; |