Switched the roles of the DotNetOpenAuth.Ultimate and DotNetOpenAuth NuGet packages.

DotNetOpenAuth.Ultimate is now the monolithic assembly.
DotNetOpenAuth is now the collection of all DNOA packages.

3 files changed, 36 insertions, 31 deletions

diff --git a/nuget/DotNetOpenAuth.Ultimate.nuspec b/nuget/DotNetOpenAuth.Ultimate.nuspec
index 40ff627..dfaadc3 100644
--- a/nuget/DotNetOpenAuth.Ultimate.nuspec
+++ b/nuget/DotNetOpenAuth.Ultimate.nuspec
@@ -3,25 +3,33 @@
 	<metadata>
 		<id>DotNetOpenAuth.Ultimate</id>
 		<version>$version$</version>
-		<title>DotNetOpenAuth Ultimate</title>
+		<title>DotNetOpenAuth (unified)</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>OpenID, OAuth, &amp; InfoCard library for web sites/services and apps.</summary>
-		<description>A C# library that adds OpenID 2.0 Provider and Relying Party, OAuth Consumer and Service Provider, and InfoCard Selector support to your web site both programmatically and through convenient drop-in ASP.NET controls.</description>
+		<summary>OpenID, OAuth, &amp; InfoCard library for web and desktop applications.</summary>
+		<description>
+			A single assembly that enables OpenID 1.1/2.0, OAuth 1.0(a)/2.0, &amp; InfoCard authentication and authorization functionality for client and server applications.
+			This allows your (web) application to issue identities or accept issued identites from other web applications, and even access your users'
+			data on other services.
+		</description>
 		<language>en-US</language>
-		<dependencies>
-			<dependency id="DotNetOpenAuth.OpenId.RelyingParty.UI" version="[$version$]" />
-			<dependency id="DotNetOpenAuth.OpenId.Provider.UI" version="[$version$]" />
-			<dependency id="DotNetOpenAuth.OAuth.Consumer" version="[$version$]" />
-			<dependency id="DotNetOpenAuth.OAuth.ServiceProvider" version="[$version$]" />
-			<dependency id="DotNetOpenAuth.OpenIdInfoCard.UI" version="[$version$]" />
-		</dependencies>
 	</metadata>
 	<files>
-		<!-- this area intentionally left blank (so that nuget pack doesn't include all files and folders under this one in the package. -->
+		<file src="$OutputPath35$unified\signed\DotNetOpenAuth.dll" target="lib\net35-full\" />
+		<file src="$OutputPath40$unified\signed\DotNetOpenAuth.dll" target="lib\net40-full\" />
+
+		<file src="$OutputPath35$unified\DotNetOpenAuth.pdb" target="lib\net35-full\" />
+		<file src="$OutputPath40$unified\DotNetOpenAuth.pdb" target="lib\net40-full\" />
+
+		<file src="$OutputPath35$unified\DotNetOpenAuth.xml" target="lib\net35-full\" />
+		<file src="$OutputPath40$unified\DotNetOpenAuth.xml" target="lib\net40-full\" />
+
+		<file src="content\Ultimate\web.config.transform" target="content\web.config.transform" />
+
+		<file src="..\src\**\*.cs" target="src" />
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/DotNetOpenAuth.nuspec b/nuget/DotNetOpenAuth.nuspec
index db5e8ea..f4e18b9 100644
--- a/nuget/DotNetOpenAuth.nuspec
+++ b/nuget/DotNetOpenAuth.nuspec
@@ -3,32 +3,29 @@
 	<metadata>
 		<id>DotNetOpenAuth</id>
 		<version>$version$</version>
-		<title>DotNetOpenAuth Ultimate (unified)</title>
+		<title>DotNetOpenAuth</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>OpenID, OAuth, &amp; InfoCard library for web sites/services and apps.</summary>
-		<description>A C# library that adds OpenID 2.0 Provider and Relying Party, OAuth Consumer and Service Provider, and InfoCard Selector support to your web site both programmatically and through convenient drop-in ASP.NET controls.</description>
+		<summary>OpenID, OAuth, &amp; InfoCard library for web and desktop applications.</summary>
+		<description>
+			Enables OpenID 1.1/2.0, OAuth 1.0(a)/2.0, &amp; InfoCard authentication and authorization functionality for client and server applications.
+			This allows your (web) application to issue identities or accept issued identites from other web applications, and even access your users'
+			data on other services.
+		</description>
 		<language>en-US</language>
-		<frameworkAssemblies>
-			<frameworkAssembly assemblyName="System.Configuration" targetFramework="net40" />
-		</frameworkAssemblies>
+		<dependencies>
+			<dependency id="DotNetOpenAuth.OpenId.RelyingParty.UI" version="[$version$]" />
+			<dependency id="DotNetOpenAuth.OpenId.Provider.UI" version="[$version$]" />
+			<dependency id="DotNetOpenAuth.OAuth.Consumer" version="[$version$]" />
+			<dependency id="DotNetOpenAuth.OAuth.ServiceProvider" version="[$version$]" />
+			<dependency id="DotNetOpenAuth.OpenIdInfoCard.UI" version="[$version$]" />
+		</dependencies>
 	</metadata>
 	<files>
-		<file src="$OutputPath35$unified\signed\DotNetOpenAuth.dll" target="lib\net35-full\" />
-		<file src="$OutputPath40$unified\signed\DotNetOpenAuth.dll" target="lib\net40-full\" />
-
-		<file src="$OutputPath35$unified\DotNetOpenAuth.pdb" target="lib\net35-full\" />
-		<file src="$OutputPath40$unified\DotNetOpenAuth.pdb" target="lib\net40-full\" />
-
-		<file src="$OutputPath35$unified\DotNetOpenAuth.xml" target="lib\net35-full\" />
-		<file src="$OutputPath40$unified\DotNetOpenAuth.xml" target="lib\net40-full\" />
-
-		<file src="content\Ultimate\web.config.transform" target="content\web.config.transform" />
-
-		<file src="..\src\**\*.cs" target="src" />
+		<!-- this area intentionally left blank (so that nuget pack doesn't include all files and folders under this one in the package. -->
 	</files>
 </package>
\ No newline at end of file
diff --git a/nuget/nuget.proj b/nuget/nuget.proj
index 3e507b9..220deaa 100644
--- a/nuget/nuget.proj
+++ b/nuget/nuget.proj
@@ -51,10 +51,10 @@
 
 	<Target Name="Build" DependsOnTargets="BuildIntermediates">
 		<ItemGroup>
-			<NuGetPackages Include="*.nuspec" Exclude="DotNetOpenAuth.Ultimate.nuspec">
+			<NuGetPackages Include="*.nuspec" Exclude="DotNetOpenAuth.nuspec">
 				<Symbols>true</Symbols>
 			</NuGetPackages>
-			<NuGetPackages Include="DotNetOpenAuth.Ultimate.nuspec" />
+			<NuGetPackages Include="DotNetOpenAuth.nuspec" />
 
 			<NuGetProperties Include="version=$(NuGetPackageVersion)" />
 			<NuGetProperties Include="oauth2version=$(OAuth2PackagesVersion)" />