diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2011-10-10 14:29:00 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2011-10-10 14:29:00 -0700 |
| commit | cb9ac7c41553b80b380b35d33ecb36222958c42f (patch) | |
| tree | d2340858ff8b97dadb57390b7aeb23aeb71e3d43 | |
| parent | a5d9b6928598b72fb3baeb4485aaf0f34cc61e2e (diff) | |
| download | DotNetOpenAuth-cb9ac7c41553b80b380b35d33ecb36222958c42f.zip DotNetOpenAuth-cb9ac7c41553b80b380b35d33ecb36222958c42f.tar.gz DotNetOpenAuth-cb9ac7c41553b80b380b35d33ecb36222958c42f.tar.bz2 | |
Removed dependencies on PresentationFramework and WindowsBase when targeting .NET 4.0
| -rw-r--r-- | src/DotNetOpenAuth.Messaging/Configuration/TypeConfigurationElement.cs | 8 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.Product.props | 14 |
2 files changed, 16 insertions, 6 deletions
diff --git a/src/DotNetOpenAuth.Messaging/Configuration/TypeConfigurationElement.cs b/src/DotNetOpenAuth.Messaging/Configuration/TypeConfigurationElement.cs index 0335af5..fb1dee0 100644 --- a/src/DotNetOpenAuth.Messaging/Configuration/TypeConfigurationElement.cs +++ b/src/DotNetOpenAuth.Messaging/Configuration/TypeConfigurationElement.cs @@ -11,7 +11,11 @@ namespace DotNetOpenAuth.Configuration { using System.IO; using System.Reflection; using System.Web; +#if CLR4 + using System.Xaml; +#else using System.Windows.Markup; +#endif using DotNetOpenAuth.Messaging; /// <summary> @@ -127,7 +131,11 @@ namespace DotNetOpenAuth.Configuration { /// </remarks> private static T CreateInstanceFromXaml(Stream xaml) { Contract.Ensures(Contract.Result<T>() != null); +#if CLR4 + return (T)XamlServices.Load(xaml); +#else return (T)XamlReader.Load(xaml); +#endif } } } diff --git a/tools/DotNetOpenAuth.Product.props b/tools/DotNetOpenAuth.Product.props index edb94e4..971ed7b 100644 --- a/tools/DotNetOpenAuth.Product.props +++ b/tools/DotNetOpenAuth.Product.props @@ -89,9 +89,6 @@ http://opensource.org/licenses/ms-pl.html <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> </Reference> - <Reference Include="PresentationFramework"> - <RequiredTargetFramework>3.0</RequiredTargetFramework> - </Reference> <Reference Include="System" /> <Reference Include="System.Security" /> <Reference Include="System.configuration" /> @@ -133,9 +130,6 @@ http://opensource.org/licenses/ms-pl.html <Reference Include="System.Xml.Linq"> <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> - <Reference Include="WindowsBase"> - <RequiredTargetFramework>3.0</RequiredTargetFramework> - </Reference> <Reference Include="System.ComponentModel.DataAnnotations"> <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> @@ -151,5 +145,13 @@ http://opensource.org/licenses/ms-pl.html which will definitely have MVC 2 available. --> <Reference Include="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" /> <Reference Include="System.Web.Mobile" /> + <Reference Include="PresentationFramework"> + <!-- For XamlReader, but we use System.Xaml.dll in .NET 4.0 --> + <RequiredTargetFramework>3.0</RequiredTargetFramework> + </Reference> + <Reference Include="WindowsBase"> + <!-- ObservableCollection<T>, moved to System.dll in .NET 4.0 --> + <RequiredTargetFramework>3.0</RequiredTargetFramework> + </Reference> </ItemGroup> </Project> |