mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.3.2.467

Browse Source 
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/System/Test/System.ComponentModel/AttributeCollectionTest.cs
View File

@@ -35,7 +35,6 @@ namespace MonoTests.System.ComponentModel {
[TestFixture]
public class AttributeCollectionTest {
#if NET_4_0
[Test]
public void Ctor_4_0 ()
{
@@ -76,7 +75,6 @@ namespace MonoTests.System.ComponentModel {
return Attributes;
}
}
#endif
}
}

2
mcs/class/System/Test/System.ComponentModel/CultureInfoConverterTest.cs
View File

@@ -197,7 +197,6 @@ namespace MonoTests.System.ComponentModel
}
}
#if NET_4_0
[Test]
public void GetCultureName ()
{
@@ -217,6 +216,5 @@ namespace MonoTests.System.ComponentModel
return base.GetCultureName (culture);
}
}
#endif
}
}

2
mcs/class/System/Test/System.ComponentModel/DateTimeOffsetConverterTests.cs
View File

@@ -26,7 +26,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_4_0 && !MOBILE
#if !MOBILE
using System;
using System.ComponentModel;

4
mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs
View File

@@ -400,10 +400,8 @@ namespace MonoTests.System.ComponentModel
#if MOBILE
[TypeConverter("System.ComponentModel.CharConverter, System, Version=2.0.5.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
#elif NET_4_0
[TypeConverter("System.ComponentModel.CharConverter, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
#else
[TypeConverter("System.ComponentModel.CharConverter, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
[TypeConverter("System.ComponentModel.CharConverter, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
#endif
public virtual Version WithConverterNamedAssmQuald {
get { return null; }

2
mcs/class/System/Test/System.ComponentModel/TypeDescriptionProviderTest.cs
View File

@@ -37,7 +37,6 @@ namespace MonoTests.System.ComponentModel
[TestFixture]
public class TypeDescriptionProviderTest
{
#if NET_4_0
[Test]
public void IsSupportedType ()
{
@@ -71,7 +70,6 @@ namespace MonoTests.System.ComponentModel
return base.GetExtenderProviders (instance);
}
}
#endif
}
}