From c5e818328f3eff81b90d564284ad1f2051cdcd4d Mon Sep 17 00:00:00 2001 From: Stephen Belden Date: Tue, 1 Aug 2017 17:24:42 -0600 Subject: [PATCH 1/2] Upgrade Unity to 4.0.1 --- CHANGELOG.md | 1 + Unity.Wcf/Unity.Wcf.csproj | 15 +++++++++------ Unity.Wcf/packages.config | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edd5bd4..a05fbe7 100644 --- 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 index eaa7773..2dc3a87 100644 --- a/Unity.Wcf/Unity.Wcf.csproj +++ b/Unity.Wcf/Unity.Wcf.csproj @@ -40,14 +40,17 @@ Unity.Wcf.snk - - ..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.dll + + ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - ..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.Configuration.dll + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll - - ..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll + + + ..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll diff --git a/Unity.Wcf/packages.config b/Unity.Wcf/packages.config index f273132..f1094a3 100644 --- a/Unity.Wcf/packages.config +++ b/Unity.Wcf/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file From f5ce82f3eb22385ccb5effaf159c59f2f20a48ec Mon Sep 17 00:00:00 2001 From: Stephen Belden Date: Tue, 1 Aug 2017 17:33:45 -0600 Subject: [PATCH 2/2] Reformat code indentations By removing unnecessary spaces after lines and in blank lines, replacing tabs with spaces, and fixing XML indentation. --- Unity.Wcf/Unity.Wcf.nuspec | 14 +++++++------- Unity.Wcf/UnityInstanceContextExtension.cs | 8 ++++---- Unity.Wcf/UnityInstanceProvider.cs | 6 +++--- Unity.Wcf/UnityServiceHost.cs | 2 +- Unity.Wcf/UnityServiceHostFactory.cs | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Unity.Wcf/Unity.Wcf.nuspec b/Unity.Wcf/Unity.Wcf.nuspec index eb7bafe..7b0a26a 100644 --- a/Unity.Wcf/Unity.Wcf.nuspec +++ b/Unity.Wcf/Unity.Wcf.nuspec @@ -10,13 +10,13 @@ false 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. wcf unity ioc di - + - - - + + + - - - + + + diff --git a/Unity.Wcf/UnityInstanceContextExtension.cs b/Unity.Wcf/UnityInstanceContextExtension.cs index eb5c3e5..16a37f1 100644 --- 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 index fae9d17..1894af3 100644 --- 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().DisposeOfChildContainer(); - } + instanceContext.Extensions.Find().DisposeOfChildContainer(); + } } } \ No newline at end of file diff --git a/Unity.Wcf/UnityServiceHost.cs b/Unity.Wcf/UnityServiceHost.cs index 1009669..308abc8 100644 --- 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 index 089b77e..4a09d42 100644 --- 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); - } - } + } + } } \ No newline at end of file