Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/mcs
diff options
context:
space:
mode:
authorMartin Baulig <martin.baulig@xamarin.com>2013-06-07 05:38:33 +0400
committerMartin Baulig <martin.baulig@xamarin.com>2013-06-07 05:39:55 +0400
commit43dff8bd0aa04c1c154557a22b5872f29712712e (patch)
tree086e691543d6dccd36c307a2244482a0913cfd11 /mcs
parente37d1d61034ba145322bd77cdde6181f3ad28ddd (diff)
[System.ComponentModel.Composition]: Disable RefEmit classes on MonoTouch.
Diffstat (limited to 'mcs')
-rw-r--r--mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/Microsoft/Internal/GenerationServices.cs2
-rw-r--r--mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/System/ComponentModel/Composition/MetadataViewGenerator.cs4
-rw-r--r--mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/System/ComponentModel/Composition/MetadataViewProvider.cs6
3 files changed, 11 insertions, 1 deletions
diff --git a/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/Microsoft/Internal/GenerationServices.cs b/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/Microsoft/Internal/GenerationServices.cs
index 455b7ce27fe..b6ac428a3c8 100644
--- a/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/Microsoft/Internal/GenerationServices.cs
+++ b/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/Microsoft/Internal/GenerationServices.cs
@@ -1,3 +1,4 @@
+#if !MONOTOUCH
// -----------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All rights reserved.
// -----------------------------------------------------------------------
@@ -331,3 +332,4 @@ namespace Microsoft.Internal
}
}
}
+#endif
diff --git a/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/System/ComponentModel/Composition/MetadataViewGenerator.cs b/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/System/ComponentModel/Composition/MetadataViewGenerator.cs
index b9f2c41fef0..9199e0ede3e 100644
--- a/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/System/ComponentModel/Composition/MetadataViewGenerator.cs
+++ b/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/System/ComponentModel/Composition/MetadataViewGenerator.cs
@@ -1,4 +1,5 @@
-// -----------------------------------------------------------------------
+#if !MONOTOUCH
+// -----------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All rights reserved.
// -----------------------------------------------------------------------
using System;
@@ -379,3 +380,4 @@ namespace System.ComponentModel.Composition
}
}
+#endif
diff --git a/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/System/ComponentModel/Composition/MetadataViewProvider.cs b/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/System/ComponentModel/Composition/MetadataViewProvider.cs
index 6c660fcf658..3ac6fd68598 100644
--- a/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/System/ComponentModel/Composition/MetadataViewProvider.cs
+++ b/mcs/class/System.ComponentModel.Composition.4.5/src/ComponentModel/System/ComponentModel/Composition/MetadataViewProvider.cs
@@ -32,6 +32,7 @@ namespace System.ComponentModel.Composition
{
if(!metadataViewType.IsAttributeDefined<MetadataViewImplementationAttribute>())
{
+#if !MONOTOUCH
try
{
proxyType = MetadataViewGenerator.GenerateView(metadataViewType);
@@ -40,6 +41,9 @@ namespace System.ComponentModel.Composition
{
throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture, Strings.NotSupportedInterfaceMetadataView, metadataViewType.FullName), ex);
}
+#else
+ throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture, Strings.NotSupportedInterfaceMetadataView, metadataViewType.FullName));
+#endif
}
else
{
@@ -83,6 +87,7 @@ namespace System.ComponentModel.Composition
}
catch (TargetInvocationException ex)
{
+#if !MONOTOUCH
//Unwrap known failures that we want to present as CompositionContractMismatchException
if(metadataViewType.IsInterface)
{
@@ -107,6 +112,7 @@ namespace System.ComponentModel.Composition
ex.InnerException.Data[MetadataViewGenerator.MetadataItemTargetType]), ex);
}
}
+#endif
throw;
}
}