diff options
| -rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.dll | bin | 108032 -> 108544 bytes | |||
| -rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.pdb | bin | 267776 -> 267776 bytes | |||
| -rw-r--r-- | src/DotNetOpenAuth.AspNet.Test/Properties/AssemblyInfo.cs | 12 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs | 10 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.Versioning.targets | 7 |
5 files changed, 15 insertions, 14 deletions
diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll Binary files differindex 4d43fe5..7d83f86 100644 --- a/lib/DotNetOpenAuth.BuildTasks.dll +++ b/lib/DotNetOpenAuth.BuildTasks.dll diff --git a/lib/DotNetOpenAuth.BuildTasks.pdb b/lib/DotNetOpenAuth.BuildTasks.pdb Binary files differindex 132bddb..6b210da 100644 --- a/lib/DotNetOpenAuth.BuildTasks.pdb +++ b/lib/DotNetOpenAuth.BuildTasks.pdb diff --git a/src/DotNetOpenAuth.AspNet.Test/Properties/AssemblyInfo.cs b/src/DotNetOpenAuth.AspNet.Test/Properties/AssemblyInfo.cs index 3c9f4f6..a242c28 100644 --- a/src/DotNetOpenAuth.AspNet.Test/Properties/AssemblyInfo.cs +++ b/src/DotNetOpenAuth.AspNet.Test/Properties/AssemblyInfo.cs @@ -21,15 +21,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("6c32d8f7-1394-40ef-9ec0-b8953adc0a4f")] - -// 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: AssemblyFileVersion("1.0.0.0")] diff --git a/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs b/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs index 6df372f..05976ea 100644 --- a/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs +++ b/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs @@ -29,6 +29,15 @@ namespace DotNetOpenAuth.BuildTasks { public string SimpleVersion { get; private set; } /// <summary> + /// Gets or sets the major.minor version string. + /// </summary> + /// <value> + /// The x.y string (no build number or revision number). + /// </value> + [Output] + public string MajorMinorVersion { get; set; } + + /// <summary> /// Gets or sets the prerelease version, or empty if this is a final release. /// </summary> /// <value> @@ -74,6 +83,7 @@ namespace DotNetOpenAuth.BuildTasks { this.PrereleaseVersion = prerelease; this.OAuth2PackagesVersion = oauth2PackagesVersion; this.SimpleVersion = typedVersion.ToString(); + this.MajorMinorVersion = new Version(typedVersion.Major, typedVersion.Minor).ToString(); this.BuildNumber = this.CalculateJDate(DateTime.Now); var fullVersion = new Version(typedVersion.Major, typedVersion.Minor, typedVersion.Build, this.BuildNumber); diff --git a/tools/DotNetOpenAuth.Versioning.targets b/tools/DotNetOpenAuth.Versioning.targets index 5ea67e5..0fd86ed 100644 --- a/tools/DotNetOpenAuth.Versioning.targets +++ b/tools/DotNetOpenAuth.Versioning.targets @@ -17,6 +17,7 @@ <Output TaskParameter="Version" PropertyName="BuildVersion" /> <Output TaskParameter="SimpleVersion" PropertyName="BuildVersionSimple" /> <Output TaskParameter="PrereleaseVersion" PropertyName="PrereleaseVersion" /> + <Output TaskParameter="MajorMinorVersion" PropertyName="MajorMinorVersion" /> <Output TaskParameter="OAuth2PackagesVersion" PropertyName="OAuth2PackagesVersion" /> <Output TaskParameter="GitCommitId" PropertyName="GitCommitId" /> <Output TaskParameter="BuildNumber" PropertyName="BuildNumber" /> @@ -45,8 +46,10 @@ </PropertyGroup> <MakeDir Directories="$(IntermediatePath)"/> <AssemblyInfo OutputFile="$(NewVersionCsFile)" CodeLanguage="C#" - AssemblyVersion="$(BuildVersion)" - AssemblyInformationalVersion="$(AssemblyInformationalVersion)" /> + AssemblyVersion="$(MajorMinorVersion)" + AssemblyFileVersion="$(BuildVersion)" + AssemblyInformationalVersion="$(AssemblyInformationalVersion)" + GenerateClass="true" /> <!-- Avoid applying the newly generated AssemblyInfo.cs file to the build unless it has changed in order to allow for incremental building. --> <CompareFiles OriginalItems="$(VersionCsFile)" NewItems="$(NewVersionCsFile)"> |