From 5d5f301369324ebddcd6354b1d0f2c47c5219e86 Mon Sep 17 00:00:00 2001
From: Adam Connelly <adam.rpconnelly@gmail.com>
Date: Thu, 8 Mar 2018 20:03:47 +0000
Subject: [PATCH] Updating to support Castle 4.0.0

Fixes #3
---
 .../AppConfigFacility.Azure.csproj              | 17 ++++++++++++-----
 .../AppConfigFacility.Azure.nuspec              |  5 +++--
 AppConfigFacility.Azure/packages.config         |  4 ++--
 AppConfigFacility/AppConfigFacility.csproj      | 14 +++++++++-----
 AppConfigFacility/AppConfigFacility.nuspec      |  5 +++--
 AppConfigFacility/packages.config               |  4 ++--
 SolutionInfo.cs                                 |  4 ++--
 .../AppConfigFacility.Azure.Tests.csproj        | 15 +++++++++------
 .../packages.config                             |  4 ++--
 Tests/AppConfigFacility.Tests/App.config        | 14 +++++++-------
 .../AppConfigFacility.Tests.csproj              | 16 +++++++++++-----
 Tests/AppConfigFacility.Tests/packages.config   |  4 ++--
 12 files changed, 64 insertions(+), 42 deletions(-)

diff --git a/AppConfigFacility.Azure/AppConfigFacility.Azure.csproj b/AppConfigFacility.Azure/AppConfigFacility.Azure.csproj
index 391b46a..ce6959a 100644
--- a/AppConfigFacility.Azure/AppConfigFacility.Azure.csproj
+++ b/AppConfigFacility.Azure/AppConfigFacility.Azure.csproj
@@ -35,18 +35,23 @@
     <DocumentationFile>bin\Release\AppConfigFacility.Azure.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core">
-      <HintPath>..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Castle.Windsor">
-      <HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
+    <Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.1\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -62,7 +67,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="AppConfigFacility.Azure.nuspec" />
   </ItemGroup>
   <ItemGroup>
diff --git a/AppConfigFacility.Azure/AppConfigFacility.Azure.nuspec b/AppConfigFacility.Azure/AppConfigFacility.Azure.nuspec
index c225b37..6fb1760 100644
--- a/AppConfigFacility.Azure/AppConfigFacility.Azure.nuspec
+++ b/AppConfigFacility.Azure/AppConfigFacility.Azure.nuspec
@@ -8,11 +8,12 @@
 		<language>en</language>
 		<projectUrl>https://github.com/adamconnelly/WindsorAppConfigFacility</projectUrl>
 		<licenseUrl>https://raw.githubusercontent.com/adamconnelly/WindsorAppConfigFacility/master/LICENSE.txt</licenseUrl>
+	  <releaseNotes>Updated to support Castle 4.0.0 and above. No-longer supports Castle 3.*.</releaseNotes>
 
 		<dependencies>
       <dependency id="WindsorAppConfigFacility" version="$version$" />
-			<dependency id="Castle.Core" version="3.3.0" />
-  		<dependency id="Castle.Windsor" version="3.3.0" />
+		  <dependency id="Castle.Core" version="4.0.0" />
+		  <dependency id="Castle.Windsor" version="4.0.0" />
   		<dependency id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.1" />
 		</dependencies>
 	</metadata>
diff --git a/AppConfigFacility.Azure/packages.config b/AppConfigFacility.Azure/packages.config
index 9cb1bd2..aa4534f 100644
--- a/AppConfigFacility.Azure/packages.config
+++ b/AppConfigFacility.Azure/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="3.3.0" targetFramework="net45" />
-  <package id="Castle.Windsor" version="3.3.0" targetFramework="net45" />
+  <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
+  <package id="Castle.Windsor" version="4.0.0" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/AppConfigFacility/AppConfigFacility.csproj b/AppConfigFacility/AppConfigFacility.csproj
index d263bba..ca1fa99 100644
--- a/AppConfigFacility/AppConfigFacility.csproj
+++ b/AppConfigFacility/AppConfigFacility.csproj
@@ -35,15 +35,19 @@
     <DocumentationFile>bin\Release\AppConfigFacility.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core">
-      <HintPath>..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Castle.Windsor">
-      <HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
+    <Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -71,8 +75,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="AppConfigFacility.nuspec" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
diff --git a/AppConfigFacility/AppConfigFacility.nuspec b/AppConfigFacility/AppConfigFacility.nuspec
index 1f9b1f2..3d8d1d6 100644
--- a/AppConfigFacility/AppConfigFacility.nuspec
+++ b/AppConfigFacility/AppConfigFacility.nuspec
@@ -8,10 +8,11 @@
 		<language>en</language>
 		<projectUrl>https://github.com/adamconnelly/WindsorAppConfigFacility</projectUrl>
 		<licenseUrl>https://raw.githubusercontent.com/adamconnelly/WindsorAppConfigFacility/master/LICENSE.txt</licenseUrl>
+    <releaseNotes>Updated to support Castle 4.0.0 and above. No-longer supports Castle 3.*.</releaseNotes>
 
 		<dependencies>
-			<dependency id="Castle.Core" version="3.3.0" />
-  			<dependency id="Castle.Windsor" version="3.3.0" />
+			<dependency id="Castle.Core" version="4.0.0" />
+  	  <dependency id="Castle.Windsor" version="4.0.0" />
 		</dependencies>
 	</metadata>
 
diff --git a/AppConfigFacility/packages.config b/AppConfigFacility/packages.config
index 010612f..6c8d760 100644
--- a/AppConfigFacility/packages.config
+++ b/AppConfigFacility/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="3.3.0" targetFramework="net45" />
-  <package id="Castle.Windsor" version="3.3.0" targetFramework="net45" />
+  <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
+  <package id="Castle.Windsor" version="4.0.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/SolutionInfo.cs b/SolutionInfo.cs
index 76bd5b1..329e547 100644
--- a/SolutionInfo.cs
+++ b/SolutionInfo.cs
@@ -8,8 +8,8 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyVersion("0.2.0.0")]
-[assembly: System.Reflection.AssemblyFileVersion("0.2.0.0")]
+[assembly: System.Reflection.AssemblyVersion("1.0.0.0")]
+[assembly: System.Reflection.AssemblyFileVersion("1.0.0.0")]
 [assembly: System.Reflection.AssemblyCopyright("Copyright (c) Adam Connelly, 2014")]
 
 
diff --git a/Tests/AppConfigFacility.Azure.Tests/AppConfigFacility.Azure.Tests.csproj b/Tests/AppConfigFacility.Azure.Tests/AppConfigFacility.Azure.Tests.csproj
index b9d5633..90253b3 100644
--- a/Tests/AppConfigFacility.Azure.Tests/AppConfigFacility.Azure.Tests.csproj
+++ b/Tests/AppConfigFacility.Azure.Tests/AppConfigFacility.Azure.Tests.csproj
@@ -32,13 +32,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
+    <Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.1\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
@@ -49,7 +49,10 @@
       <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/Tests/AppConfigFacility.Azure.Tests/packages.config b/Tests/AppConfigFacility.Azure.Tests/packages.config
index 4259e98..2c8ba69 100644
--- a/Tests/AppConfigFacility.Azure.Tests/packages.config
+++ b/Tests/AppConfigFacility.Azure.Tests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="3.3.0" targetFramework="net45" />
-  <package id="Castle.Windsor" version="3.3.0" targetFramework="net45" />
+  <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
+  <package id="Castle.Windsor" version="4.0.0" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.1" targetFramework="net45" />
   <package id="NUnit" version="2.6.3" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Tests/AppConfigFacility.Tests/App.config b/Tests/AppConfigFacility.Tests/App.config
index 16553e4..329d5bd 100644
--- a/Tests/AppConfigFacility.Tests/App.config
+++ b/Tests/AppConfigFacility.Tests/App.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
-    <add key="StringSetting" value="StringValue"/>
-    <add key="IntSetting" value="1234"/>
-    <add key="EnumSetting" value="Value2"/>
-    <add key="BoolSetting" value="true"/>
-    <add key="UriSetting" value="http://localhost/SomePath"/>
-    <add key="Search:Url" value="http://www.search.com/q="/>
+    <add key="StringSetting" value="StringValue" />
+    <add key="IntSetting" value="1234" />
+    <add key="EnumSetting" value="Value2" />
+    <add key="BoolSetting" value="true" />
+    <add key="UriSetting" value="http://localhost/SomePath" />
+    <add key="Search:Url" value="http://www.search.com/q=" />
   </appSettings>
 </configuration>
\ No newline at end of file
diff --git a/Tests/AppConfigFacility.Tests/AppConfigFacility.Tests.csproj b/Tests/AppConfigFacility.Tests/AppConfigFacility.Tests.csproj
index b878484..e16328e 100644
--- a/Tests/AppConfigFacility.Tests/AppConfigFacility.Tests.csproj
+++ b/Tests/AppConfigFacility.Tests/AppConfigFacility.Tests.csproj
@@ -32,11 +32,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core">
-      <HintPath>..\..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Castle.Windsor">
-      <HintPath>..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
+    <Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Windsor.4.0.0\lib\net45\Castle.Windsor.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Moq">
       <HintPath>..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
@@ -47,6 +49,8 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -71,7 +75,9 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\AppConfigFacility\AppConfigFacility.csproj">
diff --git a/Tests/AppConfigFacility.Tests/packages.config b/Tests/AppConfigFacility.Tests/packages.config
index 3a148ac..ed214a1 100644
--- a/Tests/AppConfigFacility.Tests/packages.config
+++ b/Tests/AppConfigFacility.Tests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="3.3.0" targetFramework="net45" />
-  <package id="Castle.Windsor" version="3.3.0" targetFramework="net45" />
+  <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
+  <package id="Castle.Windsor" version="4.0.0" targetFramework="net45" />
   <package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
   <package id="MSBuildTasks" version="1.4.0.78" targetFramework="net45" />
   <package id="NUnit" version="2.6.3" targetFramework="net45" />