Migrated the latest changes from DNOA.Core.nuspec to the rest of them to fix the symbol server issues.

24 files changed, 202 insertions, 176 deletions

diff --git a/nuget/DotNetOpenAuth.AspNet.nuspec b/nuget/DotNetOpenAuth.AspNet.nuspec
index 3d08145..ef68ebb 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,10 +21,11 @@
 		</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="..\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 c966515..8887baa 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,15 +18,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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 d38ed2a..d8d0cc0 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,14 +21,14 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.Core.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.Core.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.Core.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.Core.xml" target="lib\net40-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full\" />
 
 		<file src="content\Core\web.config.transform" target="content\web.config.transform" />
 
diff --git a/nuget/DotNetOpenAuth.InfoCard.UI.nuspec b/nuget/DotNetOpenAuth.InfoCard.UI.nuspec
index af6a6f6..192761f 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,15 +23,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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 2c3f892..ca8f5fc 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,15 +21,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.InfoCard.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.InfoCard.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.InfoCard.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.InfoCard.xml" target="lib\net40-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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 d88ba7b..f34aa02 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,15 +17,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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 e397590..9c94bfd 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,15 +20,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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 e839d51..05e9524 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,15 +21,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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.nuspec b/nuget/DotNetOpenAuth.OAuth.nuspec
index 6299e4d..7f8f4b4 100644
--- a/nuget/DotNetOpenAuth.OAuth.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,17 +17,18 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth.xml" target="lib\net40-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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 b8146b1..82b46d6 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,15 +20,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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 e22dfe9..fca4eaa 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,15 +20,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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 a068429..20bb4cf 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,15 +20,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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.ResourceServer.nuspec b/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec
index 8c3f94a..0de40e7 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,15 +22,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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
index f957069..703d4a1 100644
--- a/nuget/DotNetOpenAuth.OAuth2.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth2.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
-		<id>DotNetOpenAuth.OAuth2.Core</id>
+		<id>$identity$.Core</id>
 		<version>$oauth2version$</version>
 		<title>DotNetOpenAuth OAuth 2.0 Core</title>
 		<authors>Andrew Arnott</authors>
@@ -17,15 +17,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth2.pdb" target="lib\net35-full" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth2.pdb" target="lib\net40-full" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OAuth2.xml" target="lib\net35-full" />
-		<file src="$OutputPath40$DotNetOpenAuth.OAuth2.xml" target="lib\net40-full" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-full" />
 
-		<file src="..\src\DotNetOpenAuth.OAuth2\**\*.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.UI.nuspec b/nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec
index 281748d..777d6df 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,15 +23,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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 cf97799..0f092f7 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,17 +22,18 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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 26e2c62..d24eb7e 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,15 +21,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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 06d402e..043b537 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,17 +20,18 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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.UI.nuspec b/nuget/DotNetOpenAuth.OpenId.UI.nuspec
index 7411278..bc39a76 100644
--- a/nuget/DotNetOpenAuth.OpenId.UI.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.UI.nuspec
@@ -17,15 +17,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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.nuspec b/nuget/DotNetOpenAuth.OpenId.nuspec
index 541e8e6..5956ae6 100644
--- a/nuget/DotNetOpenAuth.OpenId.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,16 +17,16 @@
 		</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="$OutputPath35$DotNetOpenAuth.OpenId.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.pdb" target="lib\net40-full\" />
-		<file src="$OutputPath35$DotNetOpenAuth.OpenId.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenId.xml" target="lib\net40-full\" />
+		<file src="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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\" />
@@ -44,8 +44,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 5f8b4ae..9fd52c3 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,15 +22,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-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="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-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="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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 64f67b5..b37ad9a 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,15 +22,16 @@
 		</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="$OutputPath35$signed\$identity$.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$signed\$identity$.dll" target="lib\net40-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenIdOAuth.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenIdOAuth.pdb" target="lib\net40-full\" />
+		<file src="$OutputPath35$$identity$.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.pdb" target="lib\net40-full\" />
 
-		<file src="$OutputPath35$DotNetOpenAuth.OpenIdOAuth.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$DotNetOpenAuth.OpenIdOAuth.xml" target="lib\net40-full\" />
+		<file src="$OutputPath35$$identity$.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$$identity$.xml" target="lib\net40-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 4fb57bb..61599fa 100644
--- a/nuget/DotNetOpenAuth.Ultimate.nuspec
+++ b/nuget/DotNetOpenAuth.Ultimate.nuspec
@@ -30,6 +30,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/nuget.proj b/nuget/nuget.proj
index 8258fcb..9a2091e 100644
--- a/nuget/nuget.proj
+++ b/nuget/nuget.proj
@@ -54,6 +54,7 @@
 			<NuGetProperties Include="oauth2version=$(OAuth2PackagesVersion)" />
 			<NuGetProperties Include="OutputPath35=$(OutputPath35)" />
 			<NuGetProperties Include="OutputPath40=$(OutputPath40)" />
+			<NuGetProperties Include="IntermediatePath=$(IntermediatePath40)" />
 
 			<NuGetPackages Include="*.nuspec" Exclude="DotNetOpenAuth.nuspec">
 				<Symbols>true</Symbols>
@@ -65,7 +66,7 @@
 		</PropertyGroup>
 		<ItemGroup>
 			<NuGetPackages>
-				<Properties>$(_NuGetProperties);Identity=%(FileName);GeneratedAssemblyInfoSourceFile=$(IntermediatePath)%(FileName).Version.cs</Properties>
+				<Properties>$(_NuGetProperties);Identity=%(FileName);GeneratedAssemblyInfoSourceFile=$(IntermediatePath40)%(FileName).Version.cs</Properties>
 			</NuGetPackages>
 		</ItemGroup>
 		<NuGetPack