Component update; Hashtag Logic Update

This commit is contained in:
Thomas Hounsell 2016-01-06 13:25:06 +00:00
parent 723e048a4d
commit 5bdc92d255
6 changed files with 39 additions and 7 deletions

View File

@ -105,8 +105,8 @@
<HintPath>..\packages\MongoDB.Driver.Core.2.2.0\lib\net45\MongoDB.Driver.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

View File

@ -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()
{

View File

@ -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;
}
}

View File

@ -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,

View File

@ -95,7 +95,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />

View File

@ -30,7 +30,7 @@
<package id="MongoDB.Bson" version="2.2.0" targetFramework="net46" />
<package id="MongoDB.Driver" version="2.2.0" targetFramework="net46" />
<package id="MongoDB.Driver.Core" version="2.2.0" targetFramework="net46" />
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
<package id="Newtonsoft.Json" version="8.0.1" targetFramework="net46" />
<package id="WebGrease" version="1.6.0" targetFramework="net45" />
<package id="xwebrss" version="1.2.1.130" targetFramework="net45" />
</packages>