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

1 files changed, 73 insertions, 0 deletions

diff --git a/samples/OpenIdRelyingPartyWebFormsVB/My Project/MyExtensions/MyWebExtension.vb b/samples/OpenIdRelyingPartyWebFormsVB/My Project/MyExtensions/MyWebExtension.vb
new file mode 100644
index 0000000..78c7c19
--- /dev/null
+++ b/samples/OpenIdRelyingPartyWebFormsVB/My Project/MyExtensions/MyWebExtension.vb
@@ -0,0 +1,73 @@
+#If _MyType <> "Empty" Then
+
+Namespace My
+    ''' <summary>
+    ''' Module used to define the properties that are available in the My Namespace for Web projects.
+    ''' </summary>
+    ''' <remarks></remarks>
+    <Global.Microsoft.VisualBasic.HideModuleName()> _
+    Module MyWebExtension
+        Private s_Computer As New ThreadSafeObjectProvider(Of Global.Microsoft.VisualBasic.Devices.ServerComputer)
+        Private s_User As New ThreadSafeObjectProvider(Of Global.Microsoft.VisualBasic.ApplicationServices.WebUser)
+        Private s_Log As New ThreadSafeObjectProvider(Of Global.Microsoft.VisualBasic.Logging.AspLog)
+        ''' <summary>
+        ''' Returns information about the host computer.
+        ''' </summary>
+        <Global.System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")> _
+        Friend ReadOnly Property Computer() As Global.Microsoft.VisualBasic.Devices.ServerComputer
+            Get
+                Return s_Computer.GetInstance()
+            End Get
+        End Property
+        ''' <summary>
+        ''' Returns information for the current Web user.
+        ''' </summary>
+        <Global.System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")> _
+        Friend ReadOnly Property User() As Global.Microsoft.VisualBasic.ApplicationServices.WebUser
+            Get
+                Return s_User.GetInstance()
+            End Get
+        End Property
+        ''' <summary>
+        ''' Returns Request object.
+        ''' </summary>
+        <Global.System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")> _
+        <Global.System.ComponentModel.Design.HelpKeyword("My.Request")> _
+        Friend ReadOnly Property Request() As Global.System.Web.HttpRequest
+            <Global.System.Diagnostics.DebuggerHidden()> _
+            Get
+                Dim CurrentContext As Global.System.Web.HttpContext = Global.System.Web.HttpContext.Current
+                If CurrentContext IsNot Nothing Then
+                    Return CurrentContext.Request
+                End If
+                Return Nothing
+            End Get
+        End Property
+        ''' <summary>
+        ''' Returns Response object.
+        ''' </summary>
+        <Global.System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")> _
+         <Global.System.ComponentModel.Design.HelpKeyword("My.Response")> _
+         Friend ReadOnly Property Response() As Global.System.Web.HttpResponse
+            <Global.System.Diagnostics.DebuggerHidden()> _
+            Get
+                Dim CurrentContext As Global.System.Web.HttpContext = Global.System.Web.HttpContext.Current
+                If CurrentContext IsNot Nothing Then
+                    Return CurrentContext.Response
+                End If
+                Return Nothing
+            End Get
+        End Property
+        ''' <summary>
+        ''' Returns the Asp log object.
+        ''' </summary>
+        <Global.System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")> _
+        Friend ReadOnly Property Log() As Global.Microsoft.VisualBasic.Logging.AspLog
+            Get
+                Return s_Log.GetInstance()
+            End Get
+        End Property
+     End Module
+End Namespace
+
+#End If
\ No newline at end of file