Merge pull request #143 from dotnetjunky/v4.0a

Update a resource string for error message. Move the DefaultNamespace el...

3 files changed, 6 insertions, 4 deletions

diff --git a/src/DotNetOpenAuth.AspNet/DotNetOpenAuth.AspNet.csproj b/src/DotNetOpenAuth.AspNet/DotNetOpenAuth.AspNet.csproj
index 8779ddc..2f03ec7 100644
--- a/src/DotNetOpenAuth.AspNet/DotNetOpenAuth.AspNet.csproj
+++ b/src/DotNetOpenAuth.AspNet/DotNetOpenAuth.AspNet.csproj
@@ -8,7 +8,6 @@
     <ProjectGuid>{51835086-9611-4C53-819B-F2D5C9320873}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DotNetOpenAuth.AspNet</RootNamespace>
     <AssemblyName>DotNetOpenAuth.AspNet</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <CodeAnalysisRuleSet>ExtendedDesignGuidelineRules.ruleset</CodeAnalysisRuleSet>
@@ -28,6 +27,9 @@
   </PropertyGroup>
   <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.props" />
   <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.Product.props" />
+  <PropertyGroup>
+     <RootNamespace>DotNetOpenAuth.AspNet</RootNamespace>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/src/DotNetOpenAuth.AspNet/WebResources.Designer.cs b/src/DotNetOpenAuth.AspNet/WebResources.Designer.cs
index ac49678..fd79a73 100644
--- a/src/DotNetOpenAuth.AspNet/WebResources.Designer.cs
+++ b/src/DotNetOpenAuth.AspNet/WebResources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.488
+//     Runtime Version:4.0.30319.544
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -97,7 +97,7 @@ namespace DotNetOpenAuth.AspNet {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This operation is not supported on the current provider..
+        ///   Looks up a localized string similar to This operation is not supported on the current provider. Call the overload of VerifyAuthentication() which accepts a return url..
         /// </summary>
         internal static string OAuthRequireReturnUrl {
             get {
diff --git a/src/DotNetOpenAuth.AspNet/WebResources.resx b/src/DotNetOpenAuth.AspNet/WebResources.resx
index 2ed19df..c1552e9 100644
--- a/src/DotNetOpenAuth.AspNet/WebResources.resx
+++ b/src/DotNetOpenAuth.AspNet/WebResources.resx
@@ -130,7 +130,7 @@
     <value>An OAuth data provider has already been registered for this application.</value>
   </data>
   <data name="OAuthRequireReturnUrl" xml:space="preserve">
-    <value>This operation is not supported on the current provider.</value>
+    <value>This operation is not supported on the current provider. Call the overload of VerifyAuthentication() which accepts a return url.</value>
   </data>
   <data name="OpenIDFailedToGetResponse" xml:space="preserve">
     <value>Failed to obtain the authentication response from service provider.</value>