Merge branch 'v4.0'

5 files changed, 40 insertions, 8 deletions

diff --git a/nuget/DotNetOpenAuth.OpenId.nuspec b/nuget/DotNetOpenAuth.OpenId.nuspec
index 0b98364..cbac5f8 100644
--- a/nuget/DotNetOpenAuth.OpenId.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.nuspec
@@ -51,7 +51,8 @@
 		<file src="$OutputPath40$Mono.Math.xml" target="lib\net40-full\" />
 		<file src="$OutputPath45$Mono.Math.xml" target="lib\net45-full\" />
 
-		<file src="content\OpenId.Core\web.config.transform" target="content\web.config.transform" />
+		<file src="content\OpenId.Core\net35-full\web.config.transform" target="content\net35-full\" />
+		<file src="content\OpenId.Core\net40-full\web.config.transform" target="content\net40-full\" />
 
 		<file src="..\src\$Identity$\**\*.cs" target="src\$identity$" exclude="..\src\$Identity$\obj\**" />
 		<file src="$GeneratedAssemblyInfoSourceFile$" target="src\$identity$" />
diff --git a/nuget/DotNetOpenAuth.Ultimate.nuspec b/nuget/DotNetOpenAuth.Ultimate.nuspec
index 0dfbb3a..51fc85b 100644
--- a/nuget/DotNetOpenAuth.Ultimate.nuspec
+++ b/nuget/DotNetOpenAuth.Ultimate.nuspec
@@ -34,5 +34,6 @@
 		<file src="content\Ultimate\web.config.transform" target="content\web.config.transform" />
 
 		<file src="..\src\**\*.cs" target="src" exclude="..\src\*\obj\**" />
+		<file src="$IntermediatePath$*.Version.cs" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/content/OpenId.Core/web.config.transform b/nuget/content/OpenId.Core/net35-full/web.config.transform
index a61011b..39ad0c9 100644
--- a/nuget/content/OpenId.Core/web.config.transform
+++ b/nuget/content/OpenId.Core/net35-full/web.config.transform
@@ -1,19 +1,15 @@
 <configuration>
 	<configSections>
-		<!-- The following section is necessary iff targeting .NET 3.5.  It is incompatible with .NET 4.0.
-		<section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />-->
+		<section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 		<sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
 			<section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />
 		</sectionGroup>
 	</configSections>
 
 	<uri>
-		<!-- See an error due to this section?  When targeting .NET 3.5, please add the following line to your <configSections> at the top of this file:
-		<section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-		-->
 		<!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
-	     which is necessary for OpenID urls with unicode characters in the domain/host name. 
-	     It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
+		     which is necessary for OpenID urls with unicode characters in the domain/host name.
+		     It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
 		<idn enabled="All"/>
 		<iriParsing enabled="true"/>
 	</uri>
diff --git a/nuget/content/OpenId.Core/net40-full/web.config.transform b/nuget/content/OpenId.Core/net40-full/web.config.transform
new file mode 100644
index 0000000..5e77207
--- /dev/null
+++ b/nuget/content/OpenId.Core/net40-full/web.config.transform
@@ -0,0 +1,34 @@
+<configuration>
+	<configSections>
+		<sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
+			<section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />
+		</sectionGroup>
+	</configSections>
+
+	<uri>
+		<!-- The uri section is necessary to turn on .NET 3.5 support for IDN (international domain names),
+		     which is necessary for OpenID urls with unicode characters in the domain/host name.
+		     It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
+		<idn enabled="All"/>
+		<iriParsing enabled="true"/>
+	</uri>
+
+	<runtime>
+		<!-- When targeting ASP.NET MVC 3, this assemblyBinding makes MVC 1 and 2 references relink
+		     to MVC 3 so libraries such as DotNetOpenAuth that compile against MVC 1 will work with it.
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+		 -->
+	</runtime>
+
+	<dotNetOpenAuth>
+		<!-- This is an optional configuration section where aspects of dotnetopenauth can be customized. -->
+		<!-- For a complete set of configuration options see http://www.dotnetopenauth.net/developers/code-snippets/configuration-options/ -->
+		<openid>
+		</openid>
+	</dotNetOpenAuth>
+</configuration>
\ No newline at end of file
diff --git a/tools/NuGet/NuGet.exe b/tools/NuGet/NuGet.exe
index 74d0d57..e313ff9 100644
--- a/tools/NuGet/NuGet.exe
+++ b/tools/NuGet/NuGet.exe