Fixed up all existing NuGet packages and added several more. All but UI dll's are now packaged in NuGet.

21 files changed, 312 insertions, 89 deletions

diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll
index 95bb83d..31a5320 100644
--- a/lib/DotNetOpenAuth.BuildTasks.dll
+++ b/lib/DotNetOpenAuth.BuildTasks.dll
diff --git a/lib/DotNetOpenAuth.BuildTasks.pdb b/lib/DotNetOpenAuth.BuildTasks.pdb
index d6cdcfe..7ced5b8 100644
--- a/lib/DotNetOpenAuth.BuildTasks.pdb
+++ b/lib/DotNetOpenAuth.BuildTasks.pdb
diff --git a/nuget/DotNetOpenAuth.Core.nuspec b/nuget/DotNetOpenAuth.Core.nuspec
index 641d2ec..1e16770 100644
--- a/nuget/DotNetOpenAuth.Core.nuspec
+++ b/nuget/DotNetOpenAuth.Core.nuspec
@@ -10,14 +10,20 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains core assemblies of DotNetOpenOAuth library.</description>
+		<summary>Contains core assemblies of DotNetOpenOAuth library.</summary>
+		<description>Shared library implementing the messaging pipeline used by auxiliary DotNetOpenAuth libraries.</description>
+		<language>en-US</language>
 		<frameworkAssemblies>
-			<frameworkAssembly assemblyName="System.Configuration" targetFramework=".NETFramework4.0" />
+			<frameworkAssembly assemblyName="System.Configuration" targetFramework="net40" />
 		</frameworkAssemblies>
 	</metadata>
 	<files>
-		<file src="..\..\bin\v4.0\Release\DotNetOpenAuth.Messaging.dll" target="lib\net40\DotNetOpenAuth.Messaging.dll" />
-		<file src="..\..\bin\v4.0\Release\DotNetOpenAuth.OAuth.dll" target="lib\net40\DotNetOpenAuth.OAuth.dll" />
-		<file src="..\..\bin\v4.0\Release\DotNetOpenAuth.OpenId.dll" target="lib\net40\DotNetOpenAuth.OpenId.dll" />
+		<file src="$OutputPath35$signed\DotNetOpenAuth.Core.dll" target="lib\net35-full\DotNetOpenAuth.Core.dll" />
+		<file src="$OutputPath40$signed\DotNetOpenAuth.Core.dll" target="lib\net40-full\DotNetOpenAuth.Core.dll" />
+
+		<file src="$OutputPath35$DotNetOpenAuth.Core.xml" target="lib\net35-full\DotNetOpenAuth.Core.xml" />
+		<file src="$OutputPath40$DotNetOpenAuth.Core.xml" target="lib\net40-full\DotNetOpenAuth.Core.xml" />
+
+		<file src="content\Core\web.config.transform" target="content\web.config.transform" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.InfoCard.nuspec b/nuget/DotNetOpenAuth.InfoCard.nuspec
new file mode 100644
index 0000000..275fd51
--- /dev/null
+++ b/nuget/DotNetOpenAuth.InfoCard.nuspec
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+	<metadata>
+		<id>DotNetOpenAuth.InfoCard</id>
+		<version>$version$</version>
+		<title>DotNetOpenAuth InfoCard</title>
+		<authors>Andrew Arnott</authors>
+		<owners>Outercurve Foundation</owners>
+		<projectUrl>http://www.dotnetopenauth.net/</projectUrl>
+		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
+		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<description>Contains assemblies that are required to implement an InfoCard relying party.</description>
+		<dependencies>
+			<dependency id="DotNetOpenAuth.Core" version="[$version$]" />
+		</dependencies>
+	</metadata>
+	<files>
+		<file src="$OutputPath35$signed\DotNetOpenAuth.InfoCard.dll" target="lib\net35-full\DotNetOpenAuth.InfoCard.dll" />
+		<file src="$OutputPath40$signed\DotNetOpenAuth.InfoCard.dll" target="lib\net40-full\DotNetOpenAuth.InfoCard.dll" />
+		<file src="$OutputPath35$DotNetOpenAuth.InfoCard.xml" target="lib\net35-full\DotNetOpenAuth.InfoCard.xml" />
+		<file src="$OutputPath40$DotNetOpenAuth.InfoCard.xml" target="lib\net40-full\DotNetOpenAuth.InfoCard.xml" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec b/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec
index 750253d..dad5057 100644
--- a/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec
@@ -12,10 +12,14 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>Contains assemblies that are required to implement an OAuth consumer.</description>
 		<dependencies>
-			<dependency id="DotNetOpenAuth.Core" version="$version$" />
+			<dependency id="DotNetOpenAuth.OAuth.Core" version="[$version$]" />
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="..\..\bin\v4.0\Release\DotNetOpenAuth.OAuth.Consumer.dll" target="lib\net40\DotNetOpenAuth.OAuth.Consumer.dll" />
+		<file src="$OutputPath35$signed\DotNetOpenAuth.OAuth.Consumer.dll" target="lib\net35-full\DotNetOpenAuth.OAuth.Consumer.dll" />
+		<file src="$OutputPath40$signed\DotNetOpenAuth.OAuth.Consumer.dll" target="lib\net40-full\DotNetOpenAuth.OAuth.Consumer.dll" />
+
+		<file src="$OutputPath35$DotNetOpenAuth.OAuth.Consumer.xml" target="lib\net35-full\DotNetOpenAuth.OAuth.Consumer.xml" />
+		<file src="$OutputPath40$DotNetOpenAuth.OAuth.Consumer.xml" target="lib\net40-full\DotNetOpenAuth.OAuth.Consumer.xml" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OAuth.Core.nuspec b/nuget/DotNetOpenAuth.OAuth.Core.nuspec
new file mode 100644
index 0000000..9a7d28b
--- /dev/null
+++ b/nuget/DotNetOpenAuth.OAuth.Core.nuspec
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+	<metadata>
+		<id>DotNetOpenAuth.OAuth.Core</id>
+		<version>$version$</version>
+		<title>DotNetOpenAuth OAuth 1.0(a)</title>
+		<authors>Andrew Arnott</authors>
+		<owners>Outercurve Foundation</owners>
+		<projectUrl>http://www.dotnetopenauth.net/</projectUrl>
+		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
+		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<description>Contains assemblies that are required to implement an OAuth consumer or service provider.</description>
+		<dependencies>
+			<dependency id="DotNetOpenAuth.Core" version="[$version$]" />
+		</dependencies>
+	</metadata>
+	<files>
+		<file src="$OutputPath35$signed\DotNetOpenAuth.OAuth.dll" target="lib\net35-full\DotNetOpenAuth.OAuth.dll" />
+		<file src="$OutputPath40$signed\DotNetOpenAuth.OAuth.dll" target="lib\net40-full\DotNetOpenAuth.OAuth.dll" />
+
+		<file src="$OutputPath35$DotNetOpenAuth.OAuth.xml" target="lib\net35-full\DotNetOpenAuth.OAuth.xml" />
+		<file src="$OutputPath40$DotNetOpenAuth.OAuth.xml" target="lib\net40-full\DotNetOpenAuth.OAuth.xml" />
+
+		<file src="content\OAuth.Core\web.config.transform" target="content\web.config.transform" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec b/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec
new file mode 100644
index 0000000..1b106c5
--- /dev/null
+++ b/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+	<metadata>
+		<id>DotNetOpenAuth.OAuth.ServiceProvider</id>
+		<version>$version$</version>
+		<title>DotNetOpenAuth OAuth 1.0(a) Service Provider</title>
+		<authors>Andrew Arnott</authors>
+		<owners>Outercurve Foundation</owners>
+		<projectUrl>http://www.dotnetopenauth.net/</projectUrl>
+		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
+		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<description>Contains assemblies that are required to implement an OAuth consumer.</description>
+		<dependencies>
+			<dependency id="DotNetOpenAuth.OAuth.Core" version="[$version$]" />
+		</dependencies>
+	</metadata>
+	<files>
+		<file src="$OutputPath35$signed\DotNetOpenAuth.OAuth.ServiceProvider.dll" target="lib\net35-full\DotNetOpenAuth.OAuth.ServiceProvider.dll" />
+		<file src="$OutputPath40$signed\DotNetOpenAuth.OAuth.ServiceProvider.dll" target="lib\net40-full\DotNetOpenAuth.OAuth.ServiceProvider.dll" />
+
+		<file src="$OutputPath35$DotNetOpenAuth.OAuth.ServiceProvider.xml" target="lib\net35-full\DotNetOpenAuth.OAuth.ServiceProvider.xml" />
+		<file src="$OutputPath40$DotNetOpenAuth.OAuth.ServiceProvider.xml" target="lib\net40-full\DotNetOpenAuth.OAuth.ServiceProvider.xml" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OpenId.Core.nuspec b/nuget/DotNetOpenAuth.OpenId.Core.nuspec
new file mode 100644
index 0000000..0774357
--- /dev/null
+++ b/nuget/DotNetOpenAuth.OpenId.Core.nuspec
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+	<metadata>
+		<id>DotNetOpenAuth.OpenId.Core</id>
+		<version>$version$</version>
+		<title>DotNetOpenAuth OpenID Core</title>
+		<authors>Andrew Arnott</authors>
+		<owners>Outercurve Foundation</owners>
+		<projectUrl>http://www.dotnetopenauth.net/</projectUrl>
+		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
+		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<description>Contains assemblies that are required to implement an OpenID Relying Party or Provider.</description>
+		<dependencies>
+			<dependency id="DotNetOpenAuth.Core" version="[$version$]" />
+		</dependencies>
+	</metadata>
+	<files>
+		<file src="$OutputPath35$signed\DotNetOpenAuth.OpenId.dll" target="lib\net35-full\DotNetOpenAuth.OpenId.dll" />
+		<file src="$OutputPath40$signed\DotNetOpenAuth.OpenId.dll" target="lib\net40-full\DotNetOpenAuth.OpenId.dll" />
+		<file src="$OutputPath35$DotNetOpenAuth.OpenId.xml" target="lib\net35-full\DotNetOpenAuth.OpenId.xml" />
+		<file src="$OutputPath40$DotNetOpenAuth.OpenId.xml" target="lib\net40-full\DotNetOpenAuth.OpenId.xml" />
+
+		<file src="$OutputPath35$signed\Org.Mentalis.Security.Cryptography.dll" target="lib\net35-full\Org.Mentalis.Security.Cryptography.dll" />
+		<file src="$OutputPath40$signed\Org.Mentalis.Security.Cryptography.dll" target="lib\net40-full\Org.Mentalis.Security.Cryptography.dll" />
+		<file src="$OutputPath35$Org.Mentalis.Security.Cryptography.xml" target="lib\net35-full\Org.Mentalis.Security.Cryptography.xml" />
+		<file src="$OutputPath40$Org.Mentalis.Security.Cryptography.xml" target="lib\net40-full\Org.Mentalis.Security.Cryptography.xml" />
+
+		<file src="$OutputPath35$signed\Mono.Math.dll" target="lib\net35-full\Mono.Math.dll" />
+		<file src="$OutputPath40$signed\Mono.Math.dll" target="lib\net40-full\Mono.Math.dll" />
+		<file src="$OutputPath35$Mono.Math.xml" target="lib\net35-full\Mono.Math.xml" />
+		<file src="$OutputPath40$Mono.Math.xml" target="lib\net40-full\Mono.Math.xml" />
+
+		<file src="content\OpenId.Core\web.config.transform" target="content\web.config.transform" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OpenId.Provider.nuspec b/nuget/DotNetOpenAuth.OpenId.Provider.nuspec
new file mode 100644
index 0000000..4f20c56
--- /dev/null
+++ b/nuget/DotNetOpenAuth.OpenId.Provider.nuspec
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+	<metadata>
+		<id>DotNetOpenAuth.OpenId.Provider</id>
+		<version>$version$</version>
+		<title>DotNetOpenAuth OpenID Provider</title>
+		<authors>Andrew Arnott</authors>
+		<owners>Outercurve Foundation</owners>
+		<projectUrl>http://www.dotnetopenauth.net/</projectUrl>
+		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
+		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<description>Contains assemblies that are required to implement an OpenID Provider.</description>
+		<dependencies>
+			<dependency id="DotNetOpenAuth.OpenId.Core" version="[$version$]" />
+		</dependencies>
+	</metadata>
+	<files>
+		<file src="$OutputPath35$signed\DotNetOpenAuth.OpenId.Provider.dll" target="lib\net35-full\DotNetOpenAuth.OpenId.Provider.dll" />
+		<file src="$OutputPath40$signed\DotNetOpenAuth.OpenId.Provider.dll" target="lib\net40-full\DotNetOpenAuth.OpenId.Provider.dll" />
+
+		<file src="$OutputPath35$DotNetOpenAuth.OpenId.Provider.xml" target="lib\net35-full\DotNetOpenAuth.OpenId.Provider.xml" />
+		<file src="$OutputPath40$DotNetOpenAuth.OpenId.Provider.xml" target="lib\net40-full\DotNetOpenAuth.OpenId.Provider.xml" />
+
+		<file src="content\OpenId.Provider\web.config.transform" target="content\web.config.transform" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec b/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec
index 0445ae3..7d50275 100644
--- a/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec
@@ -12,10 +12,16 @@
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>Contains assemblies that are required to implement an OpenID Relying Party.</description>
 		<dependencies>
-			<dependency id="DotNetOpenAuth.Core" version="$version$" />
+			<dependency id="DotNetOpenAuth.OpenId.Core" version="[$version$]" />
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="..\..\bin\v4.0\Release\DotNetOpenAuth.OpenId.RelyingParty.dll" target="lib\net40\DotNetOpenAuth.OpenId.RelyingParty.dll" />
+		<file src="$OutputPath35$signed\DotNetOpenAuth.OpenId.RelyingParty.dll" target="lib\net35-full\DotNetOpenAuth.OpenId.RelyingParty.dll" />
+		<file src="$OutputPath40$signed\DotNetOpenAuth.OpenId.RelyingParty.dll" target="lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.dll" />
+
+		<file src="$OutputPath35$DotNetOpenAuth.OpenId.RelyingParty.xml" target="lib\net35-full\DotNetOpenAuth.OpenId.RelyingParty.xml" />
+		<file src="$OutputPath40$DotNetOpenAuth.OpenId.RelyingParty.xml" target="lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.xml" />
+
+		<file src="content\OpenId.RelyingParty\web.config.transform" target="content\web.config.transform" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.Ultimate.nuspec b/nuget/DotNetOpenAuth.Ultimate.nuspec
index b46d216..f982e59 100644
--- a/nuget/DotNetOpenAuth.Ultimate.nuspec
+++ b/nuget/DotNetOpenAuth.Ultimate.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<package>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>DotNetOpenAuth</id>
 		<version>$version$</version>
@@ -13,5 +13,17 @@
 		<summary>OpenID, OAuth, &amp; InfoCard library for web sites/services and apps.</summary>
 		<description>A C# library that adds OpenID 2.0 Provider and Relying Party, OAuth Consumer and Service Provider, and InfoCard Selector support to your web site both programmatically and through convenient drop-in ASP.NET controls.</description>
 		<language>en-US</language>
+		<frameworkAssemblies>
+			<frameworkAssembly assemblyName="System.Configuration" targetFramework="net40" />
+		</frameworkAssemblies>
 	</metadata>
+	<files>
+		<file src="$OutputPath35$unified\signed\DotNetOpenAuth.dll" target="lib\net35-full\DotNetOpenAuth.dll" />
+		<file src="$OutputPath40$unified\signed\DotNetOpenAuth.dll" target="lib\net40-full\DotNetOpenAuth.dll" />
+
+		<file src="$OutputPath35$unified\DotNetOpenAuth.xml" target="lib\net35-full\DotNetOpenAuth.xml" />
+		<file src="$OutputPath40$unified\DotNetOpenAuth.xml" target="lib\net40-full\DotNetOpenAuth.xml" />
+
+		<file src="content\Ultimate\web.config.transform" target="content\web.config.transform" />
+	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/content/Core/web.config.transform b/nuget/content/Core/web.config.transform
new file mode 100644
index 0000000..57a4692
--- /dev/null
+++ b/nuget/content/Core/web.config.transform
@@ -0,0 +1,36 @@
+<configuration>
+	<configSections>
+		<sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
+			<section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
+			<section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
+		</sectionGroup>
+	</configSections>
+
+	<system.net>
+		<defaultProxy enabled="true" />
+		<settings>
+			<!-- This setting causes .NET to check certificate revocation lists (CRL) 
+			     before trusting HTTPS certificates.  But this setting tends to not 
+			     be allowed in shared hosting environments. -->
+			<!--<servicePointManager checkCertificateRevocationList="true"/>-->
+		</settings>
+	</system.net>
+
+	<runtime>
+		<!-- This prevents the Windows Event Log from frequently logging that HMAC1 is being used (when the other party needs it). -->
+		<legacyHMACWarning enabled="0" />
+	</runtime>
+
+	<dotNetOpenAuth>
+		<messaging>
+			<untrustedWebRequest>
+				<whitelistHosts>
+					<!-- Uncomment to enable communication with localhost (should generally not activate in production!) -->
+					<!--<add name="localhost" />-->
+				</whitelistHosts>
+			</untrustedWebRequest>
+		</messaging>
+		<!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->
+		<reporting enabled="true" />
+	</dotNetOpenAuth>
+</configuration>
\ No newline at end of file
diff --git a/nuget/content/OAuth.Core/web.config.transform b/nuget/content/OAuth.Core/web.config.transform
new file mode 100644
index 0000000..d9b5d92
--- /dev/null
+++ b/nuget/content/OAuth.Core/web.config.transform
@@ -0,0 +1,7 @@
+<configuration>
+	<configSections>
+		<sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
+			<section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />
+		</sectionGroup>
+	</configSections>
+</configuration>
\ No newline at end of file
diff --git a/nuget/content/OpenId.Core/web.config.transform b/nuget/content/OpenId.Core/web.config.transform
new file mode 100644
index 0000000..0771d2c
--- /dev/null
+++ b/nuget/content/OpenId.Core/web.config.transform
@@ -0,0 +1,35 @@
+<configuration>
+	<configSections>
+		<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>
+		<!-- 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 2, this assemblyBinding makes MVC 1 references relink
+		     to MVC 2 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" newVersion="2.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/ -->
+		<!-- You may also refer to README.Bin.html for instructions on enabling Intellisense for this section. -->
+		<openid>
+		</openid>
+	</dotNetOpenAuth>
+</configuration>
\ No newline at end of file
diff --git a/nuget/content/OpenId.Provider/web.config.transform b/nuget/content/OpenId.Provider/web.config.transform
new file mode 100644
index 0000000..8365a3a
--- /dev/null
+++ b/nuget/content/OpenId.Provider/web.config.transform
@@ -0,0 +1,8 @@
+<configuration>
+	<dotNetOpenAuth>
+		<openid>
+			<provider>
+			</provider>
+		</openid>
+	</dotNetOpenAuth>
+</configuration>
\ No newline at end of file
diff --git a/nuget/content/OpenId.RelyingParty/web.config.transform b/nuget/content/OpenId.RelyingParty/web.config.transform
new file mode 100644
index 0000000..c9adf3f
--- /dev/null
+++ b/nuget/content/OpenId.RelyingParty/web.config.transform
@@ -0,0 +1,19 @@
+<configuration>
+	<dotNetOpenAuth>
+		<openid>
+			<relyingParty>
+				<security requireSsl="false">
+					<!-- Uncomment the trustedProviders tag if your relying party should only accept positive assertions from a closed set of OpenID Providers. -->
+					<!--<trustedProviders rejectAssertionsFromUntrustedProviders="true">
+						<add endpoint="https://www.google.com/accounts/o8/ud" />
+					</trustedProviders>-->
+				</security>
+				<behaviors>
+					<!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible
+					     with OPs that use Attribute Exchange (in various formats). -->
+					<add type="DotNetOpenAuth.OpenId.RelyingParty.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth.OpenId.RelyingParty" />
+				</behaviors>
+			</relyingParty>
+		</openid>
+	</dotNetOpenAuth>
+</configuration>
\ No newline at end of file
diff --git a/nuget/content/web.config.transform b/nuget/content/Ultimate/web.config.transform
index b7d5c84..9cd76ed 100644
--- a/nuget/content/web.config.transform
+++ b/nuget/content/Ultimate/web.config.transform
@@ -56,7 +56,7 @@
 				<behaviors>
 					<!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible
 					     with OPs that use Attribute Exchange (in various formats). -->
-					<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregRelyingPartyTransform, DotNetOpenAuth" />
+					<add type="DotNetOpenAuth.OpenId.RelyingParty.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth" />
 				</behaviors>
 			</relyingParty>
 		</openid>
diff --git a/nuget/nuget.proj b/nuget/nuget.proj
index ceca8f0..78157dc 100644
--- a/nuget/nuget.proj
+++ b/nuget/nuget.proj
@@ -5,7 +5,8 @@
 
 	<Target Name="BuildIntermediates">
 		<ItemGroup>
-			<ProductTargets Include="BuildUnifiedProduct;ReSignDelaySignedAssemblies" />
+			<ProductTargets Include="BuildUnifiedProduct;ReSignDelaySignedAssemblies" Condition=" '$(SkipNugetDependenciesBuild)' != 'true' " />
+			<ProductTargets Include="GetOutputPath" />
 		</ItemGroup>
 
 		<!-- We build the entire unified, signed product targeting both CLRs, since NuGet supports packages that contain both,
@@ -15,80 +16,41 @@
 			Targets="@(ProductTargets)"
 			Properties="TargetFrameworkVersion=v3.5"
 			BuildInParallel="$(BuildInParallel)">
-			<Output TaskParameter="TargetOutputs" ItemName="ResignedAssembliesOutputs35"/>
+			<Output TaskParameter="TargetOutputs" ItemName="TargetOutputs35"/>
 		</MSBuild>
 		<MSBuild
 			Projects="$(ProjectRoot)src\DotNetOpenAuth\DotNetOpenAuth.proj"
 			Targets="@(ProductTargets)"
 			Properties="TargetFrameworkVersion=v4.0"
 			BuildInParallel="$(BuildInParallel)">
-			<Output TaskParameter="TargetOutputs" ItemName="ResignedAssembliesOutputs40"/>
+			<Output TaskParameter="TargetOutputs" ItemName="TargetOutputs40"/>
 		</MSBuild>
 
 		<ItemGroup>
-			<ResignedAssembliesOutputs Include="@(ResignedAssembliesOutputs35)" Condition=" '%(MSBuildSourceTargetName)' == 'Sign' ">
+			<ResignedAssembliesOutputs Include="@(TargetOutputs35)" Condition=" '%(MSBuildSourceTargetName)' == 'Sign' ">
 				<TargetFramework>v3.5</TargetFramework>
 			</ResignedAssembliesOutputs>
-			<ResignedAssembliesOutputs Include="@(ResignedAssembliesOutputs40)" Condition=" '%(MSBuildSourceTargetName)' == 'Sign' ">
+			<ResignedAssembliesOutputs Include="@(TargetOutputs40)" Condition=" '%(MSBuildSourceTargetName)' == 'Sign' ">
 				<TargetFramework>v4.0</TargetFramework>
 			</ResignedAssembliesOutputs>
 		</ItemGroup>
-	</Target>
-
-	<Target Name="Layout" DependsOnTargets="BuildIntermediates">
 		<PropertyGroup>
-			<NuGetLayoutPath>$(DropsRoot)NuGet\$(BuildVersion)\</NuGetLayoutPath>
+			<OutputPath35 Condition=" '%(MSBuildSourceTargetName)' == 'GetOutputPath' ">@(TargetOutputs35)</OutputPath35>
+			<OutputPath40 Condition=" '%(MSBuildSourceTargetName)' == 'GetOutputPath' ">@(TargetOutputs40)</OutputPath40>
 		</PropertyGroup>
+	</Target>
 
-		<MSBuild Projects="$(ProjectRoot)src\DotNetOpenAuth\DotNetOpenAuth.proj" Targets="DocumentationProjectOutputGroup" BuildInParallel="$(BuildInParallel)">
-			<Output TaskParameter="TargetOutputs" ItemName="NuGetSource"/>
-		</MSBuild>
-
-		<!-- IMPORTANT: These must appear as separate ItemGroups or else batching screws it up. -->
-		<ItemGroup>
-			<NuGetSource Include="%(ResignedAssembliesOutputs.Identity)" Condition=" '%(FileName)%(Extension)' == 'DotNetOpenAuth.dll' ">
-				<TargetPath Condition=" '%(TargetFramework)' == 'v4.0' ">$(NuGetLayoutPath)lib\net40-full\%(FileName)%(Extension)</TargetPath>
-				<TargetPath Condition=" '%(TargetFramework)' == 'v3.5' ">$(NuGetLayoutPath)lib\net35-full\%(FileName)%(Extension)</TargetPath>
-			</NuGetSource>
-		</ItemGroup>
-		<ItemGroup>
-			<NuGetContentSource Include="$(ProjectRoot)NuGet\content\**"/>
-		</ItemGroup>
-		<ItemGroup>
-			<NuGetSource Include="@(NuGetContentSource)">
-				<TargetPath>$(NuGetLayoutPath)content\%(RecursiveDir)%(FileName)%(Extension)</TargetPath>
-			</NuGetSource>
-
-			<NuSpecSource Include="DotNetOpenAuth.Ultimate.nuspec">
-				<LayoutPath>$(NuGetLayoutPath)</LayoutPath>
-				<BeforeTokens>$version$</BeforeTokens>
-				<AfterTokens>$(BuildVersion)</AfterTokens>
-			</NuSpecSource>
-
-			<NuSpecTarget Include="@(NuSpecSource->'$(NuGetLayoutPath)%(FileName)%(Extension)')" />
-		</ItemGroup>
+	<Target Name="Build" DependsOnTargets="BuildIntermediates">
 		<ItemGroup>
-			<NuGetContentsTarget Include="%(NuGetSource.TargetPath)" />
+			<NuGetPackages Include="*.nuspec" />
+			<NuGetProperties Include="version=$(BuildVersion)" />
+			<NuGetProperties Include="OutputPath35=$(OutputPath35)" />
+			<NuGetProperties Include="OutputPath40=$(OutputPath40)" />
 		</ItemGroup>
-
-		<CopyWithTokenSubstitution
-			SourceFiles="@(NuSpecSource)"
-			DestinationFiles="@(NuSpecTarget)"
-			/>
-
-		<Copy
-			SourceFiles="@(NuGetSource)"
-			DestinationFiles="@(NuGetContentsTarget)"
-			SkipUnchangedFiles="true" />
-
-		<Purge Directories="$(NuGetLayoutPath)" IntendedFiles="@(NuGetContentsTarget);@(NuSpecTarget)" />
-	</Target>
-
-	<Target Name="Build" DependsOnTargets="Layout">
 		<NuGetPack
-			NuSpec="%(NuSpecTarget.Identity)"
-			BaseDirectory="%(NuSpecTarget.LayoutPath)"
+			NuSpec="%(NuGetPackages.Identity)"
 			OutputPackageDirectory="$(DropsRoot)"
+			Properties="@(NuGetProperties)"
 			ToolPath="$(NuGetToolPath)" />
 	</Target>
 
diff --git a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
index 9271e62..ddf80bd 100644
--- a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
+++ b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
@@ -29,14 +29,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetOpenAuth.BuildTasks",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{D49E2011-0E1C-4AB5-9887-BD1D42266503}"
 	ProjectSection(SolutionItems) = preProject
+		..\..\nuget\DotNetOpenAuth.Core.nuspec = ..\..\nuget\DotNetOpenAuth.Core.nuspec
+		..\..\nuget\DotNetOpenAuth.OAuth.Consumer.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth.Consumer.nuspec
+		..\..\nuget\DotNetOpenAuth.OAuth.Core.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth.Core.nuspec
+		..\..\nuget\DotNetOpenAuth.OpenId.Core.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.Core.nuspec
+		..\..\nuget\DotNetOpenAuth.OpenId.RelyingParty.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.RelyingParty.nuspec
 		..\..\nuget\DotNetOpenAuth.Ultimate.nuspec = ..\..\nuget\DotNetOpenAuth.Ultimate.nuspec
 		..\..\nuget\nuget.proj = ..\..\nuget\nuget.proj
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{BF3868D6-3BBA-4E40-B180-213370C15494}"
-	ProjectSection(SolutionItems) = preProject
-		..\..\nuget\content\web.config.transform = ..\..\nuget\content\web.config.transform
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/DotNetOpenAuth.BuildTasks/NuGetPack.cs b/src/DotNetOpenAuth.BuildTasks/NuGetPack.cs
index 8f61874..1b13ad2 100644
--- a/src/DotNetOpenAuth.BuildTasks/NuGetPack.cs
+++ b/src/DotNetOpenAuth.BuildTasks/NuGetPack.cs
@@ -35,6 +35,11 @@ namespace DotNetOpenAuth.BuildTasks {
 		public ITaskItem OutputPackageDirectory { get; set; }
 
 		/// <summary>
+		/// Gets or sets the semicolon delimited list of properties to supply to the NuGet Pack command to perform token substitution.
+		/// </summary>
+		public string Properties { get; set; }
+
+		/// <summary>
 		/// Returns the fully qualified path to the executable file.
 		/// </summary>
 		/// <returns>
@@ -63,15 +68,7 @@ namespace DotNetOpenAuth.BuildTasks {
 				Directory.CreateDirectory(Path.GetDirectoryName(this.OutputPackageDirectory.ItemSpec));
 			}
 
-			string fullPackagePath = this.DeriveFullPackagePath();
-			this.Log.LogMessage("Creating NuGet package '{0}'.", fullPackagePath);
-
 			bool result = base.Execute();
-
-			if (result) {
-				this.Log.LogMessage(MessageImportance.High, "Successfully created package '{0}'.", fullPackagePath);
-			}
-
 			return result;
 		}
 
@@ -88,21 +85,9 @@ namespace DotNetOpenAuth.BuildTasks {
 			args.AppendFileNameIfNotNull(this.NuSpec);
 			args.AppendSwitchIfNotNull("-BasePath ", this.BaseDirectory);
 			args.AppendSwitchIfNotNull("-OutputDirectory ", this.OutputPackageDirectory);
+			args.AppendSwitchIfNotNull("-Properties ", this.Properties);
 
 			return args.ToString();
 		}
-
-		/// <summary>
-		/// Derives the path to the generated .nupkg file.
-		/// </summary>
-		/// <returns>A relative path.</returns>
-		private string DeriveFullPackagePath() {
-			var spec = XDocument.Load(this.NuSpec.ItemSpec);
-			var metadata = spec.Element("package").Element("metadata");
-			string id = metadata.Element("id").Value;
-			string version = metadata.Element("version").Value;
-			string baseDirectory = this.OutputPackageDirectory != null ? this.OutputPackageDirectory.ItemSpec : String.Empty;
-			return Path.Combine(baseDirectory, String.Format("{0}.{1}.nupkg", id, version));
-		}
 	}
 }
diff --git a/tools/DotNetOpenAuth.targets b/tools/DotNetOpenAuth.targets
index 6a8689e..3765455 100644
--- a/tools/DotNetOpenAuth.targets
+++ b/tools/DotNetOpenAuth.targets
@@ -123,5 +123,7 @@
 		</MSBuild>
 	</Target>
 
+	<Target Name="GetOutputPath" Outputs="$(OutputPath)" />
+
 	<Import Condition="'$(CodeContractsImported)' != 'true' AND ('$(DontImportCodeContracts)' != 'true' or '$(ImportCodeContractsFromToolset)' == 'true')" Project="$(CodeContractsInstallDir)\MsBuild\v4.0\Microsoft.CodeContracts.targets"/>
 </Project>