From 9eb8fcde4b9c210c1643c980f92b841509b3f55a Mon Sep 17 00:00:00 2001 From: BuildFeed Bot Date: Sat, 28 Apr 2018 17:38:43 +0100 Subject: [PATCH] Resolve compile issues --- BuildFeed.Model/BuildRepository-Group.cs | 1 - BuildFeed.Model/BuildRepository.cs | 1 - {BuildFeed.ViewModel => BuildFeed.Model}/FrontBuildGroup.cs | 3 +-- {BuildFeed.ViewModel => BuildFeed.Model}/FrontPage.cs | 2 +- {BuildFeed.ViewModel => BuildFeed.Model}/FrontPageBuild.cs | 2 +- BuildFeed.ViewModel/BuildFeed.ViewModel.csproj | 3 --- BuildFeed/App_Code/BuildHelpers.cshtml | 2 +- BuildFeed/Views/front/Pages.cshtml | 1 + 8 files changed, 5 insertions(+), 10 deletions(-) rename {BuildFeed.ViewModel => BuildFeed.Model}/FrontBuildGroup.cs (79%) rename {BuildFeed.ViewModel => BuildFeed.Model}/FrontPage.cs (90%) rename {BuildFeed.ViewModel => BuildFeed.Model}/FrontPageBuild.cs (97%) diff --git a/BuildFeed.Model/BuildRepository-Group.cs b/BuildFeed.Model/BuildRepository-Group.cs index 823fdeb..519e7c6 100644 --- a/BuildFeed.Model/BuildRepository-Group.cs +++ b/BuildFeed.Model/BuildRepository-Group.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using BuildFeed.Model.View; using MongoDB.Bson; using MongoDB.Driver; diff --git a/BuildFeed.Model/BuildRepository.cs b/BuildFeed.Model/BuildRepository.cs index 5ed6b7c..d336cc5 100644 --- a/BuildFeed.Model/BuildRepository.cs +++ b/BuildFeed.Model/BuildRepository.cs @@ -3,7 +3,6 @@ using System.ComponentModel; using System.Linq; using System.Threading.Tasks; -using BuildFeed.Model.View; using MongoDB.Bson; using MongoDB.Driver; diff --git a/BuildFeed.ViewModel/FrontBuildGroup.cs b/BuildFeed.Model/FrontBuildGroup.cs similarity index 79% rename from BuildFeed.ViewModel/FrontBuildGroup.cs rename to BuildFeed.Model/FrontBuildGroup.cs index 35d3bcd..f76fdb0 100644 --- a/BuildFeed.ViewModel/FrontBuildGroup.cs +++ b/BuildFeed.Model/FrontBuildGroup.cs @@ -1,7 +1,6 @@ using System; -using BuildFeed.Model; -namespace BuildFeed.ViewModel +namespace BuildFeed.Model { public class FrontBuildGroup { diff --git a/BuildFeed.ViewModel/FrontPage.cs b/BuildFeed.Model/FrontPage.cs similarity index 90% rename from BuildFeed.ViewModel/FrontPage.cs rename to BuildFeed.Model/FrontPage.cs index 6404d37..e004f2a 100644 --- a/BuildFeed.ViewModel/FrontPage.cs +++ b/BuildFeed.Model/FrontPage.cs @@ -1,4 +1,4 @@ -namespace BuildFeed.ViewModel +namespace BuildFeed.Model { public class FrontPage { diff --git a/BuildFeed.ViewModel/FrontPageBuild.cs b/BuildFeed.Model/FrontPageBuild.cs similarity index 97% rename from BuildFeed.ViewModel/FrontPageBuild.cs rename to BuildFeed.Model/FrontPageBuild.cs index aa1fdb8..850b932 100644 --- a/BuildFeed.ViewModel/FrontPageBuild.cs +++ b/BuildFeed.Model/FrontPageBuild.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using BuildFeed.Local; -namespace BuildFeed.ViewModel +namespace BuildFeed.Model { public class FrontPageBuild { diff --git a/BuildFeed.ViewModel/BuildFeed.ViewModel.csproj b/BuildFeed.ViewModel/BuildFeed.ViewModel.csproj index 843d2bb..b4155d8 100644 --- a/BuildFeed.ViewModel/BuildFeed.ViewModel.csproj +++ b/BuildFeed.ViewModel/BuildFeed.ViewModel.csproj @@ -43,9 +43,6 @@ - - - diff --git a/BuildFeed/App_Code/BuildHelpers.cshtml b/BuildFeed/App_Code/BuildHelpers.cshtml index 79272a3..2b2992f 100644 --- a/BuildFeed/App_Code/BuildHelpers.cshtml +++ b/BuildFeed/App_Code/BuildHelpers.cshtml @@ -1,4 +1,4 @@ -@using BuildFeed.ViewModel +@using BuildFeed.Model @helper LatestBuild(string title, FrontPageBuild build) {

@title

diff --git a/BuildFeed/Views/front/Pages.cshtml b/BuildFeed/Views/front/Pages.cshtml index 9910633..e620c79 100644 --- a/BuildFeed/Views/front/Pages.cshtml +++ b/BuildFeed/Views/front/Pages.cshtml @@ -1,5 +1,6 @@ @using BuildFeed.Code @using BuildFeed.Controllers +@using BuildFeed.Model @using BuildFeed.ViewModel @using Humanizer @model IEnumerable