Skip to content

Commit 10ecd7c

Browse files
author
rstam
committed
Change all versions numbers in the code to production version numbers. Also, standardize on 3-component version numbers.
1 parent 13c40e7 commit 10ecd7c

14 files changed

+41
-49
lines changed

MongoDB.Driver/Communication/FeatureDetection/FeatureSetDetector.cs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,26 @@ internal class FeatureSetDetector
3030

3131
// added in 2.4.0
3232
new FeatureSetDependency(
33-
new ServerVersionDependency(new Version(2, 4, 0)),
33+
new ServerVersionDependency(2, 4, 0),
3434
FeatureId.TextSearchCommand),
3535

36-
// added in 2.5.2
36+
// added in 2.6.0
3737
new FeatureSetDependency(
38-
new ServerVersionDependency(2, 5, 2),
38+
new ServerVersionDependency(2, 6, 0),
3939
FeatureId.AggregateAllowDiskUse,
4040
FeatureId.AggregateCursor,
41-
FeatureId.AggregateOutputToCollection),
42-
43-
// added in 2.5.3
44-
new FeatureSetDependency(
45-
new ServerVersionDependency(2, 5, 3),
4641
FeatureId.AggregateExplain,
47-
FeatureId.MaxTime,
48-
FeatureId.UserManagementCommands),
49-
50-
// added in 2.5.5
51-
new FeatureSetDependency(
52-
new ServerVersionDependency(2, 5, 5),
42+
FeatureId.AggregateOutputToCollection,
5343
FeatureId.CreateIndexCommand,
44+
FeatureId.MaxTime,
5445
FeatureId.TextSearchQuery,
46+
FeatureId.UserManagementCommands,
5547
FeatureId.WriteCommands),
5648

57-
// added in 2.5.5 but not on mongos
49+
// added in 2.6.0 but not on mongos
5850
new FeatureSetDependency(
5951
new AndDependency(
60-
new ServerVersionDependency(2, 5, 5),
52+
new ServerVersionDependency(2, 6, 0),
6153
new NotDependency(new InstanceTypeDependency(MongoServerInstanceType.ShardRouter))),
6254
FeatureId.ParallelScanCommand)
6355
};

MongoDB.Driver/MongoServerBuildInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private Version ParseVersion(string versionString)
9797
var version = match.Groups["version"].Value;
9898
return new Version(version);
9999
}
100-
return new Version(0, 0, 0, 0);
100+
return new Version(0, 0, 0);
101101
}
102102

103103
// public static methods

MongoDB.DriverUnitTests/Builders/QueryBuilderGeoJsonIntegrationTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void TestGeoIntersects()
7070
{
7171
var server = Configuration.TestServer;
7272
server.Connect();
73-
if (server.BuildInfo.Version >= new Version(2, 3, 2))
73+
if (server.BuildInfo.Version >= new Version(2, 4, 0))
7474
{
7575
var point = GeoJson.Point(GeoJson.Geographic(40, 18));
7676

@@ -87,7 +87,7 @@ public void TestNear()
8787
{
8888
var server = Configuration.TestServer;
8989
server.Connect();
90-
if (server.BuildInfo.Version >= new Version(2, 3, 2))
90+
if (server.BuildInfo.Version >= new Version(2, 4, 0))
9191
{
9292
var point = GeoJson.Point(GeoJson.Geographic(40, 18));
9393

@@ -104,7 +104,7 @@ public void TestWithin()
104104
{
105105
var server = Configuration.TestServer;
106106
server.Connect();
107-
if (server.BuildInfo.Version >= new Version(2, 3, 2))
107+
if (server.BuildInfo.Version >= new Version(2, 4, 0))
108108
{
109109
var polygon = GeoJson.Polygon(
110110
GeoJson.Geographic(40, 18),
@@ -126,7 +126,7 @@ public void TestWithinNotFound()
126126
{
127127
var server = Configuration.TestServer;
128128
server.Connect();
129-
if (server.BuildInfo.Version >= new Version(2, 3, 2))
129+
if (server.BuildInfo.Version >= new Version(2, 4, 0))
130130
{
131131
var polygon = GeoJson.Polygon(
132132
GeoJson.Geographic(41, 19),

MongoDB.DriverUnitTests/CommandResults/CollectionStatsResultTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void Test()
6969
Assert.IsTrue(result.StorageSize > 0);
7070
Assert.AreEqual(CollectionSystemFlags.HasIdIndex, result.SystemFlags);
7171
Assert.IsTrue(result.TotalIndexSize > 0);
72-
if (_server.BuildInfo.Version <= new Version(2, 5, 4, 0))
72+
if (_server.BuildInfo.Version < new Version(2, 6, 0))
7373
{
7474
Assert.AreEqual(CollectionUserFlags.None, result.UserFlags);
7575
}

MongoDB.DriverUnitTests/FailPoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void SetTimes(int n)
106106
// private methods
107107
private bool AreFailPointsSupported()
108108
{
109-
return _serverInstance.BuildInfo.Version >= new Version(2, 3, 0);
109+
return _serverInstance.BuildInfo.Version >= new Version(2, 4, 0);
110110
}
111111

112112
private bool IsThisFailPointSupported()

MongoDB.DriverUnitTests/Jira/CSharp111Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void TestAddToSetEach()
6464
var document = collection.FindOneAs<BsonDocument>();
6565
var json = document.ToJson();
6666
string expected;
67-
if (server.BuildInfo.Version >= new Version(2, 5, 2))
67+
if (server.BuildInfo.Version >= new Version(2, 6, 0))
6868
{
6969
expected = "{ '_id' : ObjectId('#ID'), 'InnerObjects' : [1, { 'X' : 1 }, { 'X' : 2 }, { 'X' : 3 }] }";
7070
}

MongoDB.DriverUnitTests/Jira/CSharp199Tests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void TestSingleRename()
2828
{
2929
var server = Configuration.TestServer;
3030
server.Connect();
31-
if (server.BuildInfo.Version >= new Version(1, 7, 2, 0))
31+
if (server.BuildInfo.Version >= new Version(1, 8, 0))
3232
{
3333
var database = Configuration.TestDatabase;
3434
var collection = Configuration.TestCollection;
@@ -53,7 +53,7 @@ public void TestMultipleRenames()
5353
{
5454
var server = Configuration.TestServer;
5555
server.Connect();
56-
if (server.BuildInfo.Version >= new Version(1, 7, 2, 0))
56+
if (server.BuildInfo.Version >= new Version(1, 8, 0))
5757
{
5858
var database = Configuration.TestDatabase;
5959
var collection = Configuration.TestCollection;
@@ -78,7 +78,7 @@ public void TestRenameWithSet()
7878
{
7979
var server = Configuration.TestServer;
8080
server.Connect();
81-
if (server.BuildInfo.Version >= new Version(1, 7, 2, 0))
81+
if (server.BuildInfo.Version >= new Version(1, 8, 0))
8282
{
8383
var database = Configuration.TestDatabase;
8484
var collection = Configuration.TestCollection;

MongoDB.DriverUnitTests/Jira/CSharp253Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void TestLegacyDollar()
8383
}
8484
}
8585
};
86-
if (_server.BuildInfo.Version < new Version(2, 5, 2))
86+
if (_server.BuildInfo.Version < new Version(2, 6, 0))
8787
{
8888
// starting with version 2.5.2 the server got stricter about dollars in element names
8989
// so the Code element below can only be added when testing against older servers

MongoDB.DriverUnitTests/Jira/CSharp358Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void TestInsertUpdateAndSaveWithElementNameStartingWithDollarSign()
3030
// starting with version 2.5.2 the server got stricter about dollars in element names
3131
// so this test should only be run when testing against older servers
3232
var server = Configuration.TestServer;
33-
if (server.BuildInfo.Version < new Version(2, 5, 2))
33+
if (server.BuildInfo.Version < new Version(2, 6, 0))
3434
{
3535
var database = Configuration.TestDatabase;
3636
var collection = Configuration.TestCollection;

MongoDB.DriverUnitTests/Linq/SelectOfTypeHierarchicalTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ where b is D
248248
[Test]
249249
public void TestWhereBTypeEqualsB()
250250
{
251-
if (_server.BuildInfo.Version >= new Version(2, 0))
251+
if (_server.BuildInfo.Version >= new Version(2, 0, 0))
252252
{
253253
var query =
254254
from b in _collection.AsQueryable<B>()

0 commit comments

Comments
 (0)