Add Controller for multiple areas sample

Author: jbagga

Entropy.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26413.2
+VisualStudioVersion = 15.0.26824.3000
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Builder", "Builder", "{097807B3-FE74-4DCD-B76B-2FCE1A272BE5}"
 EndProject
@@ -126,6 +126,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DA474CFD
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Entropy.FunctionalTests", "test\Entropy.FunctionalTests\Entropy.FunctionalTests.csproj", "{3D0B3DD1-6779-4E8F-BFBC-809497F7B30F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.ControllerForMultipleAreasSample", "samples\Mvc.ControllerForMultipleAreasSample\Mvc.ControllerForMultipleAreasSample.csproj", "{8A61FA46-3FD4-42BE-80C6-E5931387590C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -688,6 +690,18 @@ Global
 		{3D0B3DD1-6779-4E8F-BFBC-809497F7B30F}.Release|x64.Build.0 = Release|Any CPU
 		{3D0B3DD1-6779-4E8F-BFBC-809497F7B30F}.Release|x86.ActiveCfg = Release|Any CPU
 		{3D0B3DD1-6779-4E8F-BFBC-809497F7B30F}.Release|x86.Build.0 = Release|Any CPU
+		{8A61FA46-3FD4-42BE-80C6-E5931387590C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A61FA46-3FD4-42BE-80C6-E5931387590C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A61FA46-3FD4-42BE-80C6-E5931387590C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8A61FA46-3FD4-42BE-80C6-E5931387590C}.Debug|x64.Build.0 = Debug|Any CPU
+		{8A61FA46-3FD4-42BE-80C6-E5931387590C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8A61FA46-3FD4-42BE-80C6-E5931387590C}.Debug|x86.Build.0 = Debug|Any CPU
+		{8A61FA46-3FD4-42BE-80C6-E5931387590C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A61FA46-3FD4-42BE-80C6-E5931387590C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A61FA46-3FD4-42BE-80C6-E5931387590C}.Release|x64.ActiveCfg = Release|Any CPU
+		{8A61FA46-3FD4-42BE-80C6-E5931387590C}.Release|x64.Build.0 = Release|Any CPU
+		{8A61FA46-3FD4-42BE-80C6-E5931387590C}.Release|x86.ActiveCfg = Release|Any CPU
+		{8A61FA46-3FD4-42BE-80C6-E5931387590C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -750,5 +764,9 @@ Global
 		{EB0FB22E-DF89-4044-8EF2-F7790E8B0216} = {CD3A2B49-E781-4766-B775-6FF3672AE308}
 		{FDD8875D-00D6-4E8C-9E21-D90C0A2C81B7} = {CD3A2B49-E781-4766-B775-6FF3672AE308}
 		{3D0B3DD1-6779-4E8F-BFBC-809497F7B30F} = {C03BF7E1-ECDF-48D0-85CD-A454AA28D80C}
+		{8A61FA46-3FD4-42BE-80C6-E5931387590C} = {5BCA2B8A-37DA-4A88-A221-3D5B4796B07F}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {5DF584CA-249D-432C-BBA9-4498414C8E97}
 	EndGlobalSection
 EndGlobal

build/dependencies.props

@@ -11,6 +11,6 @@
     <NowinVersion>0.11.0</NowinVersion>
     <OwinVersion>3.0.1</OwinVersion>
     <TestSdkVersion>15.3.0-*</TestSdkVersion>
-    <XunitVersion>2.3.0-beta2-*</XunitVersion>
+    <XunitVersion>2.3.0-beta4-*</XunitVersion>
   </PropertyGroup>
 </Project>

samples/Mvc.ControllerForMultipleAreasSample/Areas/Products/Controllers/HomeController.cs

@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace ControllerForMultipleAreasSample.Areas.Products.Controllers
+{
+    [MultipleAreas(new string[] { "Products", "Services" })]
+    public class HomeController : Controller
+    {
+        public IActionResult Index()
+        {
+            return View();
+        }
+    }
+}

samples/Mvc.ControllerForMultipleAreasSample/Areas/Products/Views/Home/Index.cshtml

@@ -0,0 +1 @@
+Products View

samples/Mvc.ControllerForMultipleAreasSample/Areas/Services/Views/Home/Index.cshtml

@@ -0,0 +1 @@
+Services View

samples/Mvc.ControllerForMultipleAreasSample/MultipleAreasAttribute.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace ControllerForMultipleAreasSample
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public class MultipleAreasAttribute : Attribute
+    {
+        public MultipleAreasAttribute(string[] areaNames)
+        {
+            AreaNames = areaNames;
+        }
+
+        public string[] AreaNames { get; private set; }
+    }
+}

samples/Mvc.ControllerForMultipleAreasSample/MultipleAreasControllerConvention.cs

@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+
+namespace ControllerForMultipleAreasSample
+{
+    public class MultipleAreasControllerConvention : IApplicationModelConvention
+    {
+        public MultipleAreasControllerConvention()
+        {
+            ControllerModels = new List<ControllerModel>();
+        }
+
+        public IList<ControllerModel> ControllerModels { get; set; }
+
+        public void Apply(ApplicationModel application)
+        {
+            foreach (var controller in application.Controllers)
+            {
+                var areas = controller.ControllerType.GetCustomAttributes<MultipleAreasAttribute>().FirstOrDefault();
+                var areaNames = areas?.AreaNames;
+
+                for (var i = 0; i < areaNames?.Length; i++)
+                {
+                    if (i == 0)
+                    {
+                        controller.RouteValues.Add("area", areaNames[i]);
+                    }
+
+                    else
+                    {
+                        var controllerCopy = new ControllerModel(controller);
+                        controllerCopy.RouteValues["area"] = areaNames[i];
+                        ControllerModels.Add(controllerCopy);
+                    }
+                }
+            }
+
+            foreach (var model in ControllerModels)
+            {
+                application.Controllers.Add(model);
+            }
+        }
+    }
+}

samples/Mvc.ControllerForMultipleAreasSample/Mvc.ControllerForMultipleAreasSample.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
+  </ItemGroup>
+
+</Project>

samples/Mvc.ControllerForMultipleAreasSample/Program.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+
+namespace ControllerForMultipleAreasSample
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            BuildWebHost(args).Run();
+        }
+
+        public static IWebHost BuildWebHost(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
+                .UseStartup<Startup>()
+                .Build();
+    }
+}

samples/Mvc.ControllerForMultipleAreasSample/Startup.cs

@@ -0,0 +1,41 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ControllerForMultipleAreasSample
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddMvc(options =>
+            {
+                options.Conventions.Add(new MultipleAreasControllerConvention());
+            });
+        }
+
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        {
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(name: "areaRoute",
+                  template: "{area:exists}/{controller=Home}/{action=Index}");
+
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
+
+            app.Run(async (context) =>
+            {
+                await context.Response.WriteAsync("Hello World!");
+            });
+        }
+    }
+}

samples/Mvc/Mvc.ControllerForMultipleAreasSample/Mvc.ControllerForMultipleAreasSample.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
+  </ItemGroup>
+
+</Project>

samples/Mvc/Mvc.ControllerForMultipleAreasSample/Program.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+
+namespace Mvc.ControllerForMultipleAreasSample
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            BuildWebHost(args).Run();
+        }
+
+        public static IWebHost BuildWebHost(string[] args) =>
+            WebHost.CreateDefaultBuilder(args)
+                .UseStartup<Startup>()
+                .Build();
+    }
+}

samples/Mvc/Mvc.ControllerForMultipleAreasSample/Startup.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Mvc.ControllerForMultipleAreasSample
+{
+    public class Startup
+    {
+        // This method gets called by the runtime. Use this method to add services to the container.
+        // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
+        public void ConfigureServices(IServiceCollection services)
+        {
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        {
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+
+            app.Run(async (context) =>
+            {
+                await context.Response.WriteAsync("Hello World!");
+            });
+        }
+    }
+}

test/Entropy.FunctionalTests/Entropy.FunctionalTests.csproj

@@ -35,6 +35,7 @@
     <ProjectReference Include="..\..\samples\Antiforgery.Angular1\Antiforgery.Angular1.csproj" />
     <ProjectReference Include="..\..\samples\Antiforgery.MvcWithAuthAndAjax\Antiforgery.MvcWithAuthAndAjax.csproj" />
     <ProjectReference Include="..\..\samples\Mvc.ActionConstraintSample.Web\Mvc.ActionConstraintSample.Web.csproj" />
+    <ProjectReference Include="..\..\samples\Mvc.ControllerForMultipleAreasSample\Mvc.ControllerForMultipleAreasSample.csproj" />
     <ProjectReference Include="..\..\samples\Mvc.CustomRouteSample.Web\Mvc.CustomRouteSample.Web.csproj" />
     <ProjectReference Include="..\..\samples\Mvc.CustomRoutingConvention\Mvc.CustomRoutingConvention.csproj" />
     <ProjectReference Include="..\..\samples\Mvc.EmbeddedViewSample.Web\Mvc.EmbeddedViewSample.Web.csproj" />

test/Entropy.FunctionalTests/MvcTests/ControllerForMultipleAreasTest.cs

@@ -0,0 +1,47 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+
+namespace Entropy.FunctionalTests
+{
+    public class ControllerForMultipleAreasTest : IClassFixture<SampleTestFixture<ControllerForMultipleAreasSample.Startup>>
+    {
+        public ControllerForMultipleAreasTest(SampleTestFixture<ControllerForMultipleAreasSample.Startup> fixture)
+        {
+            Client = fixture.Client;
+        }
+
+        public HttpClient Client { get; }
+
+        [Fact]
+        public async Task ProductsArea()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("/Products/Home/Index");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Contains("Products View", content);
+        }
+        
+        [Fact]
+        public async Task ServicesArea()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("/Services/Home/Index");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Contains("Services View", content);
+        }
+    }
+}