Merge pull request #2 from slbelden/master

viceice · web-flow · commit 3786f130a35b · 2017-08-02T11:24:43.000+03:00
Update Unity to 4.0.1
diff --git a/CHANGELOG.md b/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
diff --git a/Unity.Wcf/Unity.Wcf.csproj b/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" />
diff --git a/Unity.Wcf/Unity.Wcf.nuspec b/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>
diff --git a/Unity.Wcf/UnityInstanceContextExtension.cs b/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)
-        {            
-        }        
+        {
+        }
     }
 }
diff --git a/Unity.Wcf/UnityInstanceProvider.cs b/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();
+        }
     }
 }
diff --git a/Unity.Wcf/UnityServiceHost.cs b/Unity.Wcf/UnityServiceHost.cs
@@ -37,7 +37,7 @@ private void ApplyContractBehaviors(IUnityContainer container)
                 foreach (var contractDescription in ImplementedContracts.Values)
                 {
                     contractDescription.Behaviors.Add(contractBehavior);
-                }                
+                }
             }
         }
 
diff --git a/Unity.Wcf/UnityServiceHostFactory.cs b/Unity.Wcf/UnityServiceHostFactory.cs
@@ -16,6 +16,6 @@ protected override ServiceHost CreateServiceHost(Type serviceType, Uri[] baseAdd
             ConfigureContainer(container);
 
             return new UnityServiceHost(container, serviceType, baseAddresses);
-        }        
-    }    
+        }
+    }
 }
diff --git a/Unity.Wcf/packages.config b/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>

Original file line number	Diff line number	Diff line change
`@@ -22,16 +22,16 @@ public void DisposeOfChildContainer()`
`22`	`22`	`{`
`23`	`23`	`if (_childContainer != null)`
`24`	`24`	`{`
`25`		`- _childContainer.Dispose();`
	`25`	`+ _childContainer.Dispose();`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public void Attach(InstanceContext owner)`
`30`		`- {`
	`30`	`+ {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public void Detach(InstanceContext owner)`
`34`		`- {`
`35`		`- }`
	`34`	`+ {`
	`35`	`+ }`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class UnityInstanceProvider : IInstanceProvider`
`10`	`10`	`{`
`11`	`11`	`private readonly IUnityContainer _container;`
`12`	`12`	`private readonly Type _contractType;`
`13`		`-`
	`13`	`+`
`14`	`14`	`public UnityInstanceProvider(IUnityContainer container, Type contractType)`
`15`	`15`	`{`
`16`	`16`	`if (container == null)`
`@@ -42,7 +42,7 @@ public object GetInstance(InstanceContext instanceContext)`
`42`	`42`
`43`	`43`	`public void ReleaseInstance(InstanceContext instanceContext, object instance)`
`44`	`44`	`{`
`45`		`- instanceContext.Extensions.Find<UnityInstanceContextExtension>().DisposeOfChildContainer();`
`46`		`- }`
	`45`	`+ instanceContext.Extensions.Find<UnityInstanceContextExtension>().DisposeOfChildContainer();`
	`46`	`+ }`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ private void ApplyContractBehaviors(IUnityContainer container)`
`37`	`37`	`foreach (var contractDescription in ImplementedContracts.Values)`
`38`	`38`	`{`
`39`	`39`	`contractDescription.Behaviors.Add(contractBehavior);`
`40`		`- }`
	`40`	`+ }`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ protected override ServiceHost CreateServiceHost(Type serviceType, Uri[] baseAdd`
`16`	`16`	`ConfigureContainer(container);`
`17`	`17`
`18`	`18`	`return new UnityServiceHost(container, serviceType, baseAddresses);`
`19`		`- }`
`20`		`- }`
	`19`	`+ }`
	`20`	`+ }`
`21`	`21`	`}`