Merge branch 'v3.4' into oauth2

Conflicts:
	projecttemplates/RelyingPartyDatabase/RelyingPartyDatabase.dbproj
	projecttemplates/RelyingPartyLogic/CreateDatabase.sql
	samples/OAuthConsumerWpf/OAuthConsumerWpf.csproj
	src/DotNetOpenAuth.Test/Messaging/MessagingUtilitiesTests.cs
	src/DotNetOpenAuth.Test/OAuth/ChannelElements/OAuthChannelTests.cs
	src/DotNetOpenAuth/Messaging/MessagingStrings.resx
	src/DotNetOpenAuth/Messaging/MessagingUtilities.cs
	src/DotNetOpenAuth/OAuth/ChannelElements/OAuthChannel.cs
	src/version.txt

1 files changed, 48 insertions, 0 deletions

diff --git a/tools/NUnit/samples/cpp/managed/failures/cppsample.cpp b/tools/NUnit/samples/cpp/managed/failures/cppsample.cpp
new file mode 100644
index 0000000..dac7156
--- /dev/null
+++ b/tools/NUnit/samples/cpp/managed/failures/cppsample.cpp
@@ -0,0 +1,48 @@
+// ****************************************************************
+// This is free software licensed under the NUnit license. You
+// may obtain a copy of the license as well as information regarding
+// copyright ownership at http://nunit.org/?p=license&r=2.4.
+// ****************************************************************
+
+#include "cppsample.h"
+
+namespace NUnitSamples {
+
+	void SimpleCPPSample::Init() {
+		fValue1 = 2;
+		fValue2 = 3;
+	}
+
+	void SimpleCPPSample::Add() {
+		int result = fValue1 + fValue2;
+		Assert::AreEqual(6,result);
+	}
+
+	void SimpleCPPSample::DivideByZero()
+	{
+		int zero= 0;
+		int result= 8/zero;
+	}
+
+	void SimpleCPPSample::Equals() {
+		Assert::AreEqual(12, 12, "Integer");
+		Assert::AreEqual(12L, 12L, "Long");
+		Assert::AreEqual('a', 'a', "Char");
+
+
+		Assert::AreEqual(12, 13, "Expected Failure (Integer)");
+		Assert::AreEqual(12.0, 11.99, 0.0, "Expected Failure (Double)");
+	}
+
+	void SimpleCPPSample::IgnoredTest()
+	{
+		throw new InvalidCastException();
+	}
+
+	void SimpleCPPSample::ExpectAnException()
+	{
+		throw new InvalidCastException();
+	}
+
+}
+