Refactoring

src/App_Start/UnityMvcActivator.cs.pp

@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Web.Mvc;
 
-using Unity.Mvc;
+using Unity.AspNet.Mvc;
 
 [assembly: WebActivatorEx.PreApplicationStartMethod(typeof($rootnamespace$.UnityMvcActivator), nameof($rootnamespace$.UnityMvcActivator.Start))]
 [assembly: WebActivatorEx.ApplicationShutdownMethod(typeof($rootnamespace$.UnityMvcActivator), nameof($rootnamespace$.UnityMvcActivator.Shutdown))]

src/PerRequestLifetimeManager.cs

@@ -1,9 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
 
 using System;
+
 using Unity.Lifetime;
 
-namespace Unity.Mvc
+namespace Unity.AspNet.Mvc
 {
     /// <summary>
     /// A <see cref="LifetimeManager"/> that holds onto the instance given to it during

src/Unity.Mvc.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Unity MVC</Description>
-    <Version>5.0.1</Version>
-    <AssemblyVersion>5.0.1.0</AssemblyVersion>
-    <FileVersion>5.0.1.0</FileVersion>
+    <Description>Unity for ASP.NET MVC</Description>
+    <Version>5.0.2</Version>
+    <AssemblyVersion>5.0.2.0</AssemblyVersion>
+    <FileVersion>5.0.2.0</FileVersion>
     <Copyright>Copyright © Microsoft 2008</Copyright>
-    <PackageProjectUrl>https://github.com/unitycontainer/unity</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/unitycontainer/aspnet-mvc</PackageProjectUrl>
     <RepositoryUrl>https://github.com/unitycontainer/unity</RepositoryUrl>
     <PackageLicenseUrl>https://github.com/unitycontainer/unity/blob/master/LICENSE</PackageLicenseUrl>
     <PackageIconUrl>https://avatars1.githubusercontent.com/u/12849707</PackageIconUrl>
     <RepositoryType>git</RepositoryType>
-    <PackageReleaseNotes>This package is compatible with .NET 4.5, and 4.7 frameworks.</PackageReleaseNotes>
+    <PackageReleaseNotes>This package is compatible with .NET 4.5 and 4.7 frameworks.</PackageReleaseNotes>
     <PackageId>Unity.Mvc</PackageId>
     <Authors>Microsoft.Practices.Unity</Authors>
     <Company>Microsoft.Practices.Unity</Company>
@@ -32,15 +32,14 @@
     <DelaySign>false</DelaySign>
   </PropertyGroup>
 
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <TargetFrameworks>net47;net45</TargetFrameworks>
+    <TargetFrameworks>net45;net47</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <TargetFrameworks>net47;net45</TargetFrameworks>
+    <TargetFrameworks>net45;net47</TargetFrameworks>
     <DebugType>Full</DebugType>
   </PropertyGroup>
 
@@ -49,8 +48,21 @@
     <PackageReference Include="WebActivatorEx" Version="2.2.0" />
   </ItemGroup>
 
+  <PropertyGroup>
+    <RootNamespace>Unity.AspNet.Mvc</RootNamespace>
+  </PropertyGroup>
+
   <PropertyGroup>
     <UnityAbstractions>..\..\Abstractions\src\Unity.Abstractions.csproj</UnityAbstractions>
+    <UnityContainer>..\..\Container\src\Unity.Container.csproj</UnityContainer>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
+    <DocumentationFile>bin\Release\net45\Unity.Mvc.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net47|AnyCPU'">
+    <DocumentationFile>bin\Release\net47\Unity.Mvc.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup Condition="Exists('$(UnityAbstractions)')">
@@ -61,4 +73,12 @@
     <PackageReference Include="Unity.Abstractions" Version="2.0.2" />
   </ItemGroup>
 
+  <ItemGroup Condition="Exists('$(UnityContainer)')">
+    <ProjectReference Include="$(UnityContainer)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!Exists('$(UnityContainer)')">
+    <PackageReference Include="Unity.Container" Version="5.0.1" />
+  </ItemGroup>
+
 </Project>

src/UnityDependencyResolver.cs

@@ -3,9 +3,10 @@
 using System;
 using System.Collections.Generic;
 using System.Web.Mvc;
+
 using Unity.Exceptions;
 
-namespace Unity.Mvc
+namespace Unity.AspNet.Mvc
 {
     /// <summary>
     /// An implementation of <see cref="IDependencyResolver"/> that wraps a Unity container.

src/UnityFilterAttributeFilterProvider.cs

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
 
-using System.Web.Mvc;
 using System.Collections.Generic;
+using System.Web.Mvc;
 
-namespace Unity.Mvc
+namespace Unity.AspNet.Mvc
 {
     /// <summary>
     /// Defines a filter provider for filter attributes that support injection of Unity dependencies.

src/UnityPerRequestHttpModule.cs

@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Web;
 
-namespace Unity.Mvc
+namespace Unity.AspNet.Mvc
 {
     /// <summary>
     /// Implementation of the <see cref="IHttpModule"/> interface that provides support for using the

tests/MVC.Tests.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net47</TargetFramework>
     <IsPackable>false</IsPackable>
-    <RootNamespace>Unity.Interception.Tests</RootNamespace>
+    <RootNamespace>Unity.AspNet.Mvc.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

tests/MvcUnityDependencyResolverFixture.cs

@@ -3,13 +3,13 @@
 using System;
 using System.Linq;
 using System.Web.Mvc;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Unity;
+
 using Unity.Exceptions;
 using Unity.Lifetime;
-using Unity.Mvc;
 
-namespace Microsoft.Practices.Unity.WebIntegation.Tests
+namespace Unity.AspNet.Mvc.Tests
 {
     [TestClass]
     public class MvcUnityDependencyResolverFixture

tests/MvcUnityFilterAttributeFilterProviderFixture.cs

@@ -1,14 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
 
-using System;
 using System.Linq;
 using System.Web.Mvc;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Unity;
+
 using Unity.Injection;
-using Unity.Mvc;
 
-namespace Microsoft.Practices.Unity.WebIntegation.Tests
+namespace Unity.AspNet.Mvc.Tests
 {
     [TestClass]
     public class MvcUnityFilterAttributeFilterProviderFixture