Merge pull request dncuug#91 from dncuug/mvc-refactoring

achamorroman · Dec 4, 2017 · 92e43d5 · 92e43d5
2 parents a517574 + c7faf0c
commit 92e43d5
Show file tree

Hide file tree

Showing 25 changed files with 605 additions and 1,038 deletions.
diff --git a/X.PagedList.sln b/X.PagedList.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.12
+VisualStudioVersion = 15.0.27004.2006
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BDDADD09-D112-418E-8469-BC762EC09936}"
 EndProject
@@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X.PagedList.Mvc.Example", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.PagedList.Mvc.Example.Core", "examples\X.PagedList.Mvc.Example.Core\X.PagedList.Mvc.Example.Core.csproj", "{89EA823D-1A1B-4569-B33B-A54CEFAFE480}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "X.PagedList.Mvc.Common", "src\X.PagedList.Mvc.Common\X.PagedList.Mvc.Common.csproj", "{1D867AC3-5FAB-4B3D-BF5F-6FD0DC0A88BE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -51,6 +53,10 @@ Global
 		{89EA823D-1A1B-4569-B33B-A54CEFAFE480}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{89EA823D-1A1B-4569-B33B-A54CEFAFE480}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89EA823D-1A1B-4569-B33B-A54CEFAFE480}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D867AC3-5FAB-4B3D-BF5F-6FD0DC0A88BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D867AC3-5FAB-4B3D-BF5F-6FD0DC0A88BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D867AC3-5FAB-4B3D-BF5F-6FD0DC0A88BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D867AC3-5FAB-4B3D-BF5F-6FD0DC0A88BE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -62,5 +68,9 @@ Global
 		{C78B1316-1EF9-45C3-A3FD-9A131BA3DD62} = {0170B742-C624-4C22-9DE1-2A93CF9C12D6}
 		{7DA46F0E-B5DD-4A4C-8B18-645101E1C3B0} = {309A8FC8-4784-4D8D-903F-BD54EBB0F1D7}
 		{89EA823D-1A1B-4569-B33B-A54CEFAFE480} = {309A8FC8-4784-4D8D-903F-BD54EBB0F1D7}
+		{1D867AC3-5FAB-4B3D-BF5F-6FD0DC0A88BE} = {BDDADD09-D112-418E-8469-BC762EC09936}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {1A82D446-6F26-48B2-8085-DFA5F87453FC}
 	EndGlobalSection
 EndGlobal
diff --git a/examples/X.PagedList.Mvc.Example.Core/Program.cs b/examples/X.PagedList.Mvc.Example.Core/Program.cs
@@ -1,7 +1,7 @@
-using Microsoft.AspNetCore.Hosting;
-using System.IO;
+using System.IO;
+using Microsoft.AspNetCore.Hosting;
 
-namespace X.PageList.Mvc.Example.Core
+namespace X.PagedList.Mvc.Example.Core
 {
     public class Program
     {

diff --git a/examples/X.PagedList.Mvc.Example.Core/Properties/launchSettings.json b/examples/X.PagedList.Mvc.Example.Core/Properties/launchSettings.json
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "X.PageList.Mvc.Example.Core": {
+    "X.PagedList.Mvc.Example.Core": {
       "commandName": "Project"
     }
   }

diff --git a/examples/X.PagedList.Mvc.Example.Core/Startup.cs b/examples/X.PagedList.Mvc.Example.Core/Startup.cs
@@ -1,14 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace X.PageList.Mvc.Example.Core
+namespace X.PagedList.Mvc.Example.Core
 {
     public class Startup
     {

diff --git a/examples/X.PagedList.Mvc.Example.Core/Views/Home/_NameListPartial.cshtml b/examples/X.PagedList.Mvc.Example.Core/Views/Home/_NameListPartial.cshtml
@@ -1,7 +1,11 @@
-@model IPagedList<string>
-@using X.PagedList.Mvc.Core.Fake; @*use this for the fake AjaxOptions since ajax helpers were dropped in .net core*@
-@using X.PagedList.Mvc.Core; @*import this so we get our HTML Helper*@
-@using X.PagedList; @*import this so we can cast our list to IPagedList (only necessary because ViewBag is dynamic)*@
+@*use this for the fake AjaxOptions since ajax helpers were dropped in .net core*@
+@model IPagedList<string>
+
+@*import this so we get our HTML Helper*@
+@using X.PagedList.Mvc.Core; 
+
+@*import this so we can cast our list to IPagedList (only necessary because ViewBag is dynamic)*@
+@using X.PagedList; 
 
 <ul>
     @foreach (var name in Model)

diff --git a/examples/X.PagedList.Mvc.Example.Core/Views/Shared/_Layout.cshtml b/examples/X.PagedList.Mvc.Example.Core/Views/Shared/_Layout.cshtml
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - X.PageList.Mvc.Example.Core</title>
+    <title>@ViewData["Title"] - X.PagedList.Mvc.Example.Core</title>
 
     <environment names="Development">
         <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
@@ -27,7 +27,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">X.PageList.Mvc.Example.Core</a>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">X.PagedList.Mvc.Example.Core</a>
             </div>
             <div class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
@@ -41,7 +41,7 @@
         @RenderBody()
         <hr />
         <footer>
-            <p>&copy; 2017 - X.PageList.Mvc.Example.Core</p>
+            <p>&copy; 2017 - X.PagedList.Mvc.Example.Core</p>
         </footer>
     </div>
 

diff --git a/examples/X.PagedList.Mvc.Example.Core/Views/_ViewImports.cshtml b/examples/X.PagedList.Mvc.Example.Core/Views/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@using X.PageList.Mvc.Example.Core
+@using X.PagedList.Mvc.Example.Core
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/examples/X.PagedList.Mvc.Example/Views/TraditionalPaging/Index.cshtml b/examples/X.PagedList.Mvc.Example/Views/TraditionalPaging/Index.cshtml
@@ -4,6 +4,7 @@
 @using System.Web.Optimization
 @using X.PagedList
 @using X.PagedList.Mvc
+@using X.PagedList.Mvc.Common
 
 @Styles.Render("~/Content/PagedList.css")
 

diff --git a/examples/X.PagedList.Mvc.Example/X.PagedList.Mvc.Example.csproj b/examples/X.PagedList.Mvc.Example/X.PagedList.Mvc.Example.csproj
@@ -253,6 +253,10 @@
     <Folder Include="Models\" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\X.PagedList.Mvc.Common\X.PagedList.Mvc.Common.csproj">
+      <Project>{1d867ac3-5fab-4b3d-bf5f-6fd0dc0a88be}</Project>
+      <Name>X.PagedList.Mvc.Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\X.PagedList.Mvc\X.PagedList.Mvc.csproj">
       <Project>{cfbaecec-9581-47dd-a5f0-fcbd0be4398e}</Project>
       <Name>X.PagedList.Mvc</Name>

diff --git a/...gedList.Mvc.Core/GoToFormRenderOptions.cs → ...dList.Mvc.Common/GoToFormRenderOptions.cs b/...gedList.Mvc.Core/GoToFormRenderOptions.cs → ...dList.Mvc.Common/GoToFormRenderOptions.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace X.PagedList.Mvc.Core
+namespace X.PagedList.Mvc.Common
 {
     ///<summary>
     /// Options for configuring the output of <see cref = "HtmlHelper" />.

diff --git a/...agedList.Mvc.Core/PagedListDisplayMode.cs → ...edList.Mvc.Common/PagedListDisplayMode.cs b/...agedList.Mvc.Core/PagedListDisplayMode.cs → ...edList.Mvc.Common/PagedListDisplayMode.cs
@@ -1,4 +1,4 @@
-namespace X.PagedList.Mvc.Core
+namespace X.PagedList.Mvc.Common
 {
     /// <summary>
     /// A tri-state enum that controls the visibility of portions of the PagedList paging control.