Merge branch 'master' into master-Dev10

Conflicts:
	build.proj
	lib/DotNetOpenAuth.BuildTasks.dll
	lib/DotNetOpenAuth.BuildTasks.pdb
	src/DotNetOpenAuth.Test/Messaging/MessagingUtilitiesTests.cs
	src/DotNetOpenAuth.Test/Messaging/MultiPartPostPartTests.cs
	src/DotNetOpenAuth.sln
	src/DotNetOpenAuth.vsmdi
	src/DotNetOpenAuth/OAuth/OAuthStrings.Designer.cs

2 files changed, 56 insertions, 0 deletions

diff --git a/samples/OpenIdRelyingPartyWebFormsVB/Code/State.vb b/samples/OpenIdRelyingPartyWebFormsVB/Code/State.vb
new file mode 100644
index 0000000..e00cb4f
--- /dev/null
+++ b/samples/OpenIdRelyingPartyWebFormsVB/Code/State.vb
@@ -0,0 +1,46 @@
+Imports DotNetOpenAuth.OpenId.Extensions.ProviderAuthenticationPolicy
+Imports DotNetOpenAuth.OpenId.Extensions.SimpleRegistration
+Imports DotNetOpenAuth.OpenId.Extensions.AttributeExchange
+
+Public Class State
+	Public Shared Property ProfileFields() As ClaimsResponse
+		Get
+			Return HttpContext.Current.Session("ProfileFields")
+		End Get
+		Set(ByVal value As ClaimsResponse)
+			HttpContext.Current.Session("ProfileFields") = value
+		End Set
+	End Property
+
+	Public Shared Property FetchResponse() As FetchResponse
+		Get
+			Return HttpContext.Current.Session("FetchResponse")
+		End Get
+		Set(ByVal value As FetchResponse)
+			HttpContext.Current.Session("FetchResponse") = value
+		End Set
+	End Property
+
+	Public Shared Property FriendlyLoginName() As String
+		Get
+			Return HttpContext.Current.Session("FriendlyLoginName")
+		End Get
+		Set(ByVal value As String)
+			HttpContext.Current.Session("FriendlyLoginName") = value
+		End Set
+	End Property
+
+	Public Shared Property PapePolicies() As PolicyResponse
+		Get
+			Return HttpContext.Current.Session("PapePolicies")
+		End Get
+		Set(ByVal value As PolicyResponse)
+			HttpContext.Current.Session("PapePolicies") = value
+		End Set
+	End Property
+
+	Public Shared Sub Clear()
+		FriendlyLoginName = Nothing
+	End Sub
+
+End Class
diff --git a/samples/OpenIdRelyingPartyWebFormsVB/Code/TracePageAppender.vb b/samples/OpenIdRelyingPartyWebFormsVB/Code/TracePageAppender.vb
new file mode 100644
index 0000000..dfc2db5
--- /dev/null
+++ b/samples/OpenIdRelyingPartyWebFormsVB/Code/TracePageAppender.vb
@@ -0,0 +1,10 @@
+Imports System.IO
+
+Public Class TracePageAppender
+	Inherits log4net.Appender.AppenderSkeleton
+
+	Protected Overrides Sub Append(ByVal loggingEvent As log4net.Core.LoggingEvent)
+		Dim sw As StringWriter = New StringWriter(Global_asax.LogMessages)
+		Layout.Format(sw, loggingEvent)
+	End Sub
+End Class
\ No newline at end of file