From bd257621342f2ee0ae491d9fb7e64f9938a7c925 Mon Sep 17 00:00:00 2001
From: Val Melamed <valo@vtmelamed.com>
Date: Mon, 16 Nov 2015 18:47:47 -0500
Subject: [PATCH] Changed version to 1.0.1-beta. Updated the version of Unity
 to 4.0.1.

---
 .../Serialization/Properties/AssemblyInfo.cs  | 25 +++++---------
 .../Serialization/Tests/app.config            | 15 ++++++++
 ...inq.Expressions.Serialization.Tests.csproj |  1 +
 Aspects/Model/Properties/AssemblyInfo.cs      | 15 ++++----
 Aspects/Model/Tests/app.config                | 34 ++++++-------------
 Aspects/Model/Tests/packages.config           |  4 +--
 .../Model/Tests/vm.Aspects.Model.Tests.csproj | 20 +++++------
 Aspects/Model/app.config                      | 20 +++++------
 Aspects/Model/packages.config                 |  4 +--
 Aspects/Model/vm.Aspects.Model.csproj         | 22 ++++++------
 Aspects/NuGet/vm.Aspects.nuspec               | 10 +++---
 Aspects/Parsers/Properties/AssemblyInfo.cs    | 15 ++++----
 Aspects/Properties/AssemblyInfo.cs            | 16 ++++-----
 .../Cryptography/Ciphers/Test/packages.config |  2 +-
 ...Security.Cryptography.Ciphers.Tests.csproj | 12 +++----
 Aspects/Test/packages.config                  |  6 ++--
 Aspects/Test/vm.Aspects.Tests.csproj          | 24 ++++++-------
 Aspects/Wcf/Properties/AssemblyInfo.cs        | 15 ++++----
 Aspects/Wcf/packages.config                   |  4 +--
 Aspects/Wcf/vm.Aspects.Wcf.csproj             | 20 +++++------
 Aspects/app.config                            | 20 +++++------
 Aspects/packages.config                       |  4 +--
 Aspects/vm.Aspects.csproj                     | 20 +++++------
 23 files changed, 163 insertions(+), 165 deletions(-)
 create mode 100644 Aspects/Linq/Expressions/Serialization/Tests/app.config

diff --git a/Aspects/Linq/Expressions/Serialization/Properties/AssemblyInfo.cs b/Aspects/Linq/Expressions/Serialization/Properties/AssemblyInfo.cs
index 61d9c32..fb8ac5b 100644
--- a/Aspects/Linq/Expressions/Serialization/Properties/AssemblyInfo.cs
+++ b/Aspects/Linq/Expressions/Serialization/Properties/AssemblyInfo.cs
@@ -1,23 +1,14 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("vm.Aspects.Linq.Expressions.Serialization")]
-[assembly: AssemblyDescription("")]
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
+[assembly: AssemblyDescription("Serializes and deserializes LINQ expression trees to and from XML documents.")]
+
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]
+[assembly: AssemblyInformationalVersion("1.0.1")]
+
+[assembly: InternalsVisibleTo(
     "vm.Aspects.Linq.Expressions.Serialization.Test, " +
     "PublicKey=00240000048000009400000006020000002400005253413100040000010001004b151837822bdb" +
               "b18296865918eb87882f2528630f673f17668fff4c6e51b8563b1985ec7ec5e6877611068c595a" +
diff --git a/Aspects/Linq/Expressions/Serialization/Tests/app.config b/Aspects/Linq/Expressions/Serialization/Tests/app.config
new file mode 100644
index 0000000..5391db4
--- /dev/null
+++ b/Aspects/Linq/Expressions/Serialization/Tests/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Practices.Unity.Interception" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Aspects/Linq/Expressions/Serialization/Tests/vm.Aspects.Linq.Expressions.Serialization.Tests.csproj b/Aspects/Linq/Expressions/Serialization/Tests/vm.Aspects.Linq.Expressions.Serialization.Tests.csproj
index ca7a91b..3eedd77 100644
--- a/Aspects/Linq/Expressions/Serialization/Tests/vm.Aspects.Linq.Expressions.Serialization.Tests.csproj
+++ b/Aspects/Linq/Expressions/Serialization/Tests/vm.Aspects.Linq.Expressions.Serialization.Tests.csproj
@@ -226,6 +226,7 @@
     <None Include="..\..\..\..\..\Common Items\vm.Test.snk">
       <Link>vm.Test.snk</Link>
     </None>
+    <None Include="app.config" />
     <None Include="DataContract.xsd">
       <SubType>Designer</SubType>
     </None>
diff --git a/Aspects/Model/Properties/AssemblyInfo.cs b/Aspects/Model/Properties/AssemblyInfo.cs
index a272949..b43f809 100644
--- a/Aspects/Model/Properties/AssemblyInfo.cs
+++ b/Aspects/Model/Properties/AssemblyInfo.cs
@@ -2,14 +2,15 @@
 
 [assembly: AssemblyTitle("vm.Aspect.Model")]
 [assembly: AssemblyDescription("Defines the IRepository and related base classes and utilities - a framework of building domain object model.")]
-[assembly: AssemblyVersion("0.9.1")]
-[assembly: AssemblyFileVersion("0.9.1")]
-[assembly: AssemblyInformationalVersion("0.9.1")]
+
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]
+[assembly: AssemblyInformationalVersion("1.0.1")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "vm.Aspects.Model.Tests, " +
-    "PublicKey=00240000048000009400000006020000002400005253413100040000010001004b151837822bdb"+
-              "b18296865918eb87882f2528630f673f17668fff4c6e51b8563b1985ec7ec5e6877611068c595a"+
-              "e297a32e3bf9d71a5b479a59705f0688e91f086f20fa0772135ee08f693d5310ce18761d4f71ed"+
-              "cb2486ec0910dd7361decc2184708dcbd5211feb361f45b024a45b91c28d7bed158671053085b8"+
+    "PublicKey=00240000048000009400000006020000002400005253413100040000010001004b151837822bdb" +
+              "b18296865918eb87882f2528630f673f17668fff4c6e51b8563b1985ec7ec5e6877611068c595a" +
+              "e297a32e3bf9d71a5b479a59705f0688e91f086f20fa0772135ee08f693d5310ce18761d4f71ed" +
+              "cb2486ec0910dd7361decc2184708dcbd5211feb361f45b024a45b91c28d7bed158671053085b8" +
               "fae385c1")]
diff --git a/Aspects/Model/Tests/app.config b/Aspects/Model/Tests/app.config
index eaa16f3..0f48238 100644
--- a/Aspects/Model/Tests/app.config
+++ b/Aspects/Model/Tests/app.config
@@ -2,51 +2,37 @@
 <configuration>
     <configSections>
         <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-        <section name="entityFramework"
-                 type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-                 requirePermission="false" />
+        <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     </configSections>
 
     <connectionStrings>
-        <add name="ModelTests"
-             connectionString="Server=(localdb)\MSSQLLocalDB;Database=vmAspectsModelTests;Integrated Security=SSPI;Application Name=vmAspectsModelTests;MultipleActiveResultSets=true"
-             providerName="System.Data.SqlClient"/>
+        <add name="ModelTests" connectionString="Server=(localdb)\MSSQLLocalDB;Database=vmAspectsModelTests;Integrated Security=SSPI;Application Name=vmAspectsModelTests;MultipleActiveResultSets=true" providerName="System.Data.SqlClient" />
     </connectionStrings>
 
     <entityFramework>
         <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
             <parameters>
-                <parameter value="MSSQLLocalDB"/>
+                <parameter value="MSSQLLocalDB" />
             </parameters>
         </defaultConnectionFactory>
         <providers>
-            <provider invariantName="System.Data.SqlClient"
-                      type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
+            <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
         </providers>
     </entityFramework>
 
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
-                <assemblyIdentity name="Microsoft.Practices.Unity"
-                                  publicKeyToken="31bf3856ad364e35"
-                                  culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-3.5.1.0"
-                                 newVersion="3.5.1.0" />
+                <assemblyIdentity name="Microsoft.Practices.Unity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="Microsoft.Practices.Unity.Interception"
-                                  publicKeyToken="31bf3856ad364e35"
-                                  culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-3.5.1.0"
-                                 newVersion="3.5.1.0" />
+                <assemblyIdentity name="Microsoft.Practices.Unity.Interception" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="Microsoft.Practices.ServiceLocation"
-                                  publicKeyToken="31bf3856ad364e35"
-                                  culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.3.0.0"
-                                 newVersion="1.3.0.0" />
+                <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
             </dependentAssembly>
         </assemblyBinding>
     </runtime>
diff --git a/Aspects/Model/Tests/packages.config b/Aspects/Model/Tests/packages.config
index f0b2de9..2bb5a4f 100644
--- a/Aspects/Model/Tests/packages.config
+++ b/Aspects/Model/Tests/packages.config
@@ -9,6 +9,6 @@
   <package id="EnterpriseLibrary.PolicyInjection" version="6.0.1304.0" targetFramework="net46" />
   <package id="EnterpriseLibrary.Validation" version="6.0.1304.0" targetFramework="net46" />
   <package id="EntityFramework" version="6.1.3" targetFramework="net46" />
-  <package id="Unity" version="3.5.1405-prerelease" targetFramework="net46" />
-  <package id="Unity.Interception" version="3.5.1405-prerelease" targetFramework="net46" />
+  <package id="Unity" version="4.0.1" targetFramework="net46" />
+  <package id="Unity.Interception" version="4.0.1" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/Aspects/Model/Tests/vm.Aspects.Model.Tests.csproj b/Aspects/Model/Tests/vm.Aspects.Model.Tests.csproj
index 701e078..32b1ad2 100644
--- a/Aspects/Model/Tests/vm.Aspects.Model.Tests.csproj
+++ b/Aspects/Model/Tests/vm.Aspects.Model.Tests.csproj
@@ -217,24 +217,24 @@
       <HintPath>..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Configuration, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.Configuration.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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Interception, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Unity.Interception.3.5.1405-prerelease\lib\Net45\Microsoft.Practices.Unity.Interception.dll</HintPath>
+    <Reference Include="Microsoft.Practices.Unity.Interception, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Interception.Configuration, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Unity.Interception.3.5.1405-prerelease\lib\Net45\Microsoft.Practices.Unity.Interception.Configuration.dll</HintPath>
+    <Reference Include="Microsoft.Practices.Unity.Interception.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.Configuration.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
+    <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>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/Aspects/Model/app.config b/Aspects/Model/app.config
index de2b418..270c030 100644
--- a/Aspects/Model/app.config
+++ b/Aspects/Model/app.config
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.Unity" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0"/>
+        <assemblyIdentity name="Microsoft.Practices.Unity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0"/>
+        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.Unity.Configuration" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
+        <assemblyIdentity name="Microsoft.Practices.Unity.Configuration" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.Unity.Interception" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0"/>
+        <assemblyIdentity name="Microsoft.Practices.Unity.Interception" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>
diff --git a/Aspects/Model/packages.config b/Aspects/Model/packages.config
index 547c158..93df2ff 100644
--- a/Aspects/Model/packages.config
+++ b/Aspects/Model/packages.config
@@ -9,6 +9,6 @@
   <package id="EnterpriseLibrary.PolicyInjection" version="6.0.1304.0" targetFramework="net45" />
   <package id="EnterpriseLibrary.Validation" version="6.0.1304.0" targetFramework="net45" />
   <package id="EntityFramework" version="6.1.3" targetFramework="net45" />
-  <package id="Unity" version="3.5.1405-prerelease" targetFramework="net45" />
-  <package id="Unity.Interception" version="3.5.1405-prerelease" targetFramework="net45" />
+  <package id="Unity" version="4.0.1" targetFramework="net46" />
+  <package id="Unity.Interception" version="4.0.1" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/Aspects/Model/vm.Aspects.Model.csproj b/Aspects/Model/vm.Aspects.Model.csproj
index a57a30c..a1f6c43 100644
--- a/Aspects/Model/vm.Aspects.Model.csproj
+++ b/Aspects/Model/vm.Aspects.Model.csproj
@@ -176,6 +176,8 @@
     <CodeContractsRuntimeCheckingLevel>ReleaseRequires</CodeContractsRuntimeCheckingLevel>
     <CodeContractsReferenceAssembly>DoNotBuild</CodeContractsReferenceAssembly>
     <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
@@ -214,24 +216,24 @@
       <HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Configuration, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.Configuration.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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Interception, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.Interception.3.5.1405-prerelease\lib\Net45\Microsoft.Practices.Unity.Interception.dll</HintPath>
+    <Reference Include="Microsoft.Practices.Unity.Interception, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Interception.Configuration, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.Interception.3.5.1405-prerelease\lib\Net45\Microsoft.Practices.Unity.Interception.Configuration.dll</HintPath>
+    <Reference Include="Microsoft.Practices.Unity.Interception.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.Configuration.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
+    <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>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/Aspects/NuGet/vm.Aspects.nuspec b/Aspects/NuGet/vm.Aspects.nuspec
index 46f04a3..cb5b017 100644
--- a/Aspects/NuGet/vm.Aspects.nuspec
+++ b/Aspects/NuGet/vm.Aspects.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>vm.Aspects</id>
-        <version>0.91.0</version>
+        <version>1.0.1-beta</version>
         <authors>Val Melamed</authors>
         <owners>Val Melamed</owners>
         <summary>
@@ -23,10 +23,10 @@
             <dependency id="CommonServiceLocator"
                         version="1.3" />
             
-            <dependency id="EnterpriseLibrary.Unity"
-                        version="3.5.1405-prerelease" />
-            <dependency id="EnterpriseLibrary.Unity.Interception"
-                        version="3.5.1405-prerelease" />
+            <dependency id="Unity"
+                        version="4.0.1" />
+            <dependency id="Unity.Interception"
+                        version="4.0.1" />
             
             <dependency id="EnterpriseLibrary.Common"
                         version="6.0.1304.0" />
diff --git a/Aspects/Parsers/Properties/AssemblyInfo.cs b/Aspects/Parsers/Properties/AssemblyInfo.cs
index 3b5f401..81c203b 100644
--- a/Aspects/Parsers/Properties/AssemblyInfo.cs
+++ b/Aspects/Parsers/Properties/AssemblyInfo.cs
@@ -5,14 +5,15 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("vm.Aspects.Parser")]
 [assembly: AssemblyDescription("Text parsing readers, e.g. CSV/TSV reader.")]
-[assembly: AssemblyVersion("0.9.1")]
-[assembly: AssemblyFileVersion("0.9.1")]
-[assembly: AssemblyInformationalVersion("0.9.1")]
+
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]
+[assembly: AssemblyInformationalVersion("1.0.1")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "vm.Aspects.Parsers.Tests, " +
-    "PublicKey=00240000048000009400000006020000002400005253413100040000010001004b151837822bdb"+
-              "b18296865918eb87882f2528630f673f17668fff4c6e51b8563b1985ec7ec5e6877611068c595a"+
-              "e297a32e3bf9d71a5b479a59705f0688e91f086f20fa0772135ee08f693d5310ce18761d4f71ed"+
-              "cb2486ec0910dd7361decc2184708dcbd5211feb361f45b024a45b91c28d7bed158671053085b8"+
+    "PublicKey=00240000048000009400000006020000002400005253413100040000010001004b151837822bdb" +
+              "b18296865918eb87882f2528630f673f17668fff4c6e51b8563b1985ec7ec5e6877611068c595a" +
+              "e297a32e3bf9d71a5b479a59705f0688e91f086f20fa0772135ee08f693d5310ce18761d4f71ed" +
+              "cb2486ec0910dd7361decc2184708dcbd5211feb361f45b024a45b91c28d7bed158671053085b8" +
               "fae385c1")]
diff --git a/Aspects/Properties/AssemblyInfo.cs b/Aspects/Properties/AssemblyInfo.cs
index f040d0b..ed670a9 100644
--- a/Aspects/Properties/AssemblyInfo.cs
+++ b/Aspects/Properties/AssemblyInfo.cs
@@ -1,16 +1,16 @@
 using System.Reflection;
 
 [assembly: AssemblyTitle("vm.Aspects")]
-[assembly: AssemblyDescription("A set of classes addresing various common cross-cutting concerns.")]
-[assembly: AssemblyVersion("0.9.1")]
-[assembly: AssemblyFileVersion("0.9.1")]
-[assembly: AssemblyInformationalVersion("0.9.1")]
+[assembly: AssemblyDescription("A set of classes addressing various common cross-cutting concerns.")]
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]
+[assembly: AssemblyInformationalVersion("1.0.1")]
 
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "vm.Aspects.Test, " +
-    "PublicKey=00240000048000009400000006020000002400005253413100040000010001004b151837822bdb"+
-              "b18296865918eb87882f2528630f673f17668fff4c6e51b8563b1985ec7ec5e6877611068c595a"+
-              "e297a32e3bf9d71a5b479a59705f0688e91f086f20fa0772135ee08f693d5310ce18761d4f71ed"+
-              "cb2486ec0910dd7361decc2184708dcbd5211feb361f45b024a45b91c28d7bed158671053085b8"+
+    "PublicKey=00240000048000009400000006020000002400005253413100040000010001004b151837822bdb" +
+              "b18296865918eb87882f2528630f673f17668fff4c6e51b8563b1985ec7ec5e6877611068c595a" +
+              "e297a32e3bf9d71a5b479a59705f0688e91f086f20fa0772135ee08f693d5310ce18761d4f71ed" +
+              "cb2486ec0910dd7361decc2184708dcbd5211feb361f45b024a45b91c28d7bed158671053085b8" +
               "fae385c1")]
diff --git a/Aspects/Security/Cryptography/Ciphers/Test/packages.config b/Aspects/Security/Cryptography/Ciphers/Test/packages.config
index 7bc1733..ce56d6b 100644
--- a/Aspects/Security/Cryptography/Ciphers/Test/packages.config
+++ b/Aspects/Security/Cryptography/Ciphers/Test/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="1.3" targetFramework="net46" />
-  <package id="Unity" version="3.5.1405-prerelease" targetFramework="net46" />
+  <package id="Unity" version="4.0.1" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/Aspects/Security/Cryptography/Ciphers/Test/vm.Aspects.Security.Cryptography.Ciphers.Tests.csproj b/Aspects/Security/Cryptography/Ciphers/Test/vm.Aspects.Security.Cryptography.Ciphers.Tests.csproj
index ba47f58..0afb68d 100644
--- a/Aspects/Security/Cryptography/Ciphers/Test/vm.Aspects.Security.Cryptography.Ciphers.Tests.csproj
+++ b/Aspects/Security/Cryptography/Ciphers/Test/vm.Aspects.Security.Cryptography.Ciphers.Tests.csproj
@@ -186,16 +186,16 @@
       <HintPath>..\..\..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Configuration, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.Configuration.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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
+    <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>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/Aspects/Test/packages.config b/Aspects/Test/packages.config
index e5a2d44..98f70e8 100644
--- a/Aspects/Test/packages.config
+++ b/Aspects/Test/packages.config
@@ -7,7 +7,7 @@
   <package id="EnterpriseLibrary.Logging" version="6.0.1304.0" targetFramework="net46" />
   <package id="EnterpriseLibrary.PolicyInjection" version="6.0.1304.0" targetFramework="net46" />
   <package id="EnterpriseLibrary.Validation" version="6.0.1304.0" targetFramework="net46" />
-  <package id="Moq" version="4.2.1507.0118" targetFramework="net46" />
-  <package id="Unity" version="3.5.1405-prerelease" targetFramework="net46" />
-  <package id="Unity.Interception" version="3.5.1405-prerelease" targetFramework="net46" />
+  <package id="Moq" version="4.2.1510.2205" targetFramework="net46" />
+  <package id="Unity" version="4.0.1" targetFramework="net46" />
+  <package id="Unity.Interception" version="4.0.1" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/Aspects/Test/vm.Aspects.Tests.csproj b/Aspects/Test/vm.Aspects.Tests.csproj
index 63c5f96..49668aa 100644
--- a/Aspects/Test/vm.Aspects.Tests.csproj
+++ b/Aspects/Test/vm.Aspects.Tests.csproj
@@ -209,28 +209,28 @@
       <HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Configuration, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.Configuration.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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Interception, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.Interception.3.5.1405-prerelease\lib\Net45\Microsoft.Practices.Unity.Interception.dll</HintPath>
+    <Reference Include="Microsoft.Practices.Unity.Interception, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Interception.Configuration, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.Interception.3.5.1405-prerelease\lib\Net45\Microsoft.Practices.Unity.Interception.Configuration.dll</HintPath>
+    <Reference Include="Microsoft.Practices.Unity.Interception.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.Configuration.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
+    <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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
+    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/Aspects/Wcf/Properties/AssemblyInfo.cs b/Aspects/Wcf/Properties/AssemblyInfo.cs
index 0aab879..ef056c1 100644
--- a/Aspects/Wcf/Properties/AssemblyInfo.cs
+++ b/Aspects/Wcf/Properties/AssemblyInfo.cs
@@ -2,14 +2,15 @@
 
 [assembly: AssemblyTitle("Wcf")]
 [assembly: AssemblyDescription("A set of classes and generics simplifying the initial configuration work of creating WCF services.")]
-[assembly: AssemblyVersion("0.9.1")]
-[assembly: AssemblyFileVersion("0.9.1")]
-[assembly: AssemblyInformationalVersion("0.9.1")]
+
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]
+[assembly: AssemblyInformationalVersion("1.0.1")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "vm.Aspects.Wcf.Test, " +
-    "PublicKey=00240000048000009400000006020000002400005253413100040000010001004b151837822bdb"+
-              "b18296865918eb87882f2528630f673f17668fff4c6e51b8563b1985ec7ec5e6877611068c595a"+
-              "e297a32e3bf9d71a5b479a59705f0688e91f086f20fa0772135ee08f693d5310ce18761d4f71ed"+
-              "cb2486ec0910dd7361decc2184708dcbd5211feb361f45b024a45b91c28d7bed158671053085b8"+
+    "PublicKey=00240000048000009400000006020000002400005253413100040000010001004b151837822bdb" +
+              "b18296865918eb87882f2528630f673f17668fff4c6e51b8563b1985ec7ec5e6877611068c595a" +
+              "e297a32e3bf9d71a5b479a59705f0688e91f086f20fa0772135ee08f693d5310ce18761d4f71ed" +
+              "cb2486ec0910dd7361decc2184708dcbd5211feb361f45b024a45b91c28d7bed158671053085b8" +
               "fae385c1")]
diff --git a/Aspects/Wcf/packages.config b/Aspects/Wcf/packages.config
index f629eb6..8a75202 100644
--- a/Aspects/Wcf/packages.config
+++ b/Aspects/Wcf/packages.config
@@ -9,6 +9,6 @@
   <package id="EnterpriseLibrary.Logging" version="6.0.1304.0" targetFramework="net46" />
   <package id="EnterpriseLibrary.PolicyInjection" version="6.0.1304.0" targetFramework="net46" />
   <package id="EnterpriseLibrary.Validation" version="6.0.1304.0" targetFramework="net46" />
-  <package id="Unity" version="3.5.1405-prerelease" targetFramework="net46" />
-  <package id="Unity.Interception" version="3.5.1405-prerelease" targetFramework="net46" />
+  <package id="Unity" version="4.0.1" targetFramework="net46" />
+  <package id="Unity.Interception" version="4.0.1" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/Aspects/Wcf/vm.Aspects.Wcf.csproj b/Aspects/Wcf/vm.Aspects.Wcf.csproj
index c323df4..86964f5 100644
--- a/Aspects/Wcf/vm.Aspects.Wcf.csproj
+++ b/Aspects/Wcf/vm.Aspects.Wcf.csproj
@@ -214,24 +214,24 @@
       <HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Configuration, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.Configuration.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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Interception, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.Interception.3.5.1405-prerelease\lib\Net45\Microsoft.Practices.Unity.Interception.dll</HintPath>
+    <Reference Include="Microsoft.Practices.Unity.Interception, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Interception.Configuration, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.Interception.3.5.1405-prerelease\lib\Net45\Microsoft.Practices.Unity.Interception.Configuration.dll</HintPath>
+    <Reference Include="Microsoft.Practices.Unity.Interception.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.Configuration.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
+    <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>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/Aspects/app.config b/Aspects/app.config
index a2b926f..2a9cbaa 100644
--- a/Aspects/app.config
+++ b/Aspects/app.config
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0"/>
+        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.Unity" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0"/>
+        <assemblyIdentity name="Microsoft.Practices.Unity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.Unity.Interception" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0"/>
+        <assemblyIdentity name="Microsoft.Practices.Unity.Interception" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.Unity.Configuration" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0"/>
+        <assemblyIdentity name="Microsoft.Practices.Unity.Configuration" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>
diff --git a/Aspects/packages.config b/Aspects/packages.config
index 84de40b..63f3878 100644
--- a/Aspects/packages.config
+++ b/Aspects/packages.config
@@ -7,6 +7,6 @@
   <package id="EnterpriseLibrary.Logging" version="6.0.1304.0" targetFramework="net46" />
   <package id="EnterpriseLibrary.PolicyInjection" version="6.0.1304.0" targetFramework="net46" />
   <package id="EnterpriseLibrary.Validation" version="6.0.1304.0" targetFramework="net46" />
-  <package id="Unity" version="3.5.1405-prerelease" targetFramework="net46" />
-  <package id="Unity.Interception" version="3.5.1405-prerelease" targetFramework="net46" />
+  <package id="Unity" version="4.0.1" targetFramework="net46" />
+  <package id="Unity.Interception" version="4.0.1" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/Aspects/vm.Aspects.csproj b/Aspects/vm.Aspects.csproj
index 39986cc..8e65c46 100644
--- a/Aspects/vm.Aspects.csproj
+++ b/Aspects/vm.Aspects.csproj
@@ -210,24 +210,24 @@
       <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Configuration, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.Configuration.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>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Interception, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.Interception.3.5.1405-prerelease\lib\Net45\Microsoft.Practices.Unity.Interception.dll</HintPath>
+    <Reference Include="Microsoft.Practices.Unity.Interception, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Interception.Configuration, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.Interception.3.5.1405-prerelease\lib\Net45\Microsoft.Practices.Unity.Interception.Configuration.dll</HintPath>
+    <Reference Include="Microsoft.Practices.Unity.Interception.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\packages\Unity.Interception.4.0.1\lib\Net45\Microsoft.Practices.Unity.Interception.Configuration.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=3.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unity.3.5.1405-prerelease\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
+    <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>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />