Merge branch 'master' into oauth2refactor

32 files changed, 179 insertions, 64 deletions

diff --git a/nuget/DotNetOpenAuth.AspNet.nuspec b/nuget/DotNetOpenAuth.AspNet.nuspec
index c518176..3d08145 100644
--- a/nuget/DotNetOpenAuth.AspNet.nuspec
+++ b/nuget/DotNetOpenAuth.AspNet.nuspec
@@ -4,13 +4,17 @@
 		<id>DotNetOpenAuth.AspNet</id>
 		<version>$version$</version>
 		<title>DotNetOpenAuth extensions for ASP.NET (WebPages)</title>
-		<authors>Luan Nguyen</authors>
+		<authors>Microsoft</authors>
 		<owners>Outercurve Foundation</owners>
 		<projectUrl>http://www.dotnetopenauth.net/</projectUrl>
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Allows adding OAuth and OpenID authentication to ASP.NET web projects using DotNetOpenAuth implementation.</description>
+		<summary>Allow your web visitors to log into your web site using accounts they already have with popular services.</summary>
+		<description>
+			Enables web site visitors to log into an ASP.NET web application via popular identity providers,
+			including Google, Yahoo!, Windows Live, Facebook, LinkedIn and Twitter.
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.OpenId.RelyingParty" version="[$version$]" />
 			<dependency id="DotNetOpenAuth.OAuth.Consumer" version="[$version$]" />
diff --git a/nuget/DotNetOpenAuth.Core.UI.nuspec b/nuget/DotNetOpenAuth.Core.UI.nuspec
index 467254f..c966515 100644
--- a/nuget/DotNetOpenAuth.Core.UI.nuspec
+++ b/nuget/DotNetOpenAuth.Core.UI.nuspec
@@ -10,8 +10,8 @@
 		<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>Contains core assemblies of DotNetOpenOAuth library.</summary>
-		<description>Shared library implementing the messaging pipeline used by auxiliary DotNetOpenAuth libraries.</description>
+		<summary>Shared library implementing the messaging pipeline used by auxiliary DotNetOpenAuth libraries.</summary>
+		<description>This package contains shared code for other NuGet packages, and contains no public API in and of itself.</description>
 		<language>en-US</language>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.Core" version="[$version$]" />
diff --git a/nuget/DotNetOpenAuth.Core.nuspec b/nuget/DotNetOpenAuth.Core.nuspec
index 64ca83e..9266869 100644
--- a/nuget/DotNetOpenAuth.Core.nuspec
+++ b/nuget/DotNetOpenAuth.Core.nuspec
@@ -10,8 +10,8 @@
 		<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>Contains core assemblies of DotNetOpenOAuth library.</summary>
-		<description>Shared library implementing the messaging pipeline used by auxiliary DotNetOpenAuth libraries.</description>
+		<summary>Shared library implementing the messaging pipeline used by auxiliary DotNetOpenAuth libraries.</summary>
+		<description>This package contains shared code for other NuGet packages, and contains no public API in and of itself.</description>
 		<language>en-US</language>
 		<frameworkAssemblies>
 			<frameworkAssembly assemblyName="System.Configuration" targetFramework="net40" />
diff --git a/nuget/DotNetOpenAuth.InfoCard.UI.nuspec b/nuget/DotNetOpenAuth.InfoCard.UI.nuspec
index 932ffdf..af6a6f6 100644
--- a/nuget/DotNetOpenAuth.InfoCard.UI.nuspec
+++ b/nuget/DotNetOpenAuth.InfoCard.UI.nuspec
@@ -10,8 +10,12 @@
 		<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>Contains assemblies that are required to implement an InfoCard relying party.</summary>
-		<description>Contains assemblies that are required to implement an InfoCard relying party.</description>
+		<summary>Add InfoCard login capability to ASP.NET web applications via ASP.NET web controls.</summary>
+		<description>
+			Adds an InfoCard button to your ASP.NET web application's login page via a simple ASP.NET control.
+			InfoCards enhance user security while mitigating phishing attacks by removing the
+			need for a password credential or 3rd party identity issuer entirely.
+		</description>
 		<language>en-US</language>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.Core.UI" version="[$version$]" />
diff --git a/nuget/DotNetOpenAuth.InfoCard.nuspec b/nuget/DotNetOpenAuth.InfoCard.nuspec
index dd07650..2c3f892 100644
--- a/nuget/DotNetOpenAuth.InfoCard.nuspec
+++ b/nuget/DotNetOpenAuth.InfoCard.nuspec
@@ -10,7 +10,12 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an InfoCard relying party.</description>
+		<summary>Add InfoCard login capability to ASP.NET web applications.</summary>
+		<description>
+			Adds an InfoCard button to your web application's login page.
+			InfoCards enhance user security while mitigating phishing attacks by removing the
+			need for a password credential or 3rd party identity issuer entirely.
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.Core" version="[$version$]" />
 		</dependencies>
diff --git a/nuget/DotNetOpenAuth.OAuth.Common.nuspec b/nuget/DotNetOpenAuth.OAuth.Common.nuspec
index 007a609..d88ba7b 100644
--- a/nuget/DotNetOpenAuth.OAuth.Common.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth.Common.nuspec
@@ -10,7 +10,8 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement OAuth 1 or 2.</description>
+		<summary>Common functionality that is required to implement OAuth 1 or 2.</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>
diff --git a/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec b/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec
index 830edf8..e397590 100644
--- a/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec
@@ -10,7 +10,11 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OAuth consumer.</description>
+		<summary>Add the role of an OAuth 1.0(a) consumer to a .NET (web) application.</summary>
+		<description>
+			Improve usability, reliability, conversion rates and security simultaneously by simply asking the user for permission to access their
+			data on 3rd party services rather than asking for their password.
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.OAuth.Core" version="[$version$]" />
 		</dependencies>
diff --git a/nuget/DotNetOpenAuth.OAuth.Core.nuspec b/nuget/DotNetOpenAuth.OAuth.Core.nuspec
index 8c3876b..6299e4d 100644
--- a/nuget/DotNetOpenAuth.OAuth.Core.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth.Core.nuspec
@@ -10,7 +10,8 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OAuth consumer or service provider.</description>
+		<summary>Functionality common to implement either an OAuth 1.0 consumer or service provider.</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>
diff --git a/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec b/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec
index 112a81a..e839d51 100644
--- a/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec
@@ -10,7 +10,11 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OAuth consumer.</description>
+		<summary>Add an OAuth 1.0(a) service provider role to a .NET (web) application.</summary>
+		<description>
+			Protect your users' data while allowing them to programmatically access it, including from other web applications,
+			all without disclosing their login credential with you to 3rd parties.
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.OAuth.Core" version="[$version$]" />
 			<dependency id="DotNetOpenAuth.OAuth.Common" version="[$version$]" />
diff --git a/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec b/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec
index dfbe119..b8146b1 100644
--- a/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec
@@ -10,7 +10,11 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OAuth 2.0 Authorization Server.</description>
+		<summary>Add an OAuth 2.0 Authorization Server role to an ASP.NET web application, allowing it to authorize calls to its users' protected data on resource servers.</summary>
+		<description>
+			Protect your users' data while allowing them to programmatically access it, including from other web applications,
+			all without disclosing their login credential with you to 3rd parties.  
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.OAuth2.Core" version="[$oauth2version$]" />
 		</dependencies>
diff --git a/nuget/DotNetOpenAuth.OAuth2.Client.UI.nuspec b/nuget/DotNetOpenAuth.OAuth2.Client.UI.nuspec
index 9075b67..e22dfe9 100644
--- a/nuget/DotNetOpenAuth.OAuth2.Client.UI.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth2.Client.UI.nuspec
@@ -10,7 +10,11 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OAuth 2.0 Client ASP.NET controls.</description>
+		<summary>Add an OAuth 2.0 Client role to a .NET desktop application, allowing it to make authorized calls to its visitors' protected data on other resource servers.</summary>
+		<description>
+			Improve usability, reliability, conversion rates and security simultaneously by simply asking the user for permission to access their
+			data on 3rd party services rather than asking for their password.
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.OAuth2.Client" version="[$oauth2version$]" />
 		</dependencies>
diff --git a/nuget/DotNetOpenAuth.OAuth2.Client.nuspec b/nuget/DotNetOpenAuth.OAuth2.Client.nuspec
index 67de333..a068429 100644
--- a/nuget/DotNetOpenAuth.OAuth2.Client.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth2.Client.nuspec
@@ -10,7 +10,11 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OAuth 2.0 Client.</description>
+		<summary>Add an OAuth 2.0 Client role to an ASP.NET web application, allowing it to make authorized calls to its visitors' protected data on other resource servers.</summary>
+		<description>
+			Improve usability, reliability, conversion rates and security simultaneously by simply asking the user for permission to access their
+			data on 3rd party services rather than asking for their password.
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.OAuth2.Core" version="[$oauth2version$]" />
 		</dependencies>
diff --git a/nuget/DotNetOpenAuth.OAuth2.Core.nuspec b/nuget/DotNetOpenAuth.OAuth2.Core.nuspec
index b069d64..f957069 100644
--- a/nuget/DotNetOpenAuth.OAuth2.Core.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth2.Core.nuspec
@@ -10,7 +10,8 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OAuth 2.0 client, authorization server or resource server.</description>
+		<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>
diff --git a/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec b/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec
index 994bb7c..8c3f94a 100644
--- a/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec
+++ b/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec
@@ -10,7 +10,12 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OAuth 2.0 Resource Server.</description>
+		<summary>Authorize incoming HTTP requests based on an OAuth 2 access token obtained from an OAuth 2 Authorization Server.</summary>
+		<description>
+			Allow your web forms or MVC web site, REST or WCF service, or any other HTTP(s) service to accept OAuth 2 access tokens
+			as a means of authorization so your users don't have to share their password with 3rd party apps and services in order
+			to share their data between your service and those of the 3rd party.
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.OAuth2.Core" version="[$oauth2version$]" />
 			<dependency id="DotNetOpenAuth.OAuth.Common" version="[$version$]" />
diff --git a/nuget/DotNetOpenAuth.OpenId.Core.UI.nuspec b/nuget/DotNetOpenAuth.OpenId.Core.UI.nuspec
index 780efb5..7411278 100644
--- a/nuget/DotNetOpenAuth.OpenId.Core.UI.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.Core.UI.nuspec
@@ -10,7 +10,8 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OpenID Relying Party or Provider.</description>
+		<summary>Common functionality required to implement an OpenID Provider or Relying Party that includes ASP.NET controls.</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.UI" version="[$version$]" />
 		</dependencies>
diff --git a/nuget/DotNetOpenAuth.OpenId.Core.nuspec b/nuget/DotNetOpenAuth.OpenId.Core.nuspec
index b8d9cd3..541e8e6 100644
--- a/nuget/DotNetOpenAuth.OpenId.Core.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.Core.nuspec
@@ -10,7 +10,8 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OpenID Relying Party or Provider.</description>
+		<summary>Common functionality required to implement an OpenID Provider or Relying Party.</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>
diff --git a/nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec b/nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec
index f496f28..281748d 100644
--- a/nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec
@@ -10,7 +10,13 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OpenID Provider.</description>
+		<summary>Add OpenID 1.1/2.0 Provider authentication functionality to a web application using ASP.NET controls.</summary>
+		<description>
+			Allow your customers to take their identities from your site with them as they visit other sites that accept
+			OpenID as relying parties.
+			Set up single-sign-on solutions within your organization using a standards-based, accepted protocol for
+			authentication delegation.
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.OpenId.Core.UI" version="[$version$]" />
 			<dependency id="DotNetOpenAuth.OpenId.Provider" version="[$version$]" />
diff --git a/nuget/DotNetOpenAuth.OpenId.Provider.nuspec b/nuget/DotNetOpenAuth.OpenId.Provider.nuspec
index 812145d..cf97799 100644
--- a/nuget/DotNetOpenAuth.OpenId.Provider.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.Provider.nuspec
@@ -10,7 +10,13 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OpenID Provider.</description>
+		<summary>Add OpenID 1.1/2.0 Provider authentication functionality to a web application programmatically.</summary>
+		<description>
+			Allow your customers to take their identities from your site with them as they visit other sites that accept
+			OpenID as relying parties.
+			Set up single-sign-on solutions within your organization using a standards-based, accepted protocol for
+			authentication delegation.
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.OpenId.Core" version="[$version$]" />
 		</dependencies>
diff --git a/nuget/DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec b/nuget/DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec
index f40a695..26e2c62 100644
--- a/nuget/DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec
@@ -10,7 +10,11 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OpenID Relying Party.</description>
+		<summary>Add OpenID 1.1/2.0 Relying Party authentication functionality to a web application using ASP.NET controls.</summary>
+		<description>
+			Increase conversion rates to your web site by lowering the bar to create an account with your site,
+			by allowing customers to use accounts they already have with other sites, such as Google and Yahoo!
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.OpenId.Core.UI" version="[$version$]" />
 			<dependency id="DotNetOpenAuth.OpenId.RelyingParty" version="[$version$]" />
diff --git a/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec b/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec
index 8673a2d..06d402e 100644
--- a/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec
+++ b/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec
@@ -10,7 +10,11 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an OpenID Relying Party.</description>
+		<summary>Add OpenID 1.1/2.0 Relying Party authentication functionality to a web application programmatically.</summary>
+		<description>
+			Increase conversion rates to your web site by lowering the bar to create an account with your site,
+			by allowing customers to use accounts they already have with other sites, such as Google and Yahoo!
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.OpenId.Core" version="[$version$]" />
 		</dependencies>
diff --git a/nuget/DotNetOpenAuth.OpenIdInfoCard.UI.nuspec b/nuget/DotNetOpenAuth.OpenIdInfoCard.UI.nuspec
index 27ef1bd..5f8b4ae 100644
--- a/nuget/DotNetOpenAuth.OpenIdInfoCard.UI.nuspec
+++ b/nuget/DotNetOpenAuth.OpenIdInfoCard.UI.nuspec
@@ -10,7 +10,12 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement an InfoCard relying party.</description>
+		<summary>Allow your web site's visitors to log in using InfoCards.</summary>
+		<description>
+			Adds an InfoCard button to an OpenID relying party's login button panel.
+			InfoCards enhance user security while mitigating phishing attacks by removing the
+			need for a password credential or 3rd party identity issuer entirely.
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.OpenId.RelyingParty.UI" version="[$version$]" />
 			<dependency id="DotNetOpenAuth.InfoCard.UI" version="[$version$]" />
diff --git a/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec b/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec
index 8c0037b..64f67b5 100644
--- a/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec
+++ b/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec
@@ -10,7 +10,11 @@
 		<iconUrl>https://github.com/AArnott/dotnetopenid/raw/v3.4/doc/logo/dnoa-logo_32x32.png</iconUrl>
 		<licenseUrl>http://www.opensource.org/licenses/ms-pl.html</licenseUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Contains assemblies that are required to implement OpenID+OAuth extension support.</description>
+		<summary>Request or respond with OAuth 1.0 tokens during an OpenID login.</summary>
+		<description>
+			As an OpenID 2.0 relying party or provider, include an OAuth 1.0 access token in the same user authorization/authentication step
+			so that the relying party may also directly access the user's data on the OpenID Provider's web service.
+		</description>
 		<dependencies>
 			<dependency id="DotNetOpenAuth.OAuth.Consumer" version="[$version$]" />
 			<dependency id="DotNetOpenAuth.OAuth.ServiceProvider" version="[$version$]" />
diff --git a/nuget/DotNetOpenAuth.Ultimate.nuspec b/nuget/DotNetOpenAuth.Ultimate.nuspec
index 40ff627..4fb57bb 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 adds 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..63ede92 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>
+			Add 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)" />
diff --git a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
index 5798bdb..f13fd80 100644
--- a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
+++ b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
@@ -99,7 +99,7 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" Condition=" '$(ClrVersion)' == '2' " />
+    <Reference Include="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" Condition=" '$(TargetFrameworkVersion)' == 'v3.5' " />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
diff --git a/samples/Samples.sln b/samples/Samples.sln
index 4429aff..1498532 100644
--- a/samples/Samples.sln
+++ b/samples/Samples.sln
@@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIdProviderMvc", "OpenId
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenID", "OpenID", "{A4059F7E-8E6F-4FA2-A1D5-1B9B46C93F82}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OAuth", "OAuth", "{812D828E-C91A-45AB-BAE9-3FC6D9560F9F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OAuth2", "OAuth2", "{812D828E-C91A-45AB-BAE9-3FC6D9560F9F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InfoCard", "InfoCard", "{9145144C-1192-41C9-9A6D-D8F6BFE350F2}"
 EndProject
@@ -73,6 +73,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OAuthResourceServer", "OAut
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OAuthAuthorizationServer", "OAuthAuthorizationServer\OAuthAuthorizationServer.csproj", "{C78E8235-1D46-43EB-A912-80B522C4E9AE}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OAuth1", "OAuth1", "{DA6EF95A-C3A3-4ABE-AABA-880082AD12BF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OAuthConsumer", "OAuthConsumer\OAuthConsumer.csproj", "{2BF1FFD1-607E-40D0-8AB5-EDA677EF932D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OAuthServiceProvider", "OAuthServiceProvider\OAuthServiceProvider.csproj", "{CAA2408C-6918-4902-A512-58BCD62216C3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CodeAnalysis|Any CPU = CodeAnalysis|Any CPU
@@ -170,6 +176,18 @@ Global
 		{C78E8235-1D46-43EB-A912-80B522C4E9AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C78E8235-1D46-43EB-A912-80B522C4E9AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C78E8235-1D46-43EB-A912-80B522C4E9AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BF1FFD1-607E-40D0-8AB5-EDA677EF932D}.CodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BF1FFD1-607E-40D0-8AB5-EDA677EF932D}.CodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
+		{2BF1FFD1-607E-40D0-8AB5-EDA677EF932D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BF1FFD1-607E-40D0-8AB5-EDA677EF932D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BF1FFD1-607E-40D0-8AB5-EDA677EF932D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BF1FFD1-607E-40D0-8AB5-EDA677EF932D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAA2408C-6918-4902-A512-58BCD62216C3}.CodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAA2408C-6918-4902-A512-58BCD62216C3}.CodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
+		{CAA2408C-6918-4902-A512-58BCD62216C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAA2408C-6918-4902-A512-58BCD62216C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAA2408C-6918-4902-A512-58BCD62216C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAA2408C-6918-4902-A512-58BCD62216C3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -189,5 +207,7 @@ Global
 		{E135F455-0669-49F8-9207-07FCA8C8FC79} = {812D828E-C91A-45AB-BAE9-3FC6D9560F9F}
 		{C78E8235-1D46-43EB-A912-80B522C4E9AE} = {812D828E-C91A-45AB-BAE9-3FC6D9560F9F}
 		{BE7016A8-D1B9-471A-AA53-A3D0CB800D35} = {9145144C-1192-41C9-9A6D-D8F6BFE350F2}
+		{2BF1FFD1-607E-40D0-8AB5-EDA677EF932D} = {DA6EF95A-C3A3-4ABE-AABA-880082AD12BF}
+		{CAA2408C-6918-4902-A512-58BCD62216C3} = {DA6EF95A-C3A3-4ABE-AABA-880082AD12BF}
 	EndGlobalSection
 EndGlobal
diff --git a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
index 3ccdfae..76f9103 100644
--- a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
+++ b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
@@ -31,10 +31,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{D49E2011
 	ProjectSection(SolutionItems) = preProject
 		..\..\nuget\DotNetOpenAuth.AspNet.nuspec = ..\..\nuget\DotNetOpenAuth.AspNet.nuspec
 		..\..\nuget\DotNetOpenAuth.Core.nuspec = ..\..\nuget\DotNetOpenAuth.Core.nuspec
+		..\..\nuget\DotNetOpenAuth.Core.UI.nuspec = ..\..\nuget\DotNetOpenAuth.Core.UI.nuspec
+		..\..\nuget\DotNetOpenAuth.InfoCard.nuspec = ..\..\nuget\DotNetOpenAuth.InfoCard.nuspec
+		..\..\nuget\DotNetOpenAuth.InfoCard.UI.nuspec = ..\..\nuget\DotNetOpenAuth.InfoCard.UI.nuspec
+		..\..\nuget\DotNetOpenAuth.nuspec = ..\..\nuget\DotNetOpenAuth.nuspec
+		..\..\nuget\DotNetOpenAuth.OAuth.Common.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth.Common.nuspec
 		..\..\nuget\DotNetOpenAuth.OAuth.Consumer.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth.Consumer.nuspec
 		..\..\nuget\DotNetOpenAuth.OAuth.Core.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth.Core.nuspec
+		..\..\nuget\DotNetOpenAuth.OAuth.ServiceProvider.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth.ServiceProvider.nuspec
+		..\..\nuget\DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec
+		..\..\nuget\DotNetOpenAuth.OAuth2.Client.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth2.Client.nuspec
+		..\..\nuget\DotNetOpenAuth.OAuth2.Client.UI.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth2.Client.UI.nuspec
+		..\..\nuget\DotNetOpenAuth.OAuth2.Core.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth2.Core.nuspec
+		..\..\nuget\DotNetOpenAuth.OAuth2.ResourceServer.nuspec = ..\..\nuget\DotNetOpenAuth.OAuth2.ResourceServer.nuspec
 		..\..\nuget\DotNetOpenAuth.OpenId.Core.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.Core.nuspec
+		..\..\nuget\DotNetOpenAuth.OpenId.Core.UI.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.Core.UI.nuspec
+		..\..\nuget\DotNetOpenAuth.OpenId.Provider.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.Provider.nuspec
+		..\..\nuget\DotNetOpenAuth.OpenId.Provider.UI.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.Provider.UI.nuspec
 		..\..\nuget\DotNetOpenAuth.OpenId.RelyingParty.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.RelyingParty.nuspec
+		..\..\nuget\DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec = ..\..\nuget\DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec
+		..\..\nuget\DotNetOpenAuth.OpenIdInfoCard.UI.nuspec = ..\..\nuget\DotNetOpenAuth.OpenIdInfoCard.UI.nuspec
+		..\..\nuget\DotNetOpenAuth.OpenIdOAuth.nuspec = ..\..\nuget\DotNetOpenAuth.OpenIdOAuth.nuspec
 		..\..\nuget\DotNetOpenAuth.Ultimate.nuspec = ..\..\nuget\DotNetOpenAuth.Ultimate.nuspec
 		..\..\nuget\nuget.proj = ..\..\nuget\nuget.proj
 	EndProjectSection
diff --git a/src/version.txt b/src/version.txt
index 34137d6..d72efa9 100644
--- a/src/version.txt
+++ b/src/version.txt
@@ -1,3 +1,3 @@
-4.0.0
-RC1
+4.1.0
+
 0.23.0-draft
diff --git a/tools/DotNetOpenAuth.Versioning.targets b/tools/DotNetOpenAuth.Versioning.targets
index 0fd86ed..6dd3637 100644
--- a/tools/DotNetOpenAuth.Versioning.targets
+++ b/tools/DotNetOpenAuth.Versioning.targets
@@ -26,7 +26,8 @@
 			<!-- In TeamCity, the build agent doesn't get the .git directory, but the commit id is available by other means. -->
 			<GitCommitId Condition=" '$(GitCommitId)' == '' ">$(BUILD_VCS_NUMBER)</GitCommitId>
 
-			<SemVerBuildSuffix>+build.$(BuildNumber).$(GitCommitId.Substring(0,10))</SemVerBuildSuffix>
+			<GitCommitIdShort Condition=" '$(GitCommitId)' != '' ">.$(GitCommitId.Substring(0,10))</GitCommitIdShort>
+			<SemVerBuildSuffix>+build.$(BuildNumber)$(GitCommitIdShort)</SemVerBuildSuffix>
 			<AssemblyInformationalVersion>$(BuildVersionSimple)$(PrereleaseVersion)$(SemVerBuildSuffix)</AssemblyInformationalVersion>
 
 			<!-- When NuGet supports SemVer 2.0, we can set NuGetPackageVersion to be the same as $(AssemblyInformationalVersion) -->
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props
index b74f003..98685e4 100644
--- a/tools/DotNetOpenAuth.props
+++ b/tools/DotNetOpenAuth.props
@@ -82,7 +82,7 @@
 										 DotNetOpenAuth.OAuth2.Client.UI;
 										 DotNetOpenAuth.OAuth2.ResourceServer;
 										">
-			<MergeIntoUnifiedAssembly Condition=" '$(IncludeOAuth2)' != 'true' ">false</MergeIntoUnifiedAssembly>
+			<MergeIntoUnifiedAssembly Condition=" '$(IncludeOAuth2)' == 'false' ">false</MergeIntoUnifiedAssembly>
 		</ProductProjectNames>
 		<ProductProjects Include="@(ProductProjectNames->'$(ProjectRoot)src\%(Identity)\%(Identity).csproj')"/>
 
diff --git a/tools/drop.proj b/tools/drop.proj
index 71d2a02..6b00229 100644
--- a/tools/drop.proj
+++ b/tools/drop.proj
@@ -80,7 +80,7 @@
 															$(ProjectRoot)Samples\**\*.refresh_;
 															$(ProjectRoot)Samples\*.proj;
 															" />
-			<ExcludedDropSamplesSourceFiles Condition=" '$(IncludeOAuth2)' != 'true' " Include="
+			<ExcludedDropSamplesSourceFiles Condition=" '$(IncludeOAuth2)' == 'false' " Include="
 															$(ProjectRoot)Samples\OAuthClient\**;
 															$(ProjectRoot)Samples\OAuthAuthorizationServer\**;
 															$(ProjectRoot)Samples\OAuthResourceServer\**;