Update Castle Core dependency to 4.2.0

castleproject · Sep 28, 2017 · 50f7862 · 50f7862
2 parents a4a55a2 + fb85548
commit 50f7862
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ Bugfixes:
 - Fix warnings regarding non-existent System.ComponentModel.TypeConverter NuGet package by updating minimum Castle Core version to 4.1.0 (#321)
 - Fix disposal of faulted WCF client channels (@jberezanski, #322)
 - Fix binding errors because assembly version had too much detail, assembly version is now x.0.0.0 (@fir3pho3nixx, #329)
-- Update Castle Core to 4.1.1 (TODO: update again) to resolve assembly version problems because Castle Core also had too much detail
+- Update Castle Core to 4.2.0 to resolve assembly version problems because Castle Core also had too much detail
 - Explicit package versioning applied within solution to avoid maligned NuGet upgrades for lock step versioned packages. (@fir3pho3nixx, Core/#292)
 - Fixed open generic handler state issues where wrong constructor gets chosen for open generic service types. (@fir3pho3nixx, #136)
 - Fixed typed factory out of order disposal (@jnm2, #344)

diff --git a/src/Castle.Facilities.Logging/LoggingFacility.cs b/src/Castle.Facilities.Logging/LoggingFacility.cs
@@ -35,22 +35,22 @@ public class LoggingFacility : AbstractFacility
 #if CASTLE_SERVICES_LOGGING   //Castle.Services.Logging.Log4netIntegration and Castle.Services.Logging.NLogIntegration are not available for .NET Standard
 		private static readonly String ExtendedLog4NetLoggerFactoryTypeName =
 			"Castle.Services.Logging.Log4netIntegration.ExtendedLog4netFactory," +
-			"Castle.Services.Logging.Log4netIntegration,Version=4.1.1.0, Culture=neutral," +
+			"Castle.Services.Logging.Log4netIntegration,Version=4.0.0.0, Culture=neutral," +
 			"PublicKeyToken=407dd0808d44fbdc";
 
 		private static readonly String ExtendedNLogLoggerFactoryTypeName =
 			"Castle.Services.Logging.NLogIntegration.ExtendedNLogFactory," +
-			"Castle.Services.Logging.NLogIntegration,Version=4.1.1.0, Culture=neutral," +
+			"Castle.Services.Logging.NLogIntegration,Version=4.0.0.0, Culture=neutral," +
 			"PublicKeyToken=407dd0808d44fbdc";
 
 		private static readonly String Log4NetLoggerFactoryTypeName =
 			"Castle.Services.Logging.Log4netIntegration.Log4netFactory," +
-			"Castle.Services.Logging.Log4netIntegration,Version=4.1.1.0, Culture=neutral," +
+			"Castle.Services.Logging.Log4netIntegration,Version=4.0.0.0, Culture=neutral," +
 			"PublicKeyToken=407dd0808d44fbdc";
 
 		private static readonly String NLogLoggerFactoryTypeName =
 			"Castle.Services.Logging.NLogIntegration.NLogFactory," +
-			"Castle.Services.Logging.NLogIntegration,Version=4.1.1.0, Culture=neutral," +
+			"Castle.Services.Logging.NLogIntegration,Version=4.0.0.0, Culture=neutral," +
 			"PublicKeyToken=407dd0808d44fbdc";
 #endif
 		private readonly string customLoggerFactoryTypeName;

diff --git a/src/Castle.Facilities.WcfIntegration.Demo/Castle.Facilities.WcfIntegration.Demo.csproj b/src/Castle.Facilities.WcfIntegration.Demo/Castle.Facilities.WcfIntegration.Demo.csproj
@@ -11,8 +11,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Castle.Core" Version="4.1.1" />
-		<PackageReference Include="Castle.Core-log4net" Version="4.1.1" />
+		<PackageReference Include="Castle.Core" Version="4.2.0" />
+		<PackageReference Include="Castle.Core-log4net" Version="4.2.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Castle.Facilities.WcfIntegration.Tests/Castle.Facilities.WcfIntegration.Tests.csproj b/src/Castle.Facilities.WcfIntegration.Tests/Castle.Facilities.WcfIntegration.Tests.csproj
@@ -12,8 +12,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Castle.Core" Version="4.1.1" />
-		<PackageReference Include="Castle.Core-log4net" Version="4.1.1" />
+		<PackageReference Include="Castle.Core" Version="4.2.0" />
+		<PackageReference Include="Castle.Core-log4net" Version="4.2.0" />
 		<PackageReference Include="NUnit" Version="3.6.1" />
 		<PackageReference Include="NUnit.Console" Version="3.6.1" />
 	</ItemGroup>

diff --git a/src/Castle.Facilities.WcfIntegration/WcfInvocation.cs b/src/Castle.Facilities.WcfIntegration/WcfInvocation.cs
@@ -1,4 +1,4 @@
-// Copyright 2004-2011 Castle Project - http://www.castleproject.org/
+// Copyright 2004-2017 Castle Project - http://www.castleproject.org/
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -64,11 +64,19 @@ public WcfInvocation Refresh(bool force)
 		{
 			var oldChannel = channelHolder.Channel;
 			var channel = channelHolder.RefreshChannel(force);
-			if ((channel != oldChannel) && (invocation is IChangeProxyTarget))
+			if ((channel != oldChannel))
 			{
-				var changeTarget = (IChangeProxyTarget)invocation;
-				changeTarget.ChangeInvocationTarget(channel);
-				changeTarget.ChangeProxyTarget(channel);
+				var changeInvocation = invocation as IChangeProxyTarget;
+				if (changeInvocation != null)
+				{
+					changeInvocation.ChangeInvocationTarget(channel);
+				}
+
+				var changeProxy = invocation.Proxy as IProxyTargetAccessor;
+				if (changeProxy != null)
+				{
+					changeProxy.DynProxySetTarget(channel);
+				}
 			}
 			return this;
 		}

diff --git a/src/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj b/src/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj
@@ -58,9 +58,9 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='net45'">
-		<PackageReference Include="Castle.Core" Version="4.1.1" />
-		<PackageReference Include="Castle.Core-log4net" Version="4.1.1" />
-		<PackageReference Include="Castle.Core-NLog" Version="4.1.1" />
+		<PackageReference Include="Castle.Core" Version="4.2.0" />
+		<PackageReference Include="Castle.Core-log4net" Version="4.2.0" />
+		<PackageReference Include="Castle.Core-NLog" Version="4.2.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">

diff --git a/src/Castle.Windsor/Castle.Windsor.csproj b/src/Castle.Windsor/Castle.Windsor.csproj
@@ -23,7 +23,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Castle.Core" Version="4.1.1" />
+		<PackageReference Include="Castle.Core" Version="4.2.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='net45'">