Removed a lot of DataContract references.

11 files changed, 10 insertions, 12 deletions

diff --git a/src/DotNetOAuth.Test/Messaging/Reflection/MessagePartTests.cs b/src/DotNetOAuth.Test/Messaging/Reflection/MessagePartTests.cs
index b6c3b9d..0dba07b 100644
--- a/src/DotNetOAuth.Test/Messaging/Reflection/MessagePartTests.cs
+++ b/src/DotNetOAuth.Test/Messaging/Reflection/MessagePartTests.cs
@@ -6,6 +6,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using DotNetOAuth.Messaging.Reflection;

 using System.Reflection;

 using DotNetOAuth.Test.Mocks;

+using DotNetOAuth.Messaging;

 

 namespace DotNetOAuth.Test.Messaging.Reflection {

 	[TestClass]

@@ -34,7 +35,7 @@ namespace DotNetOAuth.Test.Messaging.Reflection {
 		}

 		class MessageWithNullableRequiredStruct : TestMessage {

 			[MessagePart(IsRequired = true)]

-			internal int? optionalInt;

+			internal int? optionalInt = null;

 		}

 

 		[TestMethod, ExpectedException(typeof(ArgumentException))]

diff --git a/src/DotNetOAuth.Test/Mocks/TestBaseMessage.cs b/src/DotNetOAuth.Test/Mocks/TestBaseMessage.cs
index 2a8cb30..29a0035 100644
--- a/src/DotNetOAuth.Test/Mocks/TestBaseMessage.cs
+++ b/src/DotNetOAuth.Test/Mocks/TestBaseMessage.cs
@@ -15,7 +15,6 @@ namespace DotNetOAuth.Test.Mocks {
 		string ExplicitProperty { get; set; }

 	}

 

-	[DataContract(Namespace = Protocol.DataContractNamespaceV10)]

 	internal class TestBaseMessage : IProtocolMessage, IBaseMessageExplicitMembers {

 		private Dictionary<string, string> extraData = new Dictionary<string, string>();

 

diff --git a/src/DotNetOAuth.Test/Mocks/TestDerivedMessage.cs b/src/DotNetOAuth.Test/Mocks/TestDerivedMessage.cs
index 69e58aa..9d69495 100644
--- a/src/DotNetOAuth.Test/Mocks/TestDerivedMessage.cs
+++ b/src/DotNetOAuth.Test/Mocks/TestDerivedMessage.cs
@@ -6,9 +6,8 @@
 

 namespace DotNetOAuth.Test.Mocks {

 	using System.Runtime.Serialization;

-	using DotNetOAuth.Messaging.Reflection;

+	using DotNetOAuth.Messaging;

 

-	[DataContract(Namespace = Protocol.DataContractNamespaceV10)]

 	internal class TestDerivedMessage : TestBaseMessage {

 		/// <summary>

 		/// Gets or sets the first value.

diff --git a/src/DotNetOAuth.Test/Mocks/TestDirectedMessage.cs b/src/DotNetOAuth.Test/Mocks/TestDirectedMessage.cs
index 17317f5..6938ef5 100644
--- a/src/DotNetOAuth.Test/Mocks/TestDirectedMessage.cs
+++ b/src/DotNetOAuth.Test/Mocks/TestDirectedMessage.cs
@@ -11,7 +11,6 @@ namespace DotNetOAuth.Test.Mocks {
 	using DotNetOAuth.Messaging;

 	using DotNetOAuth.Messaging.Reflection;

 

-	[DataContract(Namespace = Protocol.DataContractNamespaceV10)]

 	internal class TestDirectedMessage : TestMessage, IDirectedProtocolMessage {

 		internal TestDirectedMessage() {

 		}

diff --git a/src/DotNetOAuth.Test/Mocks/TestExpiringMessage.cs b/src/DotNetOAuth.Test/Mocks/TestExpiringMessage.cs
index 1b06969..19102a9 100644
--- a/src/DotNetOAuth.Test/Mocks/TestExpiringMessage.cs
+++ b/src/DotNetOAuth.Test/Mocks/TestExpiringMessage.cs
@@ -12,7 +12,6 @@ namespace DotNetOAuth.Test.Mocks {
 	using DotNetOAuth.Messaging.Bindings;

 	using DotNetOAuth.Messaging.Reflection;

 

-	[DataContract(Namespace = Protocol.DataContractNamespaceV10)]

 	internal class TestExpiringMessage : TestSignedDirectedMessage, IExpiringProtocolMessage {

 		[DebuggerBrowsable(DebuggerBrowsableState.Never)]

 		private DateTime utcCreationDate;

diff --git a/src/DotNetOAuth.Test/Mocks/TestMessage.cs b/src/DotNetOAuth.Test/Mocks/TestMessage.cs
index aede676..33086f8 100644
--- a/src/DotNetOAuth.Test/Mocks/TestMessage.cs
+++ b/src/DotNetOAuth.Test/Mocks/TestMessage.cs
@@ -11,7 +11,6 @@ namespace DotNetOAuth.Test.Mocks {
 	using DotNetOAuth.Messaging;

 	using DotNetOAuth.Messaging.Reflection;

 

-	[DataContract(Namespace = Protocol.DataContractNamespaceV10)]

 	internal class TestMessage : IProtocolMessage {

 		private MessageTransport transport;

 		private Dictionary<string, string> extraData = new Dictionary<string, string>();

diff --git a/src/DotNetOAuth.Test/Mocks/TestReplayProtectedMessage.cs b/src/DotNetOAuth.Test/Mocks/TestReplayProtectedMessage.cs
index f6c3b39..2a8bf9e 100644
--- a/src/DotNetOAuth.Test/Mocks/TestReplayProtectedMessage.cs
+++ b/src/DotNetOAuth.Test/Mocks/TestReplayProtectedMessage.cs
@@ -10,7 +10,6 @@ namespace DotNetOAuth.Test.Mocks {
 	using DotNetOAuth.Messaging.Bindings;

 	using DotNetOAuth.Messaging.Reflection;

 

-	[DataContract(Namespace = Protocol.DataContractNamespaceV10)]

 	internal class TestReplayProtectedMessage : TestExpiringMessage, IReplayProtectedProtocolMessage {

 		internal TestReplayProtectedMessage() { }

 

diff --git a/src/DotNetOAuth.Test/Mocks/TestSignedDirectedMessage.cs b/src/DotNetOAuth.Test/Mocks/TestSignedDirectedMessage.cs
index bda4255..6149902 100644
--- a/src/DotNetOAuth.Test/Mocks/TestSignedDirectedMessage.cs
+++ b/src/DotNetOAuth.Test/Mocks/TestSignedDirectedMessage.cs
@@ -10,7 +10,6 @@ namespace DotNetOAuth.Test.Mocks {
 	using DotNetOAuth.Messaging.Reflection;

 	using DotNetOAuth.Messaging.Bindings;

 

-	[DataContract(Namespace = Protocol.DataContractNamespaceV10)]

 	internal class TestSignedDirectedMessage : TestDirectedMessage, ITamperResistantProtocolMessage {

 		internal TestSignedDirectedMessage() { }

 

diff --git a/src/DotNetOAuth/DotNetOAuth.csproj b/src/DotNetOAuth/DotNetOAuth.csproj
index f5882ef..65e074a 100644
--- a/src/DotNetOAuth/DotNetOAuth.csproj
+++ b/src/DotNetOAuth/DotNetOAuth.csproj
@@ -68,7 +68,7 @@
   <ItemGroup>

     <Compile Include="Consumer.cs" />

     <Compile Include="IWebRequestHandler.cs" />

-    <Compile Include="Messaging\Reflection\MessagePartAttribute.cs" />

+    <Compile Include="Messaging\MessagePartAttribute.cs" />

     <Compile Include="Messaging\MessageProtection.cs" />

     <Compile Include="Messaging\IChannelBindingElement.cs" />

     <Compile Include="Messaging\Bindings\ReplayedMessageException.cs" />

diff --git a/src/DotNetOAuth/Messaging/Reflection/MessagePartAttribute.cs b/src/DotNetOAuth/Messaging/MessagePartAttribute.cs
index c8bb8f5..a8de784 100644
--- a/src/DotNetOAuth/Messaging/Reflection/MessagePartAttribute.cs
+++ b/src/DotNetOAuth/Messaging/MessagePartAttribute.cs
@@ -4,14 +4,13 @@
 // </copyright>

 //-----------------------------------------------------------------------

 

-namespace DotNetOAuth.Messaging.Reflection {

+namespace DotNetOAuth.Messaging {

 	using System;

 	using System.Net.Security;

 	using System.Reflection;

 

 	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, Inherited = true, AllowMultiple = false)]

 	internal sealed class MessagePartAttribute : Attribute {

-		private bool initialized;

 		private string name;

 

 		internal MessagePartAttribute() {

diff --git a/src/DotNetOAuth/Messaging/MessageProtection.cs b/src/DotNetOAuth/Messaging/MessageProtection.cs
index b87c12d..a50ccf5 100644
--- a/src/DotNetOAuth/Messaging/MessageProtection.cs
+++ b/src/DotNetOAuth/Messaging/MessageProtection.cs
@@ -37,5 +37,10 @@ namespace DotNetOAuth.Messaging {
 		/// A binding element that prepares messages for replay detection and detects replayed messages on the receiving side.

 		/// </summary>

 		ReplayProtection = 0x4,

+

+		/// <summary>

+		/// All forms of protection together.

+		/// </summary>

+		All = TamperProtection | Expiration | ReplayProtection,

 	}

 }
\ No newline at end of file