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, 28 insertions, 0 deletions

diff --git a/tools/NUnit/samples/cpp/managed/failures/cppsample.h b/tools/NUnit/samples/cpp/managed/failures/cppsample.h
new file mode 100644
index 0000000..4e47439
--- /dev/null
+++ b/tools/NUnit/samples/cpp/managed/failures/cppsample.h
@@ -0,0 +1,28 @@
+// ****************************************************************
+// 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.
+// ****************************************************************
+
+#pragma once
+
+using namespace System;
+using namespace NUnit::Framework;
+
+namespace NUnitSamples
+{
+	[TestFixture]
+	public __gc class SimpleCPPSample
+	{
+		int fValue1;
+		int fValue2;
+	public:
+		[SetUp] void Init();
+
+		[Test] void Add();
+		[Test] void DivideByZero();
+		[Test] void Equals();
+		[Test] [Ignore("ignored test")] void IgnoredTest();
+		[Test] [ExpectedException(__typeof(InvalidOperationException))] void ExpectAnException();
+	};
+}