diff --git a/BuildFeed/BuildFeed.csproj b/BuildFeed/BuildFeed.csproj index 0d4e22c..16fdd59 100644 --- a/BuildFeed/BuildFeed.csproj +++ b/BuildFeed/BuildFeed.csproj @@ -105,8 +105,8 @@ ..\packages\MongoDB.Driver.Core.2.2.0\lib\net45\MongoDB.Driver.Core.dll True - - ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll True diff --git a/BuildFeed/Controllers/rssController.cs b/BuildFeed/Controllers/rssController.cs index 0cbb13a..ca459da 100644 --- a/BuildFeed/Controllers/rssController.cs +++ b/BuildFeed/Controllers/rssController.cs @@ -14,7 +14,7 @@ namespace BuildFeed.Controllers public class rssController : LocalController { private Build bModel; - private const int RSS_SIZE = 20; + private const int RSS_SIZE = 25; public rssController() : base() { diff --git a/BuildFeed/Models/Build/BuildModel.cs b/BuildFeed/Models/Build/BuildModel.cs index b582600..463ec25 100644 --- a/BuildFeed/Models/Build/BuildModel.cs +++ b/BuildFeed/Models/Build/BuildModel.cs @@ -133,10 +133,30 @@ public ProjectFamily Family { return ProjectFamily.Windows7; } + else if (MajorVersion == 6 && Number >= 5000) + { + return ProjectFamily.WindowsVista; + } else if (MajorVersion == 6) { return ProjectFamily.Longhorn; } + else if (MajorVersion == 5 && Number >= 3000) + { + return ProjectFamily.Server2003; + } + else if (MajorVersion == 5 && Number >= 2205) + { + return ProjectFamily.WindowsXP; + } + else if (MajorVersion == 5 && MinorVersion == 50) + { + return ProjectFamily.Neptune; + } + else if (MajorVersion == 5) + { + return ProjectFamily.Windows2000; + } return ProjectFamily.None; } } diff --git a/BuildFeed/Models/Build/ProjectFamily.cs b/BuildFeed/Models/Build/ProjectFamily.cs index 06e95ba..ae1d29d 100644 --- a/BuildFeed/Models/Build/ProjectFamily.cs +++ b/BuildFeed/Models/Build/ProjectFamily.cs @@ -6,12 +6,24 @@ public enum ProjectFamily { None, - [Display(Name = "Whistler")] - Whistler, + [Display(Name = "Windows 2000")] + Windows2000, + + [Display(Name = "Neptune")] + Neptune, + + [Display(Name = "Windows XP")] + WindowsXP, + + [Display(Name = "Server 2003")] + Server2003, [Display(Name = "Longhorn")] Longhorn, + [Display(Name = "Vista")] + WindowsVista, + [Display(Name = "Windows 7")] Windows7, diff --git a/BuildFeed/Web.config b/BuildFeed/Web.config index 3b4d8a4..9a3bfc3 100644 --- a/BuildFeed/Web.config +++ b/BuildFeed/Web.config @@ -95,7 +95,7 @@ - + diff --git a/BuildFeed/packages.config b/BuildFeed/packages.config index 450d86f..be9ea35 100644 --- a/BuildFeed/packages.config +++ b/BuildFeed/packages.config @@ -30,7 +30,7 @@ - + \ No newline at end of file