diff --git a/BuildFeed/BuildFeed.csproj b/BuildFeed/BuildFeed.csproj index 54ff2da..fbe5f52 100644 --- a/BuildFeed/BuildFeed.csproj +++ b/BuildFeed/BuildFeed.csproj @@ -105,16 +105,16 @@ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - ..\packages\MongoDB.Bson.2.1.0\lib\net45\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.1.1\lib\net45\MongoDB.Bson.dll True - - ..\packages\MongoDB.Driver.2.1.0\lib\net45\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.1.1\lib\net45\MongoDB.Driver.dll True - - ..\packages\MongoDB.Driver.Core.2.1.0\lib\net45\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.1.1\lib\net45\MongoDB.Driver.Core.dll True diff --git a/BuildFeed/Models/Build/Build-Version.cs b/BuildFeed/Models/Build/Build-Version.cs index e926a49..c246418 100644 --- a/BuildFeed/Models/Build/Build-Version.cs +++ b/BuildFeed/Models/Build/Build-Version.cs @@ -39,7 +39,8 @@ public async Task> SelectInVersionOrder(int limit, int skip) [DataObjectMethod(DataObjectMethodType.Select, false)] public async Task> SelectVersion(int major, int minor, int skip, int limit) { - return await _buildCollection.Find(b => b.MajorVersion == major && b.MinorVersion == minor) + byte bMajor = Convert.ToByte(major), bMinor = Convert.ToByte(minor); + var test = await _buildCollection.Find(Builders.Filter.And(Builders.Filter.Eq(b => b.MajorVersion, bMajor), Builders.Filter.Eq(b => b.MinorVersion, bMinor))) .SortByDescending(b => b.BuildTime) .ThenByDescending(b => b.MajorVersion) .ThenByDescending(b => b.MinorVersion) @@ -48,6 +49,7 @@ public async Task> SelectVersion(int major, int minor, int skip .Skip(skip) .Limit(limit) .ToListAsync(); + return test; } [DataObjectMethod(DataObjectMethodType.Select, false)] @@ -75,7 +77,8 @@ t.Minor descending [DataObjectMethod(DataObjectMethodType.Select, false)] public async Task SelectVersionCount(int major, int minor) { - return await _buildCollection.Find(b => b.MajorVersion == major && b.MinorVersion == minor) + byte bMajor = Convert.ToByte(major), bMinor = Convert.ToByte(minor); + return await _buildCollection.Find(Builders.Filter.And(Builders.Filter.Eq(b => b.MajorVersion, bMajor), Builders.Filter.Eq(b => b.MinorVersion, bMinor))) .CountAsync(); } } diff --git a/BuildFeed/Scripts/typings/jquery/jquery.d.ts b/BuildFeed/Scripts/typings/jquery/jquery.d.ts index 8401753..29b7697 100644 --- a/BuildFeed/Scripts/typings/jquery/jquery.d.ts +++ b/BuildFeed/Scripts/typings/jquery/jquery.d.ts @@ -1363,9 +1363,9 @@ interface JQuery { /** * Set the value of each element in the set of matched elements. * - * @param value A string of text or an array of strings corresponding to the value of each matched element to set as selected/checked. + * @param value A string of text, an array of strings or number corresponding to the value of each matched element to set as selected/checked. */ - val(value: string|string[]): JQuery; + val(value: string|string[]|number): JQuery; /** * Set the value of each element in the set of matched elements. * diff --git a/BuildFeed/packages.config b/BuildFeed/packages.config index 41eb08e..f857a85 100644 --- a/BuildFeed/packages.config +++ b/BuildFeed/packages.config @@ -7,7 +7,7 @@ - + @@ -30,9 +30,9 @@ - - - + + +