Merge branch 'v3.2' into mono2origin/mono2

Conflicts:
	src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs

1 files changed, 2 insertions, 13 deletions

diff --git a/samples/OpenIdOfflineProvider/Properties/AssemblyInfo.cs b/samples/OpenIdOfflineProvider/Properties/AssemblyInfo.cs
index adaded3..77d7464 100644
--- a/samples/OpenIdOfflineProvider/Properties/AssemblyInfo.cs
+++ b/samples/OpenIdOfflineProvider/Properties/AssemblyInfo.cs
@@ -10,6 +10,8 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 
+// We DON'T put an AssemblyVersionAttribute in here because it is generated in the build.
+
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
@@ -36,16 +38,3 @@ using System.Windows;
 	ResourceDictionaryLocation.SourceAssembly)] // where the generic resource dictionary is located
 	// (used if a resource is not found in the page, 
 	// app, or any theme specific resource dictionaries)
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]