Merge branch 'v4.0'

Conflicts:
	nuget/DotNetOpenAuth.AspNet.nuspec
	nuget/DotNetOpenAuth.Core.UI.nuspec
	nuget/DotNetOpenAuth.Core.nuspec
	nuget/DotNetOpenAuth.InfoCard.UI.nuspec
	nuget/DotNetOpenAuth.InfoCard.nuspec
	nuget/DotNetOpenAuth.OAuth.Common.nuspec
	nuget/DotNetOpenAuth.OAuth.Consumer.nuspec
	nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec
	nuget/DotNetOpenAuth.OAuth.nuspec
	nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec
	nuget/DotNetOpenAuth.OAuth2.Client.UI.nuspec
	nuget/DotNetOpenAuth.OAuth2.Client.nuspec
	nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec
	nuget/DotNetOpenAuth.OAuth2.nuspec
	nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec
	nuget/DotNetOpenAuth.OpenId.Provider.nuspec
	nuget/DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec
	nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec
	nuget/DotNetOpenAuth.OpenId.UI.nuspec
	nuget/DotNetOpenAuth.OpenId.nuspec
	nuget/DotNetOpenAuth.OpenIdInfoCard.UI.nuspec
	nuget/DotNetOpenAuth.OpenIdOAuth.nuspec
	nuget/nuget.proj
	src/version.txt

38 files changed, 564 insertions, 302 deletions

diff --git a/nuget/DotNetOpenAuth.AspNet.nuspec b/nuget/DotNetOpenAuth.AspNet.nuspec
index c1b15a0..e987039 100644
--- a/nuget/DotNetOpenAuth.AspNet.nuspec
+++ b/nuget/DotNetOpenAuth.AspNet.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.AspNet</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth extensions for ASP.NET (WebPages)</title>
 		<authors>Microsoft</authors>
@@ -21,14 +21,15 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath40$signed\DotNetOpenAuth.AspNet.dll" target="lib\net40-full\DotNetOpenAuth.AspNet.dll" />
-		<file src="$OutputPath40$DotNetOpenAuth.AspNet.pdb" target="lib\net40-full\DotNetOpenAuth.AspNet.pdb" />
-		<file src="$OutputPath40$DotNetOpenAuth.AspNet.xml" target="lib\net40-full\DotNetOpenAuth.AspNet.xml" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
 
-		<file src="$OutputPath45$signed\DotNetOpenAuth.AspNet.dll" target="lib\net45-full\DotNetOpenAuth.AspNet.dll" />
-		<file src="$OutputPath45$DotNetOpenAuth.AspNet.pdb" target="lib\net45-full\DotNetOpenAuth.AspNet.pdb" />
-		<file src="$OutputPath45$DotNetOpenAuth.AspNet.xml" target="lib\net45-full\DotNetOpenAuth.AspNet.xml" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
-		<file src="..\src\DotNetOpenAuth.AspNet\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.Core.UI.nuspec b/nuget/DotNetOpenAuth.Core.UI.nuspec
index 90013d2..69fea80 100644
--- a/nuget/DotNetOpenAuth.Core.UI.nuspec
+++ b/nuget/DotNetOpenAuth.Core.UI.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.Core.UI</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth Core (ASP.NET controls)</title>
 		<authors>Andrew Arnott</authors>
@@ -18,18 +18,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.Core.UI.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.Core.UI.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.Core.UI.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.Core.UI.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.Core.UI.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.Core.UI.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.Core.UI.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.Core.UI.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.Core.UI.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
-		<file src="..\src\DotNetOpenAuth.Core.UI\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.Core.nuspec b/nuget/DotNetOpenAuth.Core.nuspec
index 61ebb35..989f5bf 100644
--- a/nuget/DotNetOpenAuth.Core.nuspec
+++ b/nuget/DotNetOpenAuth.Core.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.Core</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth Core</title>
 		<authors>Andrew Arnott</authors>
@@ -21,20 +21,21 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.Core.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.Core.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.Core.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.Core.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.Core.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.Core.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.Core.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.Core.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.Core.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
 		<file src="content\Core\web.config.transform" target="content\web.config.transform" />
 
-		<file src="..\src\DotNetOpenAuth.Core\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.InfoCard.UI.nuspec b/nuget/DotNetOpenAuth.InfoCard.UI.nuspec
index 0109cad..f638a9b 100644
--- a/nuget/DotNetOpenAuth.InfoCard.UI.nuspec
+++ b/nuget/DotNetOpenAuth.InfoCard.UI.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.InfoCard.UI</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth InfoCard (ASP.NET controls)</title>
 		<authors>Andrew Arnott</authors>
@@ -23,18 +23,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.InfoCard.UI.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.InfoCard.UI.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.InfoCard.UI.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.InfoCard.UI.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.InfoCard.UI.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.InfoCard.UI.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.InfoCard.UI.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.InfoCard.UI.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.InfoCard.UI.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
-		<file src="..\src\DotNetOpenAuth.InfoCard.UI\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.InfoCard.nuspec b/nuget/DotNetOpenAuth.InfoCard.nuspec
index 4e3996d..9b3e532 100644
--- a/nuget/DotNetOpenAuth.InfoCard.nuspec
+++ b/nuget/DotNetOpenAuth.InfoCard.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.InfoCard</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth InfoCard</title>
 		<authors>Andrew Arnott</authors>
@@ -21,18 +21,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.InfoCard.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.InfoCard.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.InfoCard.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.InfoCard.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.InfoCard.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.InfoCard.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.InfoCard.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.InfoCard.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.InfoCard.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
-		<file src="..\src\DotNetOpenAuth.InfoCard\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OAuth.Common.nuspec b/nuget/DotNetOpenAuth.OAuth.Common.nuspec
index 7160414..f3d8dbc 100644
--- a/nuget/DotNetOpenAuth.OAuth.Common.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth.Common.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OAuth.Common</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth OAuth 1/2 shared bits</title>
 		<authors>Andrew Arnott</authors>
@@ -17,18 +17,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OAuth.Common.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OAuth.Common.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OAuth.Common.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth.Common.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth.Common.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth.Common.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth.Common.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth.Common.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth.Common.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
-		<file src="..\src\DotNetOpenAuth.OAuth.Common\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec b/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec
index 9b0ba9f..c6db07c 100644
--- a/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OAuth.Consumer</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth OAuth 1.0(a) Consumer</title>
 		<authors>Andrew Arnott</authors>
@@ -20,18 +20,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OAuth.Consumer.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OAuth.Consumer.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OAuth.Consumer.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth.Consumer.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth.Consumer.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth.Consumer.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth.Consumer.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth.Consumer.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth.Consumer.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
-		<file src="..\src\DotNetOpenAuth.OAuth.Consumer\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec b/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec
index eb02ce5..5abf338 100644
--- a/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OAuth.ServiceProvider</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth OAuth 1.0(a) Service Provider</title>
 		<authors>Andrew Arnott</authors>
@@ -21,18 +21,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OAuth.ServiceProvider.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OAuth.ServiceProvider.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OAuth.ServiceProvider.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth.ServiceProvider.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth.ServiceProvider.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth.ServiceProvider.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth.ServiceProvider.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth.ServiceProvider.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth.ServiceProvider.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
-		<file src="..\src\DotNetOpenAuth.OAuth.ServiceProvider\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OAuth.Core.nuspec b/nuget/DotNetOpenAuth.OAuth.nuspec
index 2c2d0a8..e313129 100644
--- a/nuget/DotNetOpenAuth.OAuth.Core.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OAuth.Core</id>
+		<id>$identity$.Core</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth OAuth 1.0(a)</title>
 		<authors>Andrew Arnott</authors>
@@ -17,20 +17,21 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OAuth.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OAuth.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OAuth.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
 		<file src="content\OAuth.Core\web.config.transform" target="content\web.config.transform" />
 
-		<file src="..\src\DotNetOpenAuth.OAuth\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec b/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec
index ae6552a..ac8fd50 100644
--- a/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OAuth2.AuthorizationServer</id>
+		<id>$identity$</id>
 		<version>$oauth2version$</version>
 		<title>DotNetOpenAuth OAuth 2.0 Authorization Server</title>
 		<authors>Andrew Arnott</authors>
@@ -20,18 +20,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OAuth2.AuthorizationServer.dll" target="lib\net35-full" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OAuth2.AuthorizationServer.dll" target="lib\net40-full" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OAuth2.AuthorizationServer.dll" target="lib\net45-full" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth2.AuthorizationServer.pdb" target="lib\net35-full" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth2.AuthorizationServer.pdb" target="lib\net40-full" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth2.AuthorizationServer.pdb" target="lib\net45-full" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth2.AuthorizationServer.xml" target="lib\net35-full" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth2.AuthorizationServer.xml" target="lib\net40-full" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth2.AuthorizationServer.xml" target="lib\net45-full" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full" />
 
-		<file src="..\src\DotNetOpenAuth.OAuth2.AuthorizationServer\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OAuth2.Client.UI.nuspec b/nuget/DotNetOpenAuth.OAuth2.Client.UI.nuspec
index 3716b38..bb0551c 100644
--- a/nuget/DotNetOpenAuth.OAuth2.Client.UI.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth2.Client.UI.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OAuth2.Client.UI</id>
+		<id>$identity$</id>
 		<version>$oauth2version$</version>
 		<title>DotNetOpenAuth OAuth 2.0 Client (ASP.NET controls)</title>
 		<authors>Andrew Arnott</authors>
@@ -20,18 +20,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OAuth2.Client.UI.dll" target="lib\net35-full" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OAuth2.Client.UI.dll" target="lib\net40-full" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OAuth2.Client.UI.dll" target="lib\net45-full" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth2.Client.UI.pdb" target="lib\net35-full" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth2.Client.UI.pdb" target="lib\net40-full" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth2.Client.UI.pdb" target="lib\net45-full" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth2.Client.UI.xml" target="lib\net35-full" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth2.Client.UI.xml" target="lib\net40-full" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth2.Client.UI.xml" target="lib\net45-full" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full" />
 
-		<file src="..\src\DotNetOpenAuth.OAuth2.Client.UI\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OAuth2.Client.nuspec b/nuget/DotNetOpenAuth.OAuth2.Client.nuspec
index a7c8b51..822ab09 100644
--- a/nuget/DotNetOpenAuth.OAuth2.Client.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth2.Client.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OAuth2.Client</id>
+		<id>$identity$</id>
 		<version>$oauth2version$</version>
 		<title>DotNetOpenAuth OAuth 2.0 Client</title>
 		<authors>Andrew Arnott</authors>
@@ -20,18 +20,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OAuth2.Client.dll" target="lib\net35-full" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OAuth2.Client.dll" target="lib\net40-full" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OAuth2.Client.dll" target="lib\net45-full" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth2.Client.pdb" target="lib\net35-full" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth2.Client.pdb" target="lib\net40-full" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth2.Client.pdb" target="lib\net45-full" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth2.Client.xml" target="lib\net35-full" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth2.Client.xml" target="lib\net40-full" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth2.Client.xml" target="lib\net45-full" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full" />
 
-		<file src="..\src\DotNetOpenAuth.OAuth2.Client\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OAuth2.Core.nuspec b/nuget/DotNetOpenAuth.OAuth2.Core.nuspec
deleted file mode 100644
index 15e8049..0000000
--- a/nuget/DotNetOpenAuth.OAuth2.Core.nuspec
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-	<metadata>
-		<id>DotNetOpenAuth.OAuth2.Core</id>
-		<version>$oauth2version$</version>
-		<title>DotNetOpenAuth OAuth 2.0 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>
-		<summary>Common functionality required to implement an OAuth 2.0 client, authorization server or resource server.</summary>
-		<description>This package contains shared code for other NuGet packages, and contains no public API in and of itself.</description>
-		<dependencies>
-			<dependency id="DotNetOpenAuth.Core" version="[$version$]" />
-		</dependencies>
-	</metadata>
-	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OAuth2.dll" target="lib\net35-full" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OAuth2.dll" target="lib\net40-full" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OAuth2.dll" target="lib\net45-full" />
-
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth2.pdb" target="lib\net35-full" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth2.pdb" target="lib\net40-full" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth2.pdb" target="lib\net45-full" />
-
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth2.xml" target="lib\net35-full" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth2.xml" target="lib\net40-full" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth2.xml" target="lib\net45-full" />
-
-		<file src="content\OAuth2.Core\web.config.transform" target="content\web.config.transform" />
-
-		<file src="..\src\DotNetOpenAuth.OAuth2\**\*.cs" target="src" />
-	</files>
-</package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec b/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec
index d297fbb..30fc363 100644
--- a/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OAuth2.ResourceServer</id>
+		<id>$identity$</id>
 		<version>$oauth2version$</version>
 		<title>DotNetOpenAuth OAuth 2.0 Resource Server</title>
 		<authors>Andrew Arnott</authors>
@@ -22,18 +22,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OAuth2.ResourceServer.dll" target="lib\net35-full" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OAuth2.ResourceServer.dll" target="lib\net40-full" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OAuth2.ResourceServer.dll" target="lib\net45-full" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth2.ResourceServer.pdb" target="lib\net35-full" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth2.ResourceServer.pdb" target="lib\net40-full" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth2.ResourceServer.pdb" target="lib\net45-full" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth2.ResourceServer.xml" target="lib\net35-full" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth2.ResourceServer.xml" target="lib\net40-full" />
-		<file src="$OutputPath45$DotNetOpenAuth.OAuth2.ResourceServer.xml" target="lib\net45-full" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full" />
 
-		<file src="..\src\DotNetOpenAuth.OAuth2.ResourceServer\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OAuth2.nuspec b/nuget/DotNetOpenAuth.OAuth2.nuspec
new file mode 100644
index 0000000..8ecf799
--- /dev/null
+++ b/nuget/DotNetOpenAuth.OAuth2.nuspec
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+	<metadata>
+		<id>$identity$.Core</id>
+		<version>$oauth2version$</version>
+		<title>DotNetOpenAuth OAuth 2.0 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>
+		<summary>Common functionality required to implement an OAuth 2.0 client, authorization server or resource server.</summary>
+		<description>This package contains shared code for other NuGet packages, and contains no public API in and of itself.</description>
+		<dependencies>
+			<dependency id="DotNetOpenAuth.Core" version="[$version$]" />
+		</dependencies>
+	</metadata>
+	<files>
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full" />
+
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full" />
+
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full" />
+
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec b/nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec
index 1d74d86..fa72410 100644
--- a/nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OpenId.Provider.UI</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth OpenID Provider (ASP.NET controls)</title>
 		<authors>Andrew Arnott</authors>
@@ -23,18 +23,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OpenId.Provider.UI.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OpenId.Provider.UI.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OpenId.Provider.UI.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenId.Provider.UI.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.Provider.UI.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenId.Provider.UI.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenId.Provider.UI.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.Provider.UI.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenId.Provider.UI.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
-		<file src="..\src\DotNetOpenAuth.OpenId.Provider.UI\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OpenId.Provider.nuspec b/nuget/DotNetOpenAuth.OpenId.Provider.nuspec
index b015c11..ab93d46 100644
--- a/nuget/DotNetOpenAuth.OpenId.Provider.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.Provider.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OpenId.Provider</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth OpenID Provider</title>
 		<authors>Andrew Arnott</authors>
@@ -22,20 +22,21 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OpenId.Provider.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OpenId.Provider.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OpenId.Provider.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenId.Provider.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.Provider.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenId.Provider.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenId.Provider.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.Provider.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenId.Provider.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
 		<file src="content\OpenId.Provider\web.config.transform" target="content\web.config.transform" />
 
-		<file src="..\src\DotNetOpenAuth.OpenId.Provider\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec b/nuget/DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec
index a18fc5c..4fd8d1b 100644
--- a/nuget/DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OpenId.RelyingParty.UI</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth OpenID Relying Party (ASP.NET controls)</title>
 		<authors>Andrew Arnott</authors>
@@ -21,18 +21,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OpenId.RelyingParty.UI.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OpenId.RelyingParty.UI.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OpenId.RelyingParty.UI.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenId.RelyingParty.UI.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.RelyingParty.UI.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenId.RelyingParty.UI.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenId.RelyingParty.UI.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.RelyingParty.UI.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenId.RelyingParty.UI.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
-		<file src="..\src\DotNetOpenAuth.OpenId.RelyingParty.UI\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec b/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec
index 42ee26d..cf64de4 100644
--- a/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OpenId.RelyingParty</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth OpenID Relying Party</title>
 		<authors>Andrew Arnott</authors>
@@ -20,20 +20,21 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OpenId.RelyingParty.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OpenId.RelyingParty.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OpenId.RelyingParty.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenId.RelyingParty.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.RelyingParty.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenId.RelyingParty.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenId.RelyingParty.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.RelyingParty.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenId.RelyingParty.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
 		<file src="content\OpenId.RelyingParty\web.config.transform" target="content\web.config.transform" />
 
-		<file src="..\src\DotNetOpenAuth.OpenId.RelyingParty\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OpenId.Core.UI.nuspec b/nuget/DotNetOpenAuth.OpenId.UI.nuspec
index e7380c2..75da54c 100644
--- a/nuget/DotNetOpenAuth.OpenId.Core.UI.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.UI.nuspec
@@ -17,18 +17,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OpenId.UI.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OpenId.UI.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OpenId.UI.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenId.UI.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.UI.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenId.UI.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenId.UI.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.UI.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenId.UI.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
-		<file src="..\src\DotNetOpenAuth.OpenId.UI\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OpenId.Core.nuspec b/nuget/DotNetOpenAuth.OpenId.nuspec
index 5eadd9b..0b98364 100644
--- a/nuget/DotNetOpenAuth.OpenId.Core.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OpenId.Core</id>
+		<id>$identity$.Core</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth OpenID Core</title>
 		<authors>Andrew Arnott</authors>
@@ -17,19 +17,19 @@
 		</dependencies>
 		<references>
 			<!-- Explicitly specify references so that Mono.Math other implementation detail assemblies are not referenced. -->
-			<reference file="DotNetOpenAuth.OpenId.dll" />
+			<reference file="$identity$.dll" />
 		</references>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OpenId.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OpenId.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OpenId.dll" target="lib\net45-full\" />
-		<file src="$OutputPath35$DotNetOpenAuth.OpenId.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenId.pdb" target="lib\net45-full\" />
-		<file src="$OutputPath35$DotNetOpenAuth.OpenId.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenId.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
 		<file src="$OutputPath35$signed\Org.Mentalis.Security.Cryptography.dll" target="lib\net35-full\" />
 		<file src="$OutputPath40$signed\Org.Mentalis.Security.Cryptography.dll" target="lib\net40-full\" />
@@ -53,8 +53,13 @@
 
 		<file src="content\OpenId.Core\web.config.transform" target="content\web.config.transform" />
 
-		<file src="..\src\DotNetOpenAuth.OpenId\**\*.cs" target="src\DotNetOpenAuth.OpenId" />
-		<file src="..\src\Org.Mentalis.Security.Cryptography\**\*.cs" target="src\Org.Mentalis.Security.Cryptography" />
-		<file src="..\src\Mono.Math\**\*.cs" target="src\Mono.Math" />
+		<file src="..\src\$Identity$\**\*.cs" target="src\$identity$" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src\$identity$" />
+
+		<file src="..\src\Org.Mentalis.Security.Cryptography\**\*.cs" target="src\Org.Mentalis.Security.Cryptography" exclude="..\src\Org.Mentalis.Security.Cryptography\obj\**" />
+		<file src="$IntermediatePath$Org.Mentalis.Security.Cryptography.Version.cs" target="src\Org.Mentalis.Security.Cryptography" />
+
+		<file src="..\src\Mono.Math\**\*.cs" target="src\Mono.Math" exclude="..\src\Mono.Math\obj\**" />
+		<file src="$IntermediatePath$Mono.Math.Version.cs" target="src\Mono.Math" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OpenIdInfoCard.UI.nuspec b/nuget/DotNetOpenAuth.OpenIdInfoCard.UI.nuspec
index 154ddcd..b0e7e75 100644
--- a/nuget/DotNetOpenAuth.OpenIdInfoCard.UI.nuspec
+++ b/nuget/DotNetOpenAuth.OpenIdInfoCard.UI.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OpenIdInfoCard.UI</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth OpenID InfoCard Relying Party ASP.NET control</title>
 		<authors>Andrew Arnott</authors>
@@ -22,18 +22,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OpenIdInfoCard.UI.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OpenIdInfoCard.UI.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OpenIdInfoCard.UI.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenIdInfoCard.UI.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenIdInfoCard.UI.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenIdInfoCard.UI.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenIdInfoCard.UI.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenIdInfoCard.UI.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenIdInfoCard.UI.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
-		<file src="..\src\DotNetOpenAuth.OpenIdInfoCard.UI\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec b/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec
index 600bc11..1a9d978 100644
--- a/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec
+++ b/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OpenIdOAuth</id>
+		<id>$identity$</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth OpenID OAuth hybrid</title>
 		<authors>Andrew Arnott</authors>
@@ -22,18 +22,19 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$signed\DotNetOpenAuth.OpenIdOAuth.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$signed\DotNetOpenAuth.OpenIdOAuth.dll" target="lib\net40-full\" />
-		<file src="$OutputPath45$signed\DotNetOpenAuth.OpenIdOAuth.dll" target="lib\net45-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenIdOAuth.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenIdOAuth.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenIdOAuth.pdb" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenIdOAuth.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenIdOAuth.xml" target="lib\net40-full\" />
-		<file src="$OutputPath45$DotNetOpenAuth.OpenIdOAuth.xml" target="lib\net45-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
+		<file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" />
 
-		<file src="..\src\DotNetOpenAuth.OpenIdOAuth\**\*.cs" target="src" />
+		<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
+		<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.Ultimate.nuspec b/nuget/DotNetOpenAuth.Ultimate.nuspec
index 70ad8c8..0dfbb3a 100644
--- a/nuget/DotNetOpenAuth.Ultimate.nuspec
+++ b/nuget/DotNetOpenAuth.Ultimate.nuspec
@@ -33,6 +33,6 @@
 
 		<file src="content\Ultimate\web.config.transform" target="content\web.config.transform" />
 
-		<file src="..\src\**\*.cs" target="src" />
+		<file src="..\src\**\*.cs" target="src" exclude="..\src\*\obj\**" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.nuspec b/nuget/DotNetOpenAuth.nuspec
index e06c4f1..938a9b1 100644
--- a/nuget/DotNetOpenAuth.nuspec
+++ b/nuget/DotNetOpenAuth.nuspec
@@ -23,6 +23,7 @@
 			<dependency id="DotNetOpenAuth.OAuth.Consumer" version="[$version$]" />
 			<dependency id="DotNetOpenAuth.OAuth.ServiceProvider" version="[$version$]" />
 			<dependency id="DotNetOpenAuth.OpenIdInfoCard.UI" version="[$version$]" />
+			<dependency id="DotNetOpenAuth.OpenIdOAuth" version="[$version$]" />
 		</dependencies>
 	</metadata>
 	<files>
diff --git a/nuget/nuget.proj b/nuget/nuget.proj
index 770289d..4d79d1f 100644
--- a/nuget/nuget.proj
+++ b/nuget/nuget.proj
@@ -39,14 +39,12 @@
 			Targets="@(AspNetTargets)"
 			Properties="TargetFrameworkVersion=v4.0"
 			BuildInParallel="$(BuildInParallel)">
-			<Output TaskParameter="TargetOutputs" ItemName="TargetOutputs40"/>
 		</MSBuild>
 		<MSBuild
 			Projects="$(ProjectRoot)src\DotNetOpenAuth.AspNet\DotNetOpenAuth.AspNet.csproj"
 			Targets="@(AspNetTargets)"
 			Properties="TargetFrameworkVersion=v4.5"
 			BuildInParallel="$(BuildInParallel)">
-			<Output TaskParameter="TargetOutputs" ItemName="TargetOutputs45"/>
 		</MSBuild>
 
 		<ItemGroup>
@@ -69,6 +67,13 @@
 
 	<Target Name="Build" DependsOnTargets="BuildIntermediates" Returns="@(NuGetPackages)">
 		<ItemGroup>
+			<NuGetProperties Include="version=$(NuGetPackageVersion)" />
+			<NuGetProperties Include="oauth2version=$(OAuth2PackagesVersion)" />
+			<NuGetProperties Include="OutputPath35=$(OutputPath35)" />
+			<NuGetProperties Include="OutputPath40=$(OutputPath40)" />
+			<NuGetProperties Include="OutputPath45=$(OutputPath45)" />
+			<NuGetProperties Include="IntermediatePath=$(IntermediatePath40)" />
+
 			<NuGetSpecifications Include="*.nuspec" Exclude="*oauth2*.nuspec;DotNetOpenAuth.nuspec">
 				<Symbols>true</Symbols>
 				<PackageVersion>$(NuGetPackageVersion)</PackageVersion>
@@ -82,18 +87,20 @@
 			</NuGetSpecifications>
 
 			<NuGetPackages Include="@(NuGetSpecifications->'$(DropsRoot)%(FileName).%(PackageVersion).nupkg')" />
-
-			<NuGetProperties Include="version=$(NuGetPackageVersion)" />
-			<NuGetProperties Include="oauth2version=$(OAuth2PackagesVersion)" />
-			<NuGetProperties Include="OutputPath35=$(OutputPath35)" />
-			<NuGetProperties Include="OutputPath40=$(OutputPath40)" />
-			<NuGetProperties Include="OutputPath45=$(OutputPath45)" />
+		</ItemGroup>
+		<PropertyGroup>
+			<_NuGetProperties>@(NuGetProperties)</_NuGetProperties>
+		</PropertyGroup>
+		<ItemGroup>
+			<NuGetSpecifications>
+				<Properties>$(_NuGetProperties);Identity=%(FileName);GeneratedAssemblyInfoSourceFile=$(IntermediatePath40)%(FileName).Version.cs</Properties>
+			</NuGetSpecifications>
 		</ItemGroup>
 
 		<NuGetPack
 			NuSpec="%(NuGetSpecifications.Identity)"
 			OutputPackageDirectory="$(DropsRoot)"
-			Properties="@(NuGetProperties)"
+			Properties="%(NuGetSpecifications.Properties)"
 			Symbols="%(NuGetSpecifications.Symbols)"
 			ToolPath="$(NuGetToolPath)" />
 	</Target>
diff --git a/src/DotNetOpenAuth.AspNet/Clients/OAuth/IOAuthTokenManager.cs b/src/DotNetOpenAuth.AspNet/Clients/OAuth/IOAuthTokenManager.cs
new file mode 100644
index 0000000..92f1c22
--- /dev/null
+++ b/src/DotNetOpenAuth.AspNet/Clients/OAuth/IOAuthTokenManager.cs
@@ -0,0 +1,38 @@
+//-----------------------------------------------------------------------
+// <copyright file="IOAuthTokenManager.cs" company="Microsoft">
+//     Copyright (c) Microsoft. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.AspNet.Clients {
+	/// <summary>
+	/// A token manager for use by a web site in its role as a consumer of
+	/// an individual ServiceProvider.
+	/// </summary>
+	/// <remarks>
+	/// This interface is used by clients of the DotNetOpenAuth.AspNet classes.
+	/// </remarks>
+	public interface IOAuthTokenManager {
+		/// <summary>
+		/// Gets the token secret from the specified token.
+		/// </summary>
+		/// <param name="token">The token.</param>
+		/// <returns>The token's secret</returns>
+		string GetTokenSecret(string token);
+
+		/// <summary>
+		/// Stores the request token together with its secret.
+		/// </summary>
+		/// <param name="requestToken">The request token.</param>
+		/// <param name="requestTokenSecret">The request token secret.</param>
+		void StoreRequestToken(string requestToken, string requestTokenSecret);
+
+		/// <summary>
+		/// Replaces the request token with access token.
+		/// </summary>
+		/// <param name="requestToken">The request token.</param>
+		/// <param name="accessToken">The access token.</param>
+		/// <param name="accessTokenSecret">The access token secret.</param>
+		void ReplaceRequestTokenWithAccessToken(string requestToken, string accessToken, string accessTokenSecret);
+	}
+}
\ No newline at end of file
diff --git a/src/DotNetOpenAuth.AspNet/Clients/OAuth/LinkedInClient.cs b/src/DotNetOpenAuth.AspNet/Clients/OAuth/LinkedInClient.cs
index 631636b..d349576 100644
--- a/src/DotNetOpenAuth.AspNet/Clients/OAuth/LinkedInClient.cs
+++ b/src/DotNetOpenAuth.AspNet/Clients/OAuth/LinkedInClient.cs
@@ -59,6 +59,16 @@ namespace DotNetOpenAuth.AspNet.Clients {
 		public LinkedInClient(string consumerKey, string consumerSecret)
 			: base("linkedIn", LinkedInServiceDescription, consumerKey, consumerSecret) { }
 
+		/// <summary>
+		/// Initializes a new instance of the <see cref="LinkedInClient"/> class.
+		/// </summary>
+		/// <param name="consumerKey">The consumer key.</param>
+		/// <param name="consumerSecret">The consumer secret.</param>
+		/// <param name="tokenManager">The token manager.</param>
+		public LinkedInClient(string consumerKey, string consumerSecret, IOAuthTokenManager tokenManager)
+			: base("linkedIn", LinkedInServiceDescription, new SimpleConsumerTokenManager(consumerKey, consumerSecret, tokenManager)) {
+		}
+
 		#endregion
 
 		#region Methods
diff --git a/src/DotNetOpenAuth.AspNet/Clients/OAuth/OAuthClient.cs b/src/DotNetOpenAuth.AspNet/Clients/OAuth/OAuthClient.cs
index 89cefad..3f9e85a 100644
--- a/src/DotNetOpenAuth.AspNet/Clients/OAuth/OAuthClient.cs
+++ b/src/DotNetOpenAuth.AspNet/Clients/OAuth/OAuthClient.cs
@@ -54,7 +54,8 @@ namespace DotNetOpenAuth.AspNet.Clients {
 		[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "I don't know how to ensure this rule is followed given this API")]
 		protected OAuthClient(
 			string providerName, ServiceProviderDescription serviceDescription, IConsumerTokenManager tokenManager)
-			: this(providerName, new DotNetOpenAuthWebConsumer(serviceDescription, tokenManager)) { }
+			: this(providerName, new DotNetOpenAuthWebConsumer(serviceDescription, tokenManager)) {
+		}
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="OAuthClient"/> class.
diff --git a/src/DotNetOpenAuth.AspNet/Clients/OAuth/SimpleConsumerTokenManager.cs b/src/DotNetOpenAuth.AspNet/Clients/OAuth/SimpleConsumerTokenManager.cs
new file mode 100644
index 0000000..22156e9
--- /dev/null
+++ b/src/DotNetOpenAuth.AspNet/Clients/OAuth/SimpleConsumerTokenManager.cs
@@ -0,0 +1,103 @@
+//-----------------------------------------------------------------------
+// <copyright file="SimpleConsumerTokenManager.cs" company="Microsoft">
+//     Copyright (c) Microsoft. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.AspNet.Clients {
+	using System;
+	using DotNetOpenAuth.OAuth.ChannelElements;
+
+	/// <summary>
+	/// Simple wrapper around IConsumerTokenManager
+	/// </summary>
+	public class SimpleConsumerTokenManager : IConsumerTokenManager {
+		/// <summary>
+		/// Store the token manager.
+		/// </summary>
+		private readonly IOAuthTokenManager tokenManager;
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SimpleConsumerTokenManager"/> class.
+		/// </summary>
+		/// <param name="consumerKey">The consumer key.</param>
+		/// <param name="consumerSecret">The consumer secret.</param>
+		/// <param name="tokenManager">The OAuth token manager.</param>
+		public SimpleConsumerTokenManager(string consumerKey, string consumerSecret, IOAuthTokenManager tokenManager) {
+			Requires.NotNullOrEmpty(consumerKey, "consumerKey");
+			Requires.NotNullOrEmpty(consumerSecret, "consumerSecret");
+			Requires.NotNull(tokenManager, "oAuthTokenManager");
+
+			this.ConsumerKey = consumerKey;
+			this.ConsumerSecret = consumerSecret;
+			this.tokenManager = tokenManager;
+		}
+
+		/// <summary>
+		/// Gets the consumer key.
+		/// </summary>
+		/// <value>
+		/// The consumer key.
+		/// </value>
+		public string ConsumerKey {
+			get;
+			private set;
+		}
+
+		/// <summary>
+		/// Gets the consumer secret.
+		/// </summary>
+		/// <value>
+		/// The consumer secret.
+		/// </value>
+		public string ConsumerSecret {
+			get;
+			private set;
+		}
+
+		/// <summary>
+		/// Gets the Token Secret given a request or access token.
+		/// </summary>
+		/// <param name="token">The request or access token.</param>
+		/// <returns>
+		/// The secret associated with the given token.
+		/// </returns>
+		/// <exception cref="ArgumentException">Thrown if the secret cannot be found for the given token.</exception>
+		public string GetTokenSecret(string token) {
+			return this.tokenManager.GetTokenSecret(token);
+		}
+
+		/// <summary>
+		/// Stores a newly generated unauthorized request token, secret, and optional
+		/// application-specific parameters for later recall.
+		/// </summary>
+		/// <param name="request">The request message that resulted in the generation of a new unauthorized request token.</param>
+		/// <param name="response">The response message that includes the unauthorized request token.</param>
+		/// <exception cref="ArgumentException">Thrown if the consumer key is not registered, or a required parameter was not found in the parameters collection.</exception>
+		public void StoreNewRequestToken(DotNetOpenAuth.OAuth.Messages.UnauthorizedTokenRequest request, DotNetOpenAuth.OAuth.Messages.ITokenSecretContainingMessage response) {
+			this.tokenManager.StoreRequestToken(response.Token, response.TokenSecret);
+		}
+
+		/// <summary>
+		/// Deletes a request token and its associated secret and stores a new access token and secret.
+		/// </summary>
+		/// <param name="consumerKey">The Consumer that is exchanging its request token for an access token.</param>
+		/// <param name="requestToken">The Consumer's request token that should be deleted/expired.</param>
+		/// <param name="accessToken">The new access token that is being issued to the Consumer.</param>
+		/// <param name="accessTokenSecret">The secret associated with the newly issued access token.</param>
+		public void ExpireRequestTokenAndStoreNewAccessToken(string consumerKey, string requestToken, string accessToken, string accessTokenSecret) {
+			this.tokenManager.ReplaceRequestTokenWithAccessToken(requestToken, accessToken, accessTokenSecret);
+		}
+
+		/// <summary>
+		/// Classifies a token as a request token or an access token.
+		/// </summary>
+		/// <param name="token">The token to classify.</param>
+		/// <returns>
+		/// Request or Access token, or invalid if the token is not recognized.
+		/// </returns>
+		public TokenType GetTokenType(string token) {
+			throw new NotSupportedException();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/DotNetOpenAuth.AspNet/Clients/OAuth/TwitterClient.cs b/src/DotNetOpenAuth.AspNet/Clients/OAuth/TwitterClient.cs
index ceaffd4..0ec0780 100644
--- a/src/DotNetOpenAuth.AspNet/Clients/OAuth/TwitterClient.cs
+++ b/src/DotNetOpenAuth.AspNet/Clients/OAuth/TwitterClient.cs
@@ -28,15 +28,15 @@ namespace DotNetOpenAuth.AspNet.Clients {
 		public static readonly ServiceProviderDescription TwitterServiceDescription = new ServiceProviderDescription {
 			RequestTokenEndpoint =
 				new MessageReceivingEndpoint(
-					"http://twitter.com/oauth/request_token",
+					"https://twitter.com/oauth/request_token",
 					HttpDeliveryMethods.GetRequest | HttpDeliveryMethods.AuthorizationHeaderRequest),
 			UserAuthorizationEndpoint =
 				new MessageReceivingEndpoint(
-					"http://twitter.com/oauth/authenticate",
+					"https://twitter.com/oauth/authenticate",
 					HttpDeliveryMethods.GetRequest | HttpDeliveryMethods.AuthorizationHeaderRequest),
 			AccessTokenEndpoint =
 				new MessageReceivingEndpoint(
-					"http://twitter.com/oauth/access_token",
+					"https://twitter.com/oauth/access_token",
 					HttpDeliveryMethods.GetRequest | HttpDeliveryMethods.AuthorizationHeaderRequest),
 			TamperProtectionElements = new ITamperProtectionChannelBindingElement[] { new HmacSha1SigningBindingElement() },
 		};
@@ -59,6 +59,16 @@ namespace DotNetOpenAuth.AspNet.Clients {
 		public TwitterClient(string consumerKey, string consumerSecret)
 			: base("twitter", TwitterServiceDescription, consumerKey, consumerSecret) { }
 
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TwitterClient"/> class.
+		/// </summary>
+		/// <param name="consumerKey">The consumer key.</param>
+		/// <param name="consumerSecret">The consumer secret.</param>
+		/// <param name="tokenManager">The token manager.</param>
+		public TwitterClient(string consumerKey, string consumerSecret, IOAuthTokenManager tokenManager)
+			: base("twitter", TwitterServiceDescription, new SimpleConsumerTokenManager(consumerKey, consumerSecret, tokenManager)) {
+		}
+
 		#endregion
 
 		#region Methods
diff --git a/src/DotNetOpenAuth.AspNet/Clients/OAuth2/OAuth2Client.cs b/src/DotNetOpenAuth.AspNet/Clients/OAuth2/OAuth2Client.cs
index 016d92e..cac4261 100644
--- a/src/DotNetOpenAuth.AspNet/Clients/OAuth2/OAuth2Client.cs
+++ b/src/DotNetOpenAuth.AspNet/Clients/OAuth2/OAuth2Client.cs
@@ -86,7 +86,20 @@ namespace DotNetOpenAuth.AspNet.Clients {
 		/// <returns>
 		/// An instance of <see cref="AuthenticationResult"/> containing authentication result. 
 		/// </returns>
-		public virtual AuthenticationResult VerifyAuthentication(HttpContextBase context) {
+		public AuthenticationResult VerifyAuthentication(HttpContextBase context) {
+			Requires.NotNull(this.returnUrl, "this.returnUrl");
+			return VerifyAuthentication(context, this.returnUrl);
+		}
+
+		/// <summary>
+		/// Check if authentication succeeded after user is redirected back from the service provider.
+		/// </summary>
+		/// <param name="context">The context.</param>
+		/// <param name="returnPageUrl">The return URL which should match the value passed to RequestAuthentication() method.</param>
+		/// <returns>
+		/// An instance of <see cref="AuthenticationResult"/> containing authentication result.
+		/// </returns>
+		public virtual AuthenticationResult VerifyAuthentication(HttpContextBase context, Uri returnPageUrl) {
 			Requires.NotNull(context, "context");
 
 			string code = context.Request.QueryString["code"];
@@ -94,7 +107,7 @@ namespace DotNetOpenAuth.AspNet.Clients {
 				return AuthenticationResult.Failed;
 			}
 
-			string accessToken = this.QueryAccessToken(this.returnUrl, code);
+			string accessToken = this.QueryAccessToken(returnPageUrl, code);
 			if (accessToken == null) {
 				return AuthenticationResult.Failed;
 			}
@@ -133,7 +146,7 @@ namespace DotNetOpenAuth.AspNet.Clients {
 		/// <returns>
 		/// An absolute URL. 
 		/// </returns>
-		[SuppressMessage("Microsoft.Naming", "CA1726:UsePreferredTerms", MessageId = "Login", 
+		[SuppressMessage("Microsoft.Naming", "CA1726:UsePreferredTerms", MessageId = "Login",
 			Justification = "Login is used more consistently in ASP.Net")]
 		protected abstract Uri GetServiceLoginUrl(Uri returnUrl);
 
diff --git a/src/DotNetOpenAuth.AspNet/Clients/OpenID/OpenIDClient.cs b/src/DotNetOpenAuth.AspNet/Clients/OpenID/OpenIDClient.cs
index 6ced1a6..bd706f5 100644
--- a/src/DotNetOpenAuth.AspNet/Clients/OpenID/OpenIDClient.cs
+++ b/src/DotNetOpenAuth.AspNet/Clients/OpenID/OpenIDClient.cs
@@ -20,18 +20,20 @@ namespace DotNetOpenAuth.AspNet.Clients {
 		#region Constants and Fields
 
 		/// <summary>
-		/// The _openid relaying party.
+		/// The openid relying party.
 		/// </summary>
-		private static readonly OpenIdRelyingParty RelyingParty =
-			new OpenIdRelyingParty(new StandardRelyingPartyApplicationStore());
+		/// <remarks>
+		/// Pass null as applicationStore to specify dumb mode
+		/// </remarks>
+		private static readonly OpenIdRelyingParty RelyingParty = new OpenIdRelyingParty(applicationStore: null);
 
 		/// <summary>
-		/// The _provider identifier.
+		/// The provider identifier.
 		/// </summary>
 		private readonly Identifier providerIdentifier;
 
 		/// <summary>
-		/// The _provider name.
+		/// The provider name.
 		/// </summary>
 		private readonly string providerName;
 
diff --git a/src/DotNetOpenAuth.AspNet/DotNetOpenAuth.AspNet.csproj b/src/DotNetOpenAuth.AspNet/DotNetOpenAuth.AspNet.csproj
index f28f96f..f1fbacd 100644
--- a/src/DotNetOpenAuth.AspNet/DotNetOpenAuth.AspNet.csproj
+++ b/src/DotNetOpenAuth.AspNet/DotNetOpenAuth.AspNet.csproj
@@ -42,6 +42,8 @@
   <ItemGroup>
     <Compile Include="AuthenticationResult.cs" />
     <Compile Include="Clients\DictionaryExtensions.cs" />
+    <Compile Include="Clients\OAuth\IOAuthTokenManager.cs" />
+    <Compile Include="Clients\OAuth\SimpleConsumerTokenManager.cs" />
     <Compile Include="IAuthenticationClient.cs" />
     <Compile Include="Clients\OAuth2\FacebookClient.cs" />
     <Compile Include="Clients\OAuth2\FacebookGraphData.cs" />
diff --git a/src/DotNetOpenAuth.AspNet/OpenAuthSecurityManager.cs b/src/DotNetOpenAuth.AspNet/OpenAuthSecurityManager.cs
index 463f056..06ca161 100644
--- a/src/DotNetOpenAuth.AspNet/OpenAuthSecurityManager.cs
+++ b/src/DotNetOpenAuth.AspNet/OpenAuthSecurityManager.cs
@@ -8,6 +8,7 @@ namespace DotNetOpenAuth.AspNet {
 	using System;
 	using System.Diagnostics.CodeAnalysis;
 	using System.Web;
+	using DotNetOpenAuth.AspNet.Clients;
 	using DotNetOpenAuth.Messaging;
 
 	/// <summary>
@@ -168,6 +169,46 @@ namespace DotNetOpenAuth.AspNet {
 			return result;
 		}
 
+		/// <summary>
+		/// Checks if user is successfully authenticated when user is redirected back to this user.
+		/// </summary>
+		/// <param name="returnUrl">The return Url which must match exactly the Url passed into RequestAuthentication() earlier.</param>
+		/// <returns>
+		/// The result of the authentication.
+		/// </returns>
+		public AuthenticationResult VerifyAuthentication(string returnUrl) {
+			Requires.NotNullOrEmpty(returnUrl, "returnUrl");
+
+			// Only OAuth2 requires the return url value for the verify authenticaiton step
+			OAuth2Client oauth2Client = this.authenticationProvider as OAuth2Client;
+			if (oauth2Client != null) {
+				// convert returnUrl to an absolute path
+				Uri uri;
+				if (!string.IsNullOrEmpty(returnUrl)) {
+					uri = UriHelper.ConvertToAbsoluteUri(returnUrl, this.requestContext);
+				}
+				else {
+					uri = this.requestContext.Request.GetPublicFacingUrl();
+				}
+
+				AuthenticationResult result = oauth2Client.VerifyAuthentication(this.requestContext, uri);
+				if (!result.IsSuccessful) {
+					// if the result is a Failed result, creates a new Failed response which has providerName info.
+					result = new AuthenticationResult(
+						isSuccessful: false,
+						provider: this.authenticationProvider.ProviderName,
+						providerUserId: null,
+						userName: null,
+						extraData: null);
+				}
+
+				return result;
+			}
+			else {
+				return this.VerifyAuthentication();
+			}
+		}
+
 		#endregion
 	}
-}
+}
\ No newline at end of file
diff --git a/src/DotNetOpenAuth.Core/Messaging/Reflection/MessageDescriptionCollection.cs b/src/DotNetOpenAuth.Core/Messaging/Reflection/MessageDescriptionCollection.cs
index 1fa9252..3517abc 100644
--- a/src/DotNetOpenAuth.Core/Messaging/Reflection/MessageDescriptionCollection.cs
+++ b/src/DotNetOpenAuth.Core/Messaging/Reflection/MessageDescriptionCollection.cs
@@ -9,6 +9,7 @@ namespace DotNetOpenAuth.Messaging.Reflection {
 	using System.Collections.Generic;
 	using System.Diagnostics.CodeAnalysis;
 	using System.Diagnostics.Contracts;
+	using System.Linq;
 
 	/// <summary>
 	/// A cache of <see cref="MessageDescription"/> instances.
@@ -35,7 +36,10 @@ namespace DotNetOpenAuth.Messaging.Reflection {
 		/// An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.
 		/// </returns>
 		public IEnumerator<MessageDescription> GetEnumerator() {
-			return this.reflectedMessageTypes.Values.GetEnumerator();
+			lock (this.reflectedMessageTypes) {
+				// We must clone the collection so that it's thread-safe to the caller as it leaves our lock.
+				return this.reflectedMessageTypes.Values.ToList().GetEnumerator();
+			}
 		}
 
 		#endregion
@@ -49,7 +53,7 @@ namespace DotNetOpenAuth.Messaging.Reflection {
 		/// An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.
 		/// </returns>
 		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
-			return this.reflectedMessageTypes.Values.GetEnumerator();
+			return this.GetEnumerator();
 		}
 
 		#endregion
@@ -71,15 +75,23 @@ namespace DotNetOpenAuth.Messaging.Reflection {
 			MessageTypeAndVersion key = new MessageTypeAndVersion(messageType, messageVersion);
 
 			MessageDescription result;
-			if (!this.reflectedMessageTypes.TryGetValue(key, out result)) {
+			lock (this.reflectedMessageTypes) {
+				this.reflectedMessageTypes.TryGetValue(key, out result);
+			}
+
+			if (result == null) {
+				// Construct the message outside the lock.
+				var newDescription = new MessageDescription(messageType, messageVersion);
+
+				// Then use the lock again to either acquire what someone else has created in the meantime, or 
+				// set and use our own result.
 				lock (this.reflectedMessageTypes) {
 					if (!this.reflectedMessageTypes.TryGetValue(key, out result)) {
-						this.reflectedMessageTypes[key] = result = new MessageDescription(messageType, messageVersion);
+						this.reflectedMessageTypes[key] = result = newDescription;
 					}
 				}
 			}
 
-			Contract.Assume(result != null, "We should never assign null values to this dictionary.");
 			return result;
 		}
 
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/RelyingParty/OpenIdRelyingParty.cs b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/RelyingParty/OpenIdRelyingParty.cs
index 4dba624..6264041 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/RelyingParty/OpenIdRelyingParty.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/RelyingParty/OpenIdRelyingParty.cs
@@ -99,7 +99,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <summary>
 		/// Initializes a new instance of the <see cref="OpenIdRelyingParty"/> class.
 		/// </summary>
-		/// <param name="applicationStore">The application store.  If <c>null</c>, the relying party will always operate in "dumb mode".</param>
+		/// <param name="applicationStore">The application store.  If <c>null</c>, the relying party will always operate in "stateless/dumb mode".</param>
 		public OpenIdRelyingParty(IOpenIdApplicationStore applicationStore)
 			: this(applicationStore, applicationStore) {
 		}
@@ -107,8 +107,8 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <summary>
 		/// Initializes a new instance of the <see cref="OpenIdRelyingParty"/> class.
 		/// </summary>
-		/// <param name="cryptoKeyStore">The association store.  If null, the relying party will always operate in "dumb mode".</param>
-		/// <param name="nonceStore">The nonce store to use.  If null, the relying party will always operate in "dumb mode".</param>
+		/// <param name="cryptoKeyStore">The association store.  If <c>null</c>, the relying party will always operate in "stateless/dumb mode".</param>
+		/// <param name="nonceStore">The nonce store to use.  If <c>null</c>, the relying party will always operate in "stateless/dumb mode".</param>
 		[SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Justification = "Unavoidable")]
 		private OpenIdRelyingParty(ICryptoKeyStore cryptoKeyStore, INonceStore nonceStore) {
 			// If we are a smart-mode RP (supporting associations), then we MUST also be 
@@ -133,12 +133,9 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 				this.SecuritySettings.MinimumRequiredOpenIdVersion = ProtocolVersion.V20;
 			}
 
-			if (cryptoKeyStore == null) {
-				cryptoKeyStore = new MemoryCryptoKeyStore();
-			}
-
 			this.channel = new OpenIdRelyingPartyChannel(cryptoKeyStore, nonceStore, this.SecuritySettings);
-			this.AssociationManager = new AssociationManager(this.Channel, new CryptoKeyStoreAsRelyingPartyAssociationStore(cryptoKeyStore), this.SecuritySettings);
+			var associationStore = cryptoKeyStore != null ? new CryptoKeyStoreAsRelyingPartyAssociationStore(cryptoKeyStore) : null;
+			this.AssociationManager = new AssociationManager(this.Channel, associationStore, this.SecuritySettings);
 			this.discoveryServices = new IdentifierDiscoveryServices(this);
 
 			Reporting.RecordFeatureAndDependencyUse(this, cryptoKeyStore, nonceStore);
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props
index 9855991..b61d74a 100644
--- a/tools/DotNetOpenAuth.props
+++ b/tools/DotNetOpenAuth.props
@@ -12,6 +12,7 @@
 		<OutputPath45>$(ProjectRoot)bin\v4.5\$(Configuration)\</OutputPath45>
 		<DocOutputPath>$(ProjectRoot)doc\</DocOutputPath>
 		<IntermediatePath>$(ProjectRoot)obj\$(TargetFrameworkVersion)\$(Configuration)\</IntermediatePath>
+		<IntermediatePath40>$(ProjectRoot)obj\v4.0\$(Configuration)\</IntermediatePath40>
 		<BaseIntermediateOutputPath Condition=" '$(BaseIntermediateOutputPath)' == '' ">obj\$(TargetFrameworkVersion)\</BaseIntermediateOutputPath>
 		<ToolsDir>$(ProjectRoot)tools\</ToolsDir>
 		<ZipLevel>6</ZipLevel>