From adac13d855c8918051688c7d53763305fe6a4fe4 Mon Sep 17 00:00:00 2001 From: Thomas Hounsell Date: Fri, 19 Aug 2016 22:10:55 +0100 Subject: [PATCH] .NET bump to 4.6.2; Refactor Model into separate DLL. --- BuildFeed.Local/BuildFeed.Local.csproj | 2 +- .../Api}/NewBuild.cs | 8 +- .../Api}/SearchResult.cs | 2 +- .../Build => BuildFeed.Model}/Build-Group.cs | 4 +- .../Build => BuildFeed.Model}/Build-Lab.cs | 2 +- .../Build => BuildFeed.Model}/Build-Source.cs | 2 +- .../Build-Version.cs | 2 +- .../Build => BuildFeed.Model}/Build-Year.cs | 2 +- .../Models/Build => BuildFeed.Model}/Build.cs | 4 +- BuildFeed.Model/BuildFeed.Model.csproj | 131 ++++++++++++ .../Build => BuildFeed.Model}/BuildGroup.cs | 2 +- .../Build => BuildFeed.Model}/BuildModel.cs | 2 +- .../Build => BuildFeed.Model}/BuildVersion.cs | 2 +- .../Models => BuildFeed.Model}/MetaItem.cs | 2 +- .../MongoConfig.cs | 5 +- .../ProjectFamily.cs | 2 +- BuildFeed.Model/Properties/AssemblyInfo.cs | 36 ++++ .../Build => BuildFeed.Model}/TypeOfSource.cs | 2 +- .../View}/ChangePassword.cs | 2 +- .../View}/FrontBuildGroup.cs | 2 +- .../View}/FrontPage.cs | 2 +- .../View}/LoginUser.cs | 2 +- .../View}/RegistrationUser.cs | 2 +- .../View}/SitemapData.cs | 2 +- BuildFeed.Model/packages.config | 11 + BuildFeed.sln | 18 ++ .../Areas/admin/Controllers/metaController.cs | 2 +- .../admin/Models/ViewModel/MetaListing.cs | 2 +- .../Areas/admin/Views/meta/create.cshtml | 2 +- BuildFeed/Areas/admin/Views/meta/index.cshtml | 2 +- BuildFeed/BuildFeed.csproj | 109 +++++----- BuildFeed/Controllers/apiController.cs | 191 +++++++++--------- BuildFeed/Controllers/frontController.cs | 4 +- BuildFeed/Controllers/rssController.cs | 2 +- BuildFeed/Controllers/supportController.cs | 4 +- BuildFeed/Global.asax.cs | 1 + BuildFeed/Scripts/_references.js | 2 +- BuildFeed/Views/front/Pages.cshtml | 4 +- BuildFeed/Views/front/editBuild.cshtml | 4 +- BuildFeed/Views/front/index.cshtml | 2 +- BuildFeed/Views/front/viewBuild.cshtml | 2 +- BuildFeed/Views/front/viewGroup.cshtml | 4 +- BuildFeed/Views/front/viewLab.cshtml | 2 +- BuildFeed/Views/front/viewSource.cshtml | 2 +- BuildFeed/Views/front/viewVersion.cshtml | 49 ++--- BuildFeed/Views/front/viewYear.cshtml | 4 +- BuildFeed/Views/support/login.cshtml | 2 +- BuildFeed/Views/support/password.cshtml | 2 +- BuildFeed/Views/support/register.cshtml | 2 +- BuildFeed/Views/support/sitemap.cshtml | 4 +- BuildFeed/Web.config | 41 ++-- BuildFeed/packages.config | 96 ++++++--- BuildFeed/res/ts/bfs.js | 2 - BuildFeed/res/ts/bfs.js.map | 2 +- .../MongoTimeChecker/MongoTimeChecker.csproj | 6 +- Tools/MongoTimeFix/MongoTimeFix.csproj | 6 +- .../RedisMongoMigration.csproj | 6 +- 57 files changed, 522 insertions(+), 294 deletions(-) rename {BuildFeed/Models/ApiModel => BuildFeed.Model/Api}/NewBuild.cs (77%) rename {BuildFeed/Models/ApiModel => BuildFeed.Model/Api}/SearchResult.cs (83%) rename {BuildFeed/Models/Build => BuildFeed.Model}/Build-Group.cs (98%) rename {BuildFeed/Models/Build => BuildFeed.Model}/Build-Lab.cs (99%) rename {BuildFeed/Models/Build => BuildFeed.Model}/Build-Source.cs (97%) rename {BuildFeed/Models/Build => BuildFeed.Model}/Build-Version.cs (98%) rename {BuildFeed/Models/Build => BuildFeed.Model}/Build-Year.cs (98%) rename {BuildFeed/Models/Build => BuildFeed.Model}/Build.cs (99%) create mode 100644 BuildFeed.Model/BuildFeed.Model.csproj rename {BuildFeed/Models/Build => BuildFeed.Model}/BuildGroup.cs (92%) rename {BuildFeed/Models/Build => BuildFeed.Model}/BuildModel.cs (99%) rename {BuildFeed/Models/Build => BuildFeed.Model}/BuildVersion.cs (90%) rename {BuildFeed/Models => BuildFeed.Model}/MetaItem.cs (99%) rename {BuildFeed/App_Start => BuildFeed.Model}/MongoConfig.cs (92%) rename {BuildFeed/Models/Build => BuildFeed.Model}/ProjectFamily.cs (96%) create mode 100644 BuildFeed.Model/Properties/AssemblyInfo.cs rename {BuildFeed/Models/Build => BuildFeed.Model}/TypeOfSource.cs (97%) rename {BuildFeed/Models/ViewModel => BuildFeed.Model/View}/ChangePassword.cs (95%) rename {BuildFeed/Models/ViewModel/Front => BuildFeed.Model/View}/FrontBuildGroup.cs (81%) rename {BuildFeed/Models/ViewModel/Front => BuildFeed.Model/View}/FrontPage.cs (81%) rename {BuildFeed/Models/ViewModel => BuildFeed.Model/View}/LoginUser.cs (93%) rename {BuildFeed/Models/ViewModel => BuildFeed.Model/View}/RegistrationUser.cs (95%) rename {BuildFeed/Models/ViewModel => BuildFeed.Model/View}/SitemapData.cs (95%) create mode 100644 BuildFeed.Model/packages.config diff --git a/BuildFeed.Local/BuildFeed.Local.csproj b/BuildFeed.Local/BuildFeed.Local.csproj index 793665d..dcfab87 100644 --- a/BuildFeed.Local/BuildFeed.Local.csproj +++ b/BuildFeed.Local/BuildFeed.Local.csproj @@ -9,7 +9,7 @@ Properties BuildFeed.Local BuildFeed.Local - v4.6.1 + v4.6.2 512 diff --git a/BuildFeed/Models/ApiModel/NewBuild.cs b/BuildFeed.Model/Api/NewBuild.cs similarity index 77% rename from BuildFeed/Models/ApiModel/NewBuild.cs rename to BuildFeed.Model/Api/NewBuild.cs index 6fac480..1eded84 100644 --- a/BuildFeed/Models/ApiModel/NewBuild.cs +++ b/BuildFeed.Model/Api/NewBuild.cs @@ -1,15 +1,15 @@ using System; -namespace BuildFeed.Models.ApiModel +namespace BuildFeed.Model.Api { - public class NewBuild + public class NewBuildPost { - public NewBuildObject[] NewBuilds { get; set; } + public NewBuild[] NewBuilds { get; set; } public string Password { get; set; } public string Username { get; set; } } - public class NewBuildObject + public class NewBuild { public DateTime? BuildTime { get; set; } public string Lab { get; set; } diff --git a/BuildFeed/Models/ApiModel/SearchResult.cs b/BuildFeed.Model/Api/SearchResult.cs similarity index 83% rename from BuildFeed/Models/ApiModel/SearchResult.cs rename to BuildFeed.Model/Api/SearchResult.cs index 3237b2c..299c2a1 100644 --- a/BuildFeed/Models/ApiModel/SearchResult.cs +++ b/BuildFeed.Model/Api/SearchResult.cs @@ -1,4 +1,4 @@ -namespace BuildFeed.Models.ApiModel +namespace BuildFeed.Model.Api { public class SearchResult { diff --git a/BuildFeed/Models/Build/Build-Group.cs b/BuildFeed.Model/Build-Group.cs similarity index 98% rename from BuildFeed/Models/Build/Build-Group.cs rename to BuildFeed.Model/Build-Group.cs index 164ebce..6965bf0 100644 --- a/BuildFeed/Models/Build/Build-Group.cs +++ b/BuildFeed.Model/Build-Group.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using BuildFeed.Models.ViewModel.Front; +using BuildFeed.Model.View; using MongoDB.Bson; using MongoDB.Driver; -namespace BuildFeed.Models +namespace BuildFeed.Model { public partial class Build { diff --git a/BuildFeed/Models/Build/Build-Lab.cs b/BuildFeed.Model/Build-Lab.cs similarity index 99% rename from BuildFeed/Models/Build/Build-Lab.cs rename to BuildFeed.Model/Build-Lab.cs index 167778a..23b2250 100644 --- a/BuildFeed/Models/Build/Build-Lab.cs +++ b/BuildFeed.Model/Build-Lab.cs @@ -5,7 +5,7 @@ using MongoDB.Bson; using MongoDB.Driver; -namespace BuildFeed.Models +namespace BuildFeed.Model { public partial class Build { diff --git a/BuildFeed/Models/Build/Build-Source.cs b/BuildFeed.Model/Build-Source.cs similarity index 97% rename from BuildFeed/Models/Build/Build-Source.cs rename to BuildFeed.Model/Build-Source.cs index 9b98dd0..29ad5fa 100644 --- a/BuildFeed/Models/Build/Build-Source.cs +++ b/BuildFeed.Model/Build-Source.cs @@ -4,7 +4,7 @@ using MongoDB.Bson; using MongoDB.Driver; -namespace BuildFeed.Models +namespace BuildFeed.Model { public partial class Build { diff --git a/BuildFeed/Models/Build/Build-Version.cs b/BuildFeed.Model/Build-Version.cs similarity index 98% rename from BuildFeed/Models/Build/Build-Version.cs rename to BuildFeed.Model/Build-Version.cs index cfc9714..63ab60e 100644 --- a/BuildFeed/Models/Build/Build-Version.cs +++ b/BuildFeed.Model/Build-Version.cs @@ -4,7 +4,7 @@ using MongoDB.Bson; using MongoDB.Driver; -namespace BuildFeed.Models +namespace BuildFeed.Model { public partial class Build { diff --git a/BuildFeed/Models/Build/Build-Year.cs b/BuildFeed.Model/Build-Year.cs similarity index 98% rename from BuildFeed/Models/Build/Build-Year.cs rename to BuildFeed.Model/Build-Year.cs index 410d1cc..b312b97 100644 --- a/BuildFeed/Models/Build/Build-Year.cs +++ b/BuildFeed.Model/Build-Year.cs @@ -5,7 +5,7 @@ using MongoDB.Bson; using MongoDB.Driver; -namespace BuildFeed.Models +namespace BuildFeed.Model { public partial class Build { diff --git a/BuildFeed/Models/Build/Build.cs b/BuildFeed.Model/Build.cs similarity index 99% rename from BuildFeed/Models/Build/Build.cs rename to BuildFeed.Model/Build.cs index ce8e987..d88a1d2 100644 --- a/BuildFeed/Models/Build/Build.cs +++ b/BuildFeed.Model/Build.cs @@ -4,11 +4,11 @@ using System.Configuration; using System.Linq; using System.Threading.Tasks; -using BuildFeed.Models.ViewModel.Front; +using BuildFeed.Model.View; using MongoDB.Bson; using MongoDB.Driver; -namespace BuildFeed.Models +namespace BuildFeed.Model { public partial class Build { diff --git a/BuildFeed.Model/BuildFeed.Model.csproj b/BuildFeed.Model/BuildFeed.Model.csproj new file mode 100644 index 0000000..0b941d0 --- /dev/null +++ b/BuildFeed.Model/BuildFeed.Model.csproj @@ -0,0 +1,131 @@ + + + + + Debug + AnyCPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664} + Library + Properties + BuildFeed.Model + BuildFeed.Model + v4.6.2 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll + True + + + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + True + + + ..\packages\MongoDB.Bson.2.2.4\lib\net45\MongoDB.Bson.dll + True + + + ..\packages\MongoDB.Driver.2.2.4\lib\net45\MongoDB.Driver.dll + True + + + ..\packages\MongoDB.Driver.Core.2.2.4\lib\net45\MongoDB.Driver.Core.dll + True + + + + + + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + True + + + ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + True + + + ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {3485b33a-6c3a-4535-9d85-4696914ad504} + BuildFeed.Local + + + + + \ No newline at end of file diff --git a/BuildFeed/Models/Build/BuildGroup.cs b/BuildFeed.Model/BuildGroup.cs similarity index 92% rename from BuildFeed/Models/Build/BuildGroup.cs rename to BuildFeed.Model/BuildGroup.cs index 19cda59..d05fa38 100644 --- a/BuildFeed/Models/Build/BuildGroup.cs +++ b/BuildFeed.Model/BuildGroup.cs @@ -1,4 +1,4 @@ -namespace BuildFeed.Models +namespace BuildFeed.Model { public class BuildGroup { diff --git a/BuildFeed/Models/Build/BuildModel.cs b/BuildFeed.Model/BuildModel.cs similarity index 99% rename from BuildFeed/Models/Build/BuildModel.cs rename to BuildFeed.Model/BuildModel.cs index 495aff0..e2afa91 100644 --- a/BuildFeed/Models/Build/BuildModel.cs +++ b/BuildFeed.Model/BuildModel.cs @@ -9,7 +9,7 @@ using MongoDB.Bson.Serialization.Attributes; using Required = System.ComponentModel.DataAnnotations.RequiredAttribute; -namespace BuildFeed.Models +namespace BuildFeed.Model { [DataObject, BsonIgnoreExtraElements] public class BuildModel diff --git a/BuildFeed/Models/Build/BuildVersion.cs b/BuildFeed.Model/BuildVersion.cs similarity index 90% rename from BuildFeed/Models/Build/BuildVersion.cs rename to BuildFeed.Model/BuildVersion.cs index ab0c8ee..cfda2d9 100644 --- a/BuildFeed/Models/Build/BuildVersion.cs +++ b/BuildFeed.Model/BuildVersion.cs @@ -1,4 +1,4 @@ -namespace BuildFeed.Models +namespace BuildFeed.Model { public struct BuildVersion { diff --git a/BuildFeed/Models/MetaItem.cs b/BuildFeed.Model/MetaItem.cs similarity index 99% rename from BuildFeed/Models/MetaItem.cs rename to BuildFeed.Model/MetaItem.cs index e05dcd2..1bde1f4 100644 --- a/BuildFeed/Models/MetaItem.cs +++ b/BuildFeed.Model/MetaItem.cs @@ -10,7 +10,7 @@ using MongoDB.Driver; using Required = System.ComponentModel.DataAnnotations.RequiredAttribute; -namespace BuildFeed.Models +namespace BuildFeed.Model { [DataObject] public class MetaItemModel diff --git a/BuildFeed/App_Start/MongoConfig.cs b/BuildFeed.Model/MongoConfig.cs similarity index 92% rename from BuildFeed/App_Start/MongoConfig.cs rename to BuildFeed.Model/MongoConfig.cs index 511ee19..3add5e9 100644 --- a/BuildFeed/App_Start/MongoConfig.cs +++ b/BuildFeed.Model/MongoConfig.cs @@ -1,9 +1,8 @@ using System.Configuration; -using BuildFeed.Models; -namespace BuildFeed +namespace BuildFeed.Model { - internal static class MongoConfig + public static class MongoConfig { public static string Host { get; } public static int Port { get; } diff --git a/BuildFeed/Models/Build/ProjectFamily.cs b/BuildFeed.Model/ProjectFamily.cs similarity index 96% rename from BuildFeed/Models/Build/ProjectFamily.cs rename to BuildFeed.Model/ProjectFamily.cs index 0bd6abf..1f42e21 100644 --- a/BuildFeed/Models/Build/ProjectFamily.cs +++ b/BuildFeed.Model/ProjectFamily.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace BuildFeed.Models +namespace BuildFeed.Model { public enum ProjectFamily { diff --git a/BuildFeed.Model/Properties/AssemblyInfo.cs b/BuildFeed.Model/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..9b23247 --- /dev/null +++ b/BuildFeed.Model/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("BuildFeed.Model")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("BuildFeed.Model")] +[assembly: AssemblyCopyright("Copyright © 2016, Thomas Hounsell")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("7e2b4f61-1c11-4471-af80-5480e94c0664")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/BuildFeed/Models/Build/TypeOfSource.cs b/BuildFeed.Model/TypeOfSource.cs similarity index 97% rename from BuildFeed/Models/Build/TypeOfSource.cs rename to BuildFeed.Model/TypeOfSource.cs index 352bd0e..64760e7 100644 --- a/BuildFeed/Models/Build/TypeOfSource.cs +++ b/BuildFeed.Model/TypeOfSource.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using BuildFeed.Local; -namespace BuildFeed.Models +namespace BuildFeed.Model { public enum TypeOfSource { diff --git a/BuildFeed/Models/ViewModel/ChangePassword.cs b/BuildFeed.Model/View/ChangePassword.cs similarity index 95% rename from BuildFeed/Models/ViewModel/ChangePassword.cs rename to BuildFeed.Model/View/ChangePassword.cs index 9bbdb66..ce29151 100644 --- a/BuildFeed/Models/ViewModel/ChangePassword.cs +++ b/BuildFeed.Model/View/ChangePassword.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using BuildFeed.Local; -namespace BuildFeed.Models.ViewModel +namespace BuildFeed.Model.View { public class ChangePassword { diff --git a/BuildFeed/Models/ViewModel/Front/FrontBuildGroup.cs b/BuildFeed.Model/View/FrontBuildGroup.cs similarity index 81% rename from BuildFeed/Models/ViewModel/Front/FrontBuildGroup.cs rename to BuildFeed.Model/View/FrontBuildGroup.cs index 65174c8..cc32ddb 100644 --- a/BuildFeed/Models/ViewModel/Front/FrontBuildGroup.cs +++ b/BuildFeed.Model/View/FrontBuildGroup.cs @@ -1,6 +1,6 @@ using System; -namespace BuildFeed.Models.ViewModel.Front +namespace BuildFeed.Model.View { public class FrontBuildGroup { diff --git a/BuildFeed/Models/ViewModel/Front/FrontPage.cs b/BuildFeed.Model/View/FrontPage.cs similarity index 81% rename from BuildFeed/Models/ViewModel/Front/FrontPage.cs rename to BuildFeed.Model/View/FrontPage.cs index 0c569a0..84062a8 100644 --- a/BuildFeed/Models/ViewModel/Front/FrontPage.cs +++ b/BuildFeed.Model/View/FrontPage.cs @@ -1,4 +1,4 @@ -namespace BuildFeed.Models.ViewModel.Front +namespace BuildFeed.Model.View { public class FrontPage { diff --git a/BuildFeed/Models/ViewModel/LoginUser.cs b/BuildFeed.Model/View/LoginUser.cs similarity index 93% rename from BuildFeed/Models/ViewModel/LoginUser.cs rename to BuildFeed.Model/View/LoginUser.cs index 5e26a93..313e47a 100644 --- a/BuildFeed/Models/ViewModel/LoginUser.cs +++ b/BuildFeed.Model/View/LoginUser.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using BuildFeed.Local; -namespace BuildFeed.Models.ViewModel +namespace BuildFeed.Model.View { public class LoginUser { diff --git a/BuildFeed/Models/ViewModel/RegistrationUser.cs b/BuildFeed.Model/View/RegistrationUser.cs similarity index 95% rename from BuildFeed/Models/ViewModel/RegistrationUser.cs rename to BuildFeed.Model/View/RegistrationUser.cs index 099970c..db7ffb3 100644 --- a/BuildFeed/Models/ViewModel/RegistrationUser.cs +++ b/BuildFeed.Model/View/RegistrationUser.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using BuildFeed.Local; -namespace BuildFeed.Models.ViewModel +namespace BuildFeed.Model.View { public class RegistrationUser { diff --git a/BuildFeed/Models/ViewModel/SitemapData.cs b/BuildFeed.Model/View/SitemapData.cs similarity index 95% rename from BuildFeed/Models/ViewModel/SitemapData.cs rename to BuildFeed.Model/View/SitemapData.cs index 93c17dc..7f8fe59 100644 --- a/BuildFeed/Models/ViewModel/SitemapData.cs +++ b/BuildFeed.Model/View/SitemapData.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Web.Routing; -namespace BuildFeed.Models.ViewModel +namespace BuildFeed.Model.View { public class SitemapData { diff --git a/BuildFeed.Model/packages.config b/BuildFeed.Model/packages.config new file mode 100644 index 0000000..d8999af --- /dev/null +++ b/BuildFeed.Model/packages.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/BuildFeed.sln b/BuildFeed.sln index f058822..0a81173 100644 --- a/BuildFeed.sln +++ b/BuildFeed.sln @@ -25,6 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile", "Mobile", "{2B6466 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildFeed.Local", "BuildFeed.Local\BuildFeed.Local.csproj", "{3485B33A-6C3A-4535-9D85-4696914AD504}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildFeed.Model", "BuildFeed.Model\BuildFeed.Model.csproj", "{7E2B4F61-1C11-4471-AF80-5480E94C0664}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -173,6 +175,22 @@ Global {3485B33A-6C3A-4535-9D85-4696914AD504}.Release|x64.Build.0 = Release|Any CPU {3485B33A-6C3A-4535-9D85-4696914AD504}.Release|x86.ActiveCfg = Release|Any CPU {3485B33A-6C3A-4535-9D85-4696914AD504}.Release|x86.Build.0 = Release|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Debug|ARM.ActiveCfg = Debug|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Debug|ARM.Build.0 = Debug|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Debug|x64.ActiveCfg = Debug|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Debug|x64.Build.0 = Debug|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Debug|x86.ActiveCfg = Debug|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Debug|x86.Build.0 = Debug|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Release|Any CPU.Build.0 = Release|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Release|ARM.ActiveCfg = Release|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Release|ARM.Build.0 = Release|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Release|x64.ActiveCfg = Release|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Release|x64.Build.0 = Release|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Release|x86.ActiveCfg = Release|Any CPU + {7E2B4F61-1C11-4471-AF80-5480E94C0664}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BuildFeed/Areas/admin/Controllers/metaController.cs b/BuildFeed/Areas/admin/Controllers/metaController.cs index b19968a..84713b9 100644 --- a/BuildFeed/Areas/admin/Controllers/metaController.cs +++ b/BuildFeed/Areas/admin/Controllers/metaController.cs @@ -3,7 +3,7 @@ using System.Web.Mvc; using BuildFeed.Areas.admin.Models.ViewModel; using BuildFeed.Controllers; -using BuildFeed.Models; +using BuildFeed.Model; namespace BuildFeed.Areas.admin.Controllers { diff --git a/BuildFeed/Areas/admin/Models/ViewModel/MetaListing.cs b/BuildFeed/Areas/admin/Models/ViewModel/MetaListing.cs index 24e67eb..ba39f54 100644 --- a/BuildFeed/Areas/admin/Models/ViewModel/MetaListing.cs +++ b/BuildFeed/Areas/admin/Models/ViewModel/MetaListing.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using BuildFeed.Models; +using BuildFeed.Model; namespace BuildFeed.Areas.admin.Models.ViewModel { diff --git a/BuildFeed/Areas/admin/Views/meta/create.cshtml b/BuildFeed/Areas/admin/Views/meta/create.cshtml index 0d77a5b..88f1d36 100644 --- a/BuildFeed/Areas/admin/Views/meta/create.cshtml +++ b/BuildFeed/Areas/admin/Views/meta/create.cshtml @@ -1,4 +1,4 @@ -@model BuildFeed.Models.MetaItemModel +@model BuildFeed.Model.MetaItemModel @{ ViewBag.Title = $"Add metadata for {Model.Id.Value} | BuildFeed"; } diff --git a/BuildFeed/Areas/admin/Views/meta/index.cshtml b/BuildFeed/Areas/admin/Views/meta/index.cshtml index 257ed6d..b8a126e 100644 --- a/BuildFeed/Areas/admin/Views/meta/index.cshtml +++ b/BuildFeed/Areas/admin/Views/meta/index.cshtml @@ -1,4 +1,4 @@ -@using BuildFeed.Models +@using BuildFeed.Model @model BuildFeed.Areas.admin.Models.ViewModel.MetaListing @{ diff --git a/BuildFeed/BuildFeed.csproj b/BuildFeed/BuildFeed.csproj index cc23235..5ea9c39 100644 --- a/BuildFeed/BuildFeed.csproj +++ b/BuildFeed/BuildFeed.csproj @@ -1,7 +1,7 @@  - + @@ -16,7 +16,7 @@ Properties BuildFeed BuildFeed - v4.6.1 + v4.6.2 false true @@ -52,8 +52,8 @@ ..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll True - - ..\packages\Humanizer.1.37.7\lib\portable-win+net40+sl50+wp8+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Humanizer.dll + + ..\packages\Humanizer.Core.2.1.0\lib\netstandard1.0\Humanizer.dll True @@ -89,6 +89,10 @@ True + + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + True + ..\packages\MongoDB.Bson.2.2.4\lib\net45\MongoDB.Bson.dll True @@ -111,59 +115,59 @@ - + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll True + + ..\packages\System.Runtime.4.1.0\lib\net462\System.Runtime.dll + True + - + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll True - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True - - - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll - True - - - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True - - - ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True - + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll + True + + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll + True + + + ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + True + + + ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + True + - - True - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - @@ -181,7 +185,6 @@ - @@ -197,26 +200,6 @@ Global.asax - - - - - - - - - - - - - - - - - - - - @@ -295,7 +278,6 @@ - @@ -419,6 +401,7 @@ + @@ -444,6 +427,10 @@ {3485b33a-6c3a-4535-9d85-4696914ad504} BuildFeed.Local + + {7e2b4f61-1c11-4471-af80-5480e94c0664} + BuildFeed.Model + 10.0 @@ -494,8 +481,8 @@ 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}. - +