Skip to content

Commit 3389a8f

Browse files
committed
Adopt assembly versioning scheme 'major.minor.0.0'
The rationale behind this is that we don't want changes in the patch version to result in a different strong name; patches should be in- place updates and shouldn't lead to version conflicts. This will help reduce the need for assembly binding redirects. For now, we only do 'major.minor.0.0' instead of 'major.0.0.0' (which would be even better) and we increase the minor version by 1 to pre- vent strange-looking binding redirects like these: 4.0.0.0 - 4.7.127.0 -> 4.0.0.0 4.0.0.0 - 4.7.127.0 -> 4.7.0.0 In both cases, the following will probably look less suspicious: 4.0.0.0 - 4.7.127.0 -> 4.8.0.0 Moq 5 will be able to safely make the switch to 'major.0.0.0'.
1 parent 0ce473a commit 3389a8f

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

CHANGELOG.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file.
55
The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
66

77

8-
## Unreleased
8+
## 4.8.0-rc1
9+
10+
This is a pre-release version.
911

1012
#### Added
1113

@@ -26,6 +28,7 @@ The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1
2628

2729
* **Breaking change:** `SetupSequence` now overrides pre-existing setups like all other `Setup` methods do. This means that exhausted sequences no longer fall back to previous setups to produce a "default" action or return value. (@stakx, #476)
2830
* Delegates passed to `Returns` are validated a little more strictly than before (return type and parameter count must match with method being set up) (@stakx, #520)
31+
* Change assembly versioning scheme to `major.minor.0.0` to help prevent assembly version conflicts and to reduce the need for binding redirects (@stakx, #424)
2932

3033
#### Fixed
3134

GitInfo.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7.0
1+
4.8.0-rc1

Moq.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>Moq</id>
5-
<version>4.7</version>
5+
<version>4.8.0-rc1</version>
66
<title>Moq: an enjoyable mocking library</title>
77
<authors>Daniel Cazzulino, kzu</authors>
88
<owners>Daniel Cazzulino, Clarius Labs, kzu</owners>
@@ -11,7 +11,7 @@
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>Moq is the most popular and friendly mocking framework for .NET</description>
1313
<tags>moq tdd mocking mocks unittesting agile unittest</tags>
14-
<releaseNotes>A changelog is available at https://github.com/moq/moq4/blob/master/CHANGELOG.md.</releaseNotes>
14+
<releaseNotes>A changelog is available at https://github.com/moq/moq4/blob/v4.8.0-rc1/CHANGELOG.md.</releaseNotes>
1515
<dependencies>
1616
<group targetFramework=".NETFramework4.5">
1717
<dependency id="Castle.Core" version="4.2.1" />

Source/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
[assembly: AssemblyProduct("Moq")]
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
12-
[assembly: AssemblyVersion (ThisAssembly.Git.SemVer.Major + "." + ThisAssembly.Git.SemVer.Minor + "." + ThisAssembly.Git.SemVer.Patch)]
12+
[assembly: AssemblyVersion (ThisAssembly.Git.SemVer.Major + "." + ThisAssembly.Git.SemVer.Minor + ".0.0")]
1313
[assembly: AssemblyFileVersion (ThisAssembly.Git.SemVer.Major + "." + ThisAssembly.Git.SemVer.Minor + "." + ThisAssembly.Git.SemVer.Patch)]
14-
[assembly: AssemblyInformationalVersion (ThisAssembly.Git.SemVer.Major + "." + ThisAssembly.Git.SemVer.Minor + "." + ThisAssembly.Git.SemVer.Patch + "-" + ThisAssembly.Git.Branch + "+" + ThisAssembly.Git.Commit)]
14+
[assembly: AssemblyInformationalVersion (ThisAssembly.Git.SemVer.Major + "." + ThisAssembly.Git.SemVer.Minor + "." + ThisAssembly.Git.SemVer.Patch + "-" + ThisAssembly.Git.SemVer.Label + "+" + ThisAssembly.Git.Commit)]
1515

1616
[assembly: ComVisible(false)]
1717

0 commit comments

Comments
 (0)