From de4a7d2213db657d014f1b39c6cfd6201732059a Mon Sep 17 00:00:00 2001 From: Markus Ewald Date: Mon, 21 Jul 2014 15:46:40 +0000 Subject: [PATCH] Added support for compilation under the Mono 3.5 profile; removed support for Windows Phone and Xbox 360 git-svn-id: file:///srv/devel/repo-conversion/nusu@310 d2e56fa2-650e-0410-a79f-9358c0239efd --- ...5-unity).csproj => Nuclex.Support (mono-3.5).csproj | 10 +++++----- Source/Cloning/ExpressionTreeCloner.FieldBased.cs | 4 ++-- Source/Cloning/ExpressionTreeCloner.PropertyBased.cs | 4 ++-- Source/Cloning/ExpressionTreeCloner.cs | 4 ++-- Source/Collections/ObservableSet.cs | 4 ++-- Source/Collections/ReadOnlySet.cs | 4 ++-- Source/Collections/Variegator.cs | 4 ++-- Source/ParallelBackgroundWorker.cs | 4 ++++ 8 files changed, 21 insertions(+), 17 deletions(-) rename Nuclex.Support (mono-3.5-unity).csproj => Nuclex.Support (mono-3.5).csproj (96%) diff --git a/Nuclex.Support (mono-3.5-unity).csproj b/Nuclex.Support (mono-3.5).csproj similarity index 96% rename from Nuclex.Support (mono-3.5-unity).csproj rename to Nuclex.Support (mono-3.5).csproj index 1f36480..3a99642 100644 --- a/Nuclex.Support (mono-3.5-unity).csproj +++ b/Nuclex.Support (mono-3.5).csproj @@ -15,8 +15,8 @@ true full false - bin\Debug - DEBUG;NO_SPECIALIZED_COLLECTIONS;NO_CONCURRENT_COLLECTIONS + bin\mono-3.5\Debug\ + DEBUG;NO_SPECIALIZED_COLLECTIONS;NO_CONCURRENT_COLLECTIONS;NO_SETS prompt 4 false @@ -24,11 +24,11 @@ none false - bin\Release + bin\mono-3.5\Release\ prompt 4 false - NO_SPECIALIZED_COLLECTIONS;NO_CONCURRENT_COLLECTIONS + NO_SPECIALIZED_COLLECTIONS;NO_CONCURRENT_COLLECTIONS;NO_SETS @@ -311,4 +311,4 @@ - \ No newline at end of file + diff --git a/Source/Cloning/ExpressionTreeCloner.FieldBased.cs b/Source/Cloning/ExpressionTreeCloner.FieldBased.cs index 4169243..37d5534 100644 --- a/Source/Cloning/ExpressionTreeCloner.FieldBased.cs +++ b/Source/Cloning/ExpressionTreeCloner.FieldBased.cs @@ -18,7 +18,7 @@ License along with this library */ #endregion -#if !(XBOX360 || WINDOWS_PHONE) +#if !NO_SETS using System; using System.Collections.Generic; @@ -677,4 +677,4 @@ namespace Nuclex.Support.Cloning { } // namespace Nuclex.Support.Cloning -#endif // !(XBOX360 || WINDOWS_PHONE) +#endif // !NO_SETS diff --git a/Source/Cloning/ExpressionTreeCloner.PropertyBased.cs b/Source/Cloning/ExpressionTreeCloner.PropertyBased.cs index 1e43845..97e1e25 100644 --- a/Source/Cloning/ExpressionTreeCloner.PropertyBased.cs +++ b/Source/Cloning/ExpressionTreeCloner.PropertyBased.cs @@ -18,7 +18,7 @@ License along with this library */ #endregion -#if !(XBOX360 || WINDOWS_PHONE) +#if !NO_SETS using System; using System.Collections.Generic; @@ -665,4 +665,4 @@ namespace Nuclex.Support.Cloning { } // namespace Nuclex.Support.Cloning -#endif // !(XBOX360 || WINDOWS_PHONE) +#endif // !NO_SETS diff --git a/Source/Cloning/ExpressionTreeCloner.cs b/Source/Cloning/ExpressionTreeCloner.cs index 6b4c6d5..368e000 100644 --- a/Source/Cloning/ExpressionTreeCloner.cs +++ b/Source/Cloning/ExpressionTreeCloner.cs @@ -18,7 +18,7 @@ License along with this library */ #endregion -#if !(XBOX360 || WINDOWS_PHONE) +#if !NO_SETS using System; using System.Collections.Concurrent; @@ -283,4 +283,4 @@ namespace Nuclex.Support.Cloning { } // namespace Nuclex.Support.Cloning -#endif // !(XBOX360 || WINDOWS_PHONE) +#endif // !NO_SETS diff --git a/Source/Collections/ObservableSet.cs b/Source/Collections/ObservableSet.cs index b9555af..1de9a57 100644 --- a/Source/Collections/ObservableSet.cs +++ b/Source/Collections/ObservableSet.cs @@ -27,7 +27,7 @@ using System.Collections; using System.Collections.Specialized; #endif -#if !(WINDOWS_PHONE || XBOX360) +#if !NO_SETS namespace Nuclex.Support.Collections { @@ -338,4 +338,4 @@ namespace Nuclex.Support.Collections { } // namespace Nuclex.Support.Collections -#endif // !(WINDOWS_PHONE || XBOX360) +#endif // !NO_SETS diff --git a/Source/Collections/ReadOnlySet.cs b/Source/Collections/ReadOnlySet.cs index 5b6f2ec..57c42c5 100644 --- a/Source/Collections/ReadOnlySet.cs +++ b/Source/Collections/ReadOnlySet.cs @@ -22,7 +22,7 @@ using System; using System.Collections; using System.Collections.Generic; -#if !(WINDOWS_PHONE || XBOX360) +#if !NO_SETS namespace Nuclex.Support.Collections { @@ -213,4 +213,4 @@ namespace Nuclex.Support.Collections { } // namespace Nuclex.Support.Collections -#endif // !(WINDOWS_PHONE || XBOX360) +#endif // !NO_SETS diff --git a/Source/Collections/Variegator.cs b/Source/Collections/Variegator.cs index 7ed5a44..f16ba01 100644 --- a/Source/Collections/Variegator.cs +++ b/Source/Collections/Variegator.cs @@ -21,7 +21,7 @@ License along with this library using System; using System.Collections.Generic; -#if !(WINDOWS_PHONE || XBOX360) +#if !NO_SETS namespace Nuclex.Support.Collections { @@ -284,4 +284,4 @@ namespace Nuclex.Support.Collections { } // namespace Nuclex.Support.Collections -#endif // !(WINDOWS_PHONE || XBOX360) +#endif // !NO_SETS diff --git a/Source/ParallelBackgroundWorker.cs b/Source/ParallelBackgroundWorker.cs index 0fc9697..ec09b89 100644 --- a/Source/ParallelBackgroundWorker.cs +++ b/Source/ParallelBackgroundWorker.cs @@ -1,3 +1,5 @@ +#if !NO_CONCURRENT_COLLECTIONS + using System; using System.Collections.Concurrent; using System.Collections.Generic; @@ -322,3 +324,5 @@ namespace Nuclex.Support { } } // namespace Nuclex.Support + +#endif // !NO_CONCURRENT_COLLECTIONS