diff --git a/BuildFeed.Model/BuildFeed.Model.csproj b/BuildFeed.Model/BuildFeed.Model.csproj index e1126b0..5367311 100644 --- a/BuildFeed.Model/BuildFeed.Model.csproj +++ b/BuildFeed.Model/BuildFeed.Model.csproj @@ -34,8 +34,8 @@ ..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll - - ..\packages\HtmlAgilityPack.1.5.1\lib\Net45\HtmlAgilityPack.dll + + ..\packages\HtmlAgilityPack.1.5.5\lib\Net45\HtmlAgilityPack.dll ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll diff --git a/BuildFeed.Model/BuildRepository.cs b/BuildFeed.Model/BuildRepository.cs index 49ff9a4..718ecab 100644 --- a/BuildFeed.Model/BuildRepository.cs +++ b/BuildFeed.Model/BuildRepository.cs @@ -155,6 +155,9 @@ namespace BuildFeed.Model [DataObjectMethod(DataObjectMethodType.Select, false)] public async Task> SelectFrontPage() { + const int currentFamily = (int)ProjectFamily.Redstone; + const int currentXbox = (int)ProjectFamily.Redstone2; + var families = new Dictionary(); IAggregateFluent query = _buildCollection.Aggregate() @@ -163,7 +166,7 @@ namespace BuildFeed.Model { nameof(Build.Family), new BsonDocument { - {"$gte", 30} + {"$gte", currentFamily} } } }) @@ -233,7 +236,7 @@ namespace BuildFeed.Model CurrentRelease = results .Where(g => g.Key.Family == family && g.Key.LabUrl.Contains("_release") && !g.Key.LabUrl.Contains("xbox") && (g.Key.SourceType == TypeOfSource.PublicRelease || g.Key.SourceType == TypeOfSource.UpdateGDR)) .SelectMany(g => g.Items).OrderByDescending(b => b.BuildTime).FirstOrDefault(), - CurrentXbox = results.Where(g => g.Key.Family == family && g.Key.LabUrl.Contains("xbox")).SelectMany(g => g.Items).OrderByDescending(b => b.BuildTime).FirstOrDefault() + CurrentXbox = results.Where(g => (int)g.Key.Family >= currentXbox && g.Key.Family == family && g.Key.LabUrl.Contains("xbox")).SelectMany(g => g.Items).OrderByDescending(b => b.BuildTime).FirstOrDefault() }; families.Add(family, fp); diff --git a/BuildFeed.Model/packages.config b/BuildFeed.Model/packages.config index 2949cd8..9529c89 100644 --- a/BuildFeed.Model/packages.config +++ b/BuildFeed.Model/packages.config @@ -1,7 +1,7 @@  - + diff --git a/BuildFeed/BuildFeed.csproj b/BuildFeed/BuildFeed.csproj index 415da87..44fc857 100644 --- a/BuildFeed/BuildFeed.csproj +++ b/BuildFeed/BuildFeed.csproj @@ -1,7 +1,7 @@  + - @@ -29,7 +29,7 @@ true - 2.4 + 2.5 @@ -67,8 +67,8 @@ ..\packages\AutoMapper.6.1.1\lib\net45\AutoMapper.dll - - ..\packages\HtmlAgilityPack.1.5.1\lib\Net45\HtmlAgilityPack.dll + + ..\packages\HtmlAgilityPack.1.5.5\lib\Net45\HtmlAgilityPack.dll ..\packages\Humanizer.Core.2.2.0\lib\netstandard1.0\Humanizer.dll @@ -144,8 +144,8 @@ ..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll - - ..\packages\System.Net.Http.4.3.2\lib\net46\System.Net.Http.dll + + ..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll @@ -178,8 +178,9 @@ ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.1\lib\net461\System.Security.Cryptography.X509Certificates.dll + True @@ -227,8 +228,8 @@ ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - - ..\packages\WilderMinds.RssSyndication.1.1.0\lib\netstandard1.3\WilderMinds.RssSyndication.dll + + ..\packages\WilderMinds.RssSyndication.1.2.0\lib\netstandard2.0\WilderMinds.RssSyndication.dll @@ -276,6 +277,8 @@ + + @@ -293,6 +296,7 @@ + dark.scss @@ -337,11 +341,13 @@ - - - - - + + + + + + + @@ -460,8 +466,6 @@ - - @@ -536,9 +540,9 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - +