#3 Moving Core.Web to vNext

devbridge · Sep 16, 2015 · 632f409 · 632f409
1 parent 9b7ed03
commit 632f409
Show file tree

Hide file tree

Showing 38 changed files with 19 additions and 45 deletions.
diff --git a/vNext/src/BetterModules.Core.Web/Configuration/DefaultWebConfigurationLoader.cs b/vNext/src/BetterModules.Core.Web/Configuration/DefaultWebConfigurationLoader.cs
diff --git a/vNext/src/BetterModules.Core.Web/Configuration/DefaultWebConfigurationSection.cs b/vNext/src/BetterModules.Core.Web/Configuration/DefaultWebConfigurationSection.cs
@@ -1,24 +1,9 @@
-using System;
-using System.Configuration;
-using BetterModules.Core.Configuration;
+using BetterModules.Core.Configuration;
 
 namespace BetterModules.Core.Web.Configuration
 {
     public class DefaultWebConfigurationSection : DefaultConfigurationSection, IWebConfiguration
     {
-        private const string WebSiteUrlAttribute = "webSiteUrl";
-
-        /// <summary>
-        /// Gets or sets the web site URL.
-        /// </summary>
-        /// <value>
-        /// The web site URL.
-        /// </value>
-        [ConfigurationProperty(WebSiteUrlAttribute, DefaultValue = "Auto", IsRequired = false)]
-        public string WebSiteUrl
-        {
-            get { return Convert.ToString(this[WebSiteUrlAttribute]); }
-            set { this[WebSiteUrlAttribute] = value; }
-        }
+        public string WebSiteUrl { get; set; }
     }
 }
diff --git a/...lication/BaseActivationMethodAttribute.cs → ...lication/BaseActivationMethodAttribute.cs b/...lication/BaseActivationMethodAttribute.cs → ...lication/BaseActivationMethodAttribute.cs
diff --git a/.../Environment/Application/BaseAttribute.cs → .../Environment/Application/BaseAttribute.cs b/.../Environment/Application/BaseAttribute.cs → .../Environment/Application/BaseAttribute.cs
diff --git a/...t/Application/WebApplicationEntryPoint.cs → ...t/Application/WebApplicationEntryPoint.cs b/...t/Application/WebApplicationEntryPoint.cs → ...t/Application/WebApplicationEntryPoint.cs
diff --git a/...pplication/WebApplicationHostAttribute.cs → ...pplication/WebApplicationHostAttribute.cs b/...pplication/WebApplicationHostAttribute.cs → ...pplication/WebApplicationHostAttribute.cs
diff --git a/...cation/WebApplicationPreStartAttribute.cs → ...cation/WebApplicationPreStartAttribute.cs b/...cation/WebApplicationPreStartAttribute.cs → ...cation/WebApplicationPreStartAttribute.cs
diff --git a/...lication/WebApplicationPreStartManager.cs → ...lication/WebApplicationPreStartManager.cs b/...lication/WebApplicationPreStartManager.cs → ...lication/WebApplicationPreStartManager.cs
diff --git a/...t/Assemblies/DefaultWebAssemblyManager.cs → ...t/Assemblies/DefaultWebAssemblyManager.cs b/...t/Assemblies/DefaultWebAssemblyManager.cs → ...t/Assemblies/DefaultWebAssemblyManager.cs
diff --git a/...ent/Host/DefaultWebApplicationAutoHost.cs → ...ent/Host/DefaultWebApplicationAutoHost.cs b/...ent/Host/DefaultWebApplicationAutoHost.cs → ...ent/Host/DefaultWebApplicationAutoHost.cs
diff --git a/...ronment/Host/DefaultWebApplicationHost.cs → ...ronment/Host/DefaultWebApplicationHost.cs b/...ronment/Host/DefaultWebApplicationHost.cs → ...ronment/Host/DefaultWebApplicationHost.cs
diff --git a/...vironment/Host/IWebApplicationAutoHost.cs → ...vironment/Host/IWebApplicationAutoHost.cs b/...vironment/Host/IWebApplicationAutoHost.cs → ...vironment/Host/IWebApplicationAutoHost.cs
diff --git a/...b/Environment/Host/IWebApplicationHost.cs → ...b/Environment/Host/IWebApplicationHost.cs b/...b/Environment/Host/IWebApplicationHost.cs → ...b/Environment/Host/IWebApplicationHost.cs
diff --git a/....Core.Web/Environment/Host/UtilityHost.cs → ....Core.Web/Environment/Host/UtilityHost.cs b/....Core.Web/Environment/Host/UtilityHost.cs → ....Core.Web/Environment/Host/UtilityHost.cs
diff --git a/...tions/Host/RestartApplicationException.cs → ...tions/Host/RestartApplicationException.cs b/...tions/Host/RestartApplicationException.cs → ...tions/Host/RestartApplicationException.cs
diff --git a/...Core.Web/Extensions/AssemblyExtensions.cs → ...Core.Web/Extensions/AssemblyExtensions.cs b/...Core.Web/Extensions/AssemblyExtensions.cs → ...Core.Web/Extensions/AssemblyExtensions.cs
diff --git a/...rModules.Core.Web/Models/ComboWireJson.cs → ...rModules.Core.Web/Models/ComboWireJson.cs b/...rModules.Core.Web/Models/ComboWireJson.cs → ...rModules.Core.Web/Models/ComboWireJson.cs
diff --git a/...erModules.Core.Web/Models/UserMessages.cs → ...erModules.Core.Web/Models/UserMessages.cs b/...erModules.Core.Web/Models/UserMessages.cs → ...erModules.Core.Web/Models/UserMessages.cs
diff --git a/BetterModules.Core.Web/Models/WireJson.cs → ...BetterModules.Core.Web/Models/WireJson.cs b/BetterModules.Core.Web/Models/WireJson.cs → ...BetterModules.Core.Web/Models/WireJson.cs
diff --git a/....Core.Web/Mvc/Commands/CoreCommandBase.cs → ....Core.Web/Mvc/Commands/CoreCommandBase.cs b/....Core.Web/Mvc/Commands/CoreCommandBase.cs → ....Core.Web/Mvc/Commands/CoreCommandBase.cs
diff --git a/...eb/Mvc/Commands/DefaultCommandResolver.cs → ...eb/Mvc/Commands/DefaultCommandResolver.cs b/...eb/Mvc/Commands/DefaultCommandResolver.cs → ...eb/Mvc/Commands/DefaultCommandResolver.cs
diff --git a/...Modules.Core.Web/Mvc/Commands/ICommand.cs → ...Modules.Core.Web/Mvc/Commands/ICommand.cs b/...Modules.Core.Web/Mvc/Commands/ICommand.cs → ...Modules.Core.Web/Mvc/Commands/ICommand.cs
diff --git a/....Core.Web/Mvc/Commands/ICommandContext.cs → ....Core.Web/Mvc/Commands/ICommandContext.cs b/....Core.Web/Mvc/Commands/ICommandContext.cs → ....Core.Web/Mvc/Commands/ICommandContext.cs
diff --git a/...Core.Web/Mvc/Commands/ICommandResolver.cs → ...Core.Web/Mvc/Commands/ICommandResolver.cs b/...Core.Web/Mvc/Commands/ICommandResolver.cs → ...Core.Web/Mvc/Commands/ICommandResolver.cs
diff --git a/...odules.Core.Web/Mvc/CoreControllerBase.cs → ...odules.Core.Web/Mvc/CoreControllerBase.cs b/...odules.Core.Web/Mvc/CoreControllerBase.cs → ...odules.Core.Web/Mvc/CoreControllerBase.cs
diff --git a/...re.Web/Mvc/DefaultWebControllerFactory.cs → ...re.Web/Mvc/DefaultWebControllerFactory.cs b/...re.Web/Mvc/DefaultWebControllerFactory.cs → ...re.Web/Mvc/DefaultWebControllerFactory.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Web.Mvc;
 using System.Web.Routing;
-using Autofac;
-using Autofac.Features.Metadata;
 using BetterModules.Core.Web.Dependencies;
 using BetterModules.Core.Web.Mvc.Routes;
+using Microsoft.AspNet.Mvc;
 
 namespace BetterModules.Core.Web.Mvc
 {

diff --git a/...Extensions/DefaultControllerExtensions.cs → ...Extensions/DefaultControllerExtensions.cs b/...Extensions/DefaultControllerExtensions.cs → ...Extensions/DefaultControllerExtensions.cs
diff --git a/...b/Mvc/Extensions/IControllerExtensions.cs → ...b/Mvc/Extensions/IControllerExtensions.cs b/...b/Mvc/Extensions/IControllerExtensions.cs → ...b/Mvc/Extensions/IControllerExtensions.cs
diff --git a/...Mvc/Extensions/ViewRenderingExtensions.cs → ...Mvc/Extensions/ViewRenderingExtensions.cs b/...Mvc/Extensions/ViewRenderingExtensions.cs → ...Mvc/Extensions/ViewRenderingExtensions.cs
@@ -1,5 +1,5 @@
 using System.IO;
-using System.Web.Mvc;
+using Microsoft.AspNet.Mvc;
 
 namespace BetterModules.Core.Web.Mvc.Extensions
 {

diff --git a/...es.Core.Web/Mvc/Extensions/VirtualPath.cs → ...es.Core.Web/Mvc/Extensions/VirtualPath.cs b/...es.Core.Web/Mvc/Extensions/VirtualPath.cs → ...es.Core.Web/Mvc/Extensions/VirtualPath.cs
diff --git a/...odules.Core.Web/Mvc/IMessagesIndicator.cs → ...odules.Core.Web/Mvc/IMessagesIndicator.cs b/...odules.Core.Web/Mvc/IMessagesIndicator.cs → ...odules.Core.Web/Mvc/IMessagesIndicator.cs
diff --git a/....Core.Web/Mvc/Routes/DefaultRouteTable.cs → ....Core.Web/Mvc/Routes/DefaultRouteTable.cs b/....Core.Web/Mvc/Routes/DefaultRouteTable.cs → ....Core.Web/Mvc/Routes/DefaultRouteTable.cs
diff --git a/...odules.Core.Web/Mvc/Routes/IRouteTable.cs → ...odules.Core.Web/Mvc/Routes/IRouteTable.cs b/...odules.Core.Web/Mvc/Routes/IRouteTable.cs → ...odules.Core.Web/Mvc/Routes/IRouteTable.cs
diff --git a/...es.Core.Web/Mvc/Routes/RouteExtensions.cs → ...es.Core.Web/Mvc/Routes/RouteExtensions.cs b/...es.Core.Web/Mvc/Routes/RouteExtensions.cs → ...es.Core.Web/Mvc/Routes/RouteExtensions.cs
diff --git a/...dules.Core.Web/Properties/AssemblyInfo.cs → ...dules.Core.Web/Properties/AssemblyInfo.cs b/...dules.Core.Web/Properties/AssemblyInfo.cs → ...dules.Core.Web/Properties/AssemblyInfo.cs
diff --git a/...b/Security/DefaultWebPrincipalProvider.cs → ...b/Security/DefaultWebPrincipalProvider.cs b/...b/Security/DefaultWebPrincipalProvider.cs → ...b/Security/DefaultWebPrincipalProvider.cs
diff --git a/vNext/src/BetterModules.Core.Web/project.json b/vNext/src/BetterModules.Core.Web/project.json
@@ -1,15 +1,17 @@
-{
-  "version": "1.0.0-*",
-  "description": "",
-  "authors": [ "Devbridge" ],
-  "tags": [ "" ],
-  "projectUrl": "",
-  "licenseUrl": "",
+{
+    "version": "1.0.0-*",
+    "description": "",
+    "authors": [ "Devbridge" ],
+    "tags": [ "" ],
+    "projectUrl": "",
+    "licenseUrl": "",
 
-  "dependencies": {
-  },
+    "dependencies": {
+        "BetterModules.Core": "1.0.0-*",
+        "Microsoft.AspNet.Mvc": "6.0.0-beta7"
+    },
 
-  "frameworks" : {
-    "dnx451": { }
-  }
+    "frameworks": {
+        "dnx451": { }
+    }
 }
diff --git a/vNext/src/BetterModules.Mvc6.Sandbox/Controllers/HomeController.cs b/vNext/src/BetterModules.Mvc6.Sandbox/Controllers/HomeController.cs
@@ -1,4 +1,5 @@
 using BetterModules.Sample.Module.Models;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
 
 namespace BetterModules.Mvc6.Sandbox.Controllers