Update Unity to 4.0.1

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 ### Changed
 - Updated project urls
+- Updated Unity to 4.0.1
 
 ## [2.0.0] - 2017-06-20
 ### Changed

Unity.Wcf/Unity.Wcf.csproj

@@ -40,14 +40,17 @@
     <AssemblyOriginatorKeyFile>Unity.Wcf.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Practices.Unity, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
+    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Configuration, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
+    <Reference Include="Microsoft.Practices.Unity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
+    <Reference Include="Microsoft.Practices.Unity.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

Unity.Wcf/Unity.Wcf.nuspec

@@ -10,13 +10,13 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Unity.Wcf is a library that allows simple Integration of Microsoft's Unity IoC container with WCF. This project includes a bespoke InstanceProvider that creates a child container per client connection and disposes of all registered IDisposable instances once the connection is terminated.</description>
     <tags>wcf unity ioc di</tags>
-	<dependencies>
+    <dependencies>
     </dependencies>
-	<frameworkAssemblies>
-		<frameworkAssembly assemblyName="System.ServiceModel.Activation" />
-	</frameworkAssemblies>
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.ServiceModel.Activation" />
+    </frameworkAssemblies>
   </metadata>
-    <files>
-        <file src="content\**\*.*" target="content" />
-    </files>
+  <files>
+    <file src="content\**\*.*" target="content" />
+  </files>
 </package>

Unity.Wcf/UnityInstanceContextExtension.cs

@@ -22,16 +22,16 @@ public void DisposeOfChildContainer()
         {
             if (_childContainer != null)
             {
-                _childContainer.Dispose();                
+                _childContainer.Dispose();
             }
         }
 
         public void Attach(InstanceContext owner)
-        {            
+        {
         }
 
         public void Detach(InstanceContext owner)
-        {            
-        }        
+        {
+        }
     }
 }

Unity.Wcf/UnityInstanceProvider.cs

@@ -10,7 +10,7 @@ public class UnityInstanceProvider : IInstanceProvider
     {
         private readonly IUnityContainer _container;
         private readonly Type _contractType;
-        
+
         public UnityInstanceProvider(IUnityContainer container, Type contractType)
         {
             if (container == null)
@@ -42,7 +42,7 @@ public object GetInstance(InstanceContext instanceContext)
 
         public void ReleaseInstance(InstanceContext instanceContext, object instance)
         {
-            instanceContext.Extensions.Find<UnityInstanceContextExtension>().DisposeOfChildContainer();            
-        }        
+            instanceContext.Extensions.Find<UnityInstanceContextExtension>().DisposeOfChildContainer();
+        }
     }
 }

Unity.Wcf/UnityServiceHost.cs

@@ -37,7 +37,7 @@ private void ApplyContractBehaviors(IUnityContainer container)
                 foreach (var contractDescription in ImplementedContracts.Values)
                 {
                     contractDescription.Behaviors.Add(contractBehavior);
-                }                
+                }
             }
         }
 

Unity.Wcf/UnityServiceHostFactory.cs

@@ -16,6 +16,6 @@ protected override ServiceHost CreateServiceHost(Type serviceType, Uri[] baseAdd
             ConfigureContainer(container);
 
             return new UnityServiceHost(container, serviceType, baseAddresses);
-        }        
-    }    
+        }
+    }
 }

Unity.Wcf/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Unity" version="3.5.1404.0" targetFramework="net45" />
+  <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
+  <package id="Unity" version="4.0.1" targetFramework="net45" />
 </packages>