Feedback addressed

Author: jbagga

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

@@ -0,0 +1 @@
+Manage View

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

@@ -1,8 +1,11 @@
-using Microsoft.AspNetCore.Mvc;
+// 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 Microsoft.AspNetCore.Mvc;
 
 namespace ControllerForMultipleAreasSample.Areas.Products.Controllers
 {
-    [MultipleAreas(new string[] { "Products", "Services" })]
+    [MultipleAreas("Products", "Services", "Manage")]
     public class HomeController : Controller
     {
         public IActionResult Index()

samples/Mvc.ControllerForMultipleAreasSample/MultipleAreasAttribute.cs

@@ -1,15 +1,20 @@
-using System;
+// 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;
+using System.Linq;
 
 namespace ControllerForMultipleAreasSample
 {
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
     public class MultipleAreasAttribute : Attribute
     {
-        public MultipleAreasAttribute(string[] areaNames)
+        public MultipleAreasAttribute(string area1, string area2, params string[] areaNames)
         {
-            AreaNames = areaNames;
+            AreaNames = new string[] { area1, area2 };
+            AreaNames = AreaNames.Concat(areaNames).ToArray();
         }
 
-        public string[] AreaNames { get; private set; }
+        public string[] AreaNames { get; }
     }
 }

samples/Mvc.ControllerForMultipleAreasSample/MultipleAreasControllerConvention.cs

@@ -7,37 +7,22 @@ namespace ControllerForMultipleAreasSample
 {
     public class MultipleAreasControllerConvention : IApplicationModelConvention
     {
-        public MultipleAreasControllerConvention()
-        {
-            ControllerModels = new List<ControllerModel>();
-        }
-
-        public IList<ControllerModel> ControllerModels { get; set; }
-
         public void Apply(ApplicationModel application)
         {
+            var controllerModels = new List<ControllerModel>();
             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++)
+                var areaNames = controller.ControllerType.GetCustomAttributes<MultipleAreasAttribute>().FirstOrDefault()?.AreaNames;
+                controller.RouteValues.Add("area", areaNames[0]);
+                for (var i = 1; 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);
-                    }
+                    var controllerCopy = new ControllerModel(controller);
+                    controllerCopy.RouteValues["area"] = areaNames[i];
+                    controllerModels.Add(controllerCopy);
                 }
             }
 
-            foreach (var model in ControllerModels)
+            foreach (var model in controllerModels)
             {
                 application.Controllers.Add(model);
             }

samples/Mvc.ControllerForMultipleAreasSample/Mvc.ControllerForMultipleAreasSample.csproj

@@ -1,15 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
+  <Import Project="..\..\build\dependencies.props" />
+
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="wwwroot\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
 </Project>

samples/Mvc.ControllerForMultipleAreasSample/Program.cs

@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
+// 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 Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 
 namespace ControllerForMultipleAreasSample
 {

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

@@ -50,6 +50,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(AspNetIntegrationTestingVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(AspNetCoreVersion)" />

samples/Mvc/Mvc.ControllerForMultipleAreasSample/Program.cs

@@ -31,7 +31,7 @@ public async Task ProductsArea()
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.Contains("Products View", content);
         }
-        
+
         [Fact]
         public async Task ServicesArea()
         {
@@ -43,5 +43,17 @@ public async Task ServicesArea()
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.Contains("Services View", content);
         }
+
+        [Fact]
+        public async Task ManageArea()
+        {
+            // Arrange & Act
+            var response = await Client.GetAsync("/Manage/Home/Index");
+            var content = await response.Content.ReadAsStringAsync();
+
+            // Assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Contains("Manage View", content);
+        }
     }
 }