diff --git a/Aspects/Linq/Expressions/Serialization/NuGet/ExpressionSerialization.nuspec b/Aspects/Linq/Expressions/Serialization/NuGet/ExpressionSerialization.nuspec index 027d134..4aa02a7 100644 --- a/Aspects/Linq/Expressions/Serialization/NuGet/ExpressionSerialization.nuspec +++ b/Aspects/Linq/Expressions/Serialization/NuGet/ExpressionSerialization.nuspec @@ -2,7 +2,7 @@ AspectExpressionSerialization - 1.0.35 + 1.0.36 Val Melamed Val Melamed diff --git a/Aspects/Linq/Expressions/Serialization/Properties/AssemblyInfo.cs b/Aspects/Linq/Expressions/Serialization/Properties/AssemblyInfo.cs index 0a63f12..1f2b241 100644 --- a/Aspects/Linq/Expressions/Serialization/Properties/AssemblyInfo.cs +++ b/Aspects/Linq/Expressions/Serialization/Properties/AssemblyInfo.cs @@ -4,9 +4,9 @@ [assembly: AssemblyTitle("vm.Aspects.Linq.Expressions.Serialization")] [assembly: AssemblyDescription("Serializes and deserializes LINQ expression trees to and from XML documents.")] -[assembly: AssemblyVersion("1.0.35")] -[assembly: AssemblyFileVersion("1.0.35")] -[assembly: AssemblyInformationalVersion("1.0.35")] +[assembly: AssemblyVersion("1.0.36")] +[assembly: AssemblyFileVersion("1.0.36")] +[assembly: AssemblyInformationalVersion("1.0.36")] [assembly: InternalsVisibleTo( "vm.Aspects.Linq.Expressions.Serialization.Test, " + diff --git a/Aspects/Model/Properties/AssemblyInfo.cs b/Aspects/Model/Properties/AssemblyInfo.cs index 494c7a8..14a47bf 100644 --- a/Aspects/Model/Properties/AssemblyInfo.cs +++ b/Aspects/Model/Properties/AssemblyInfo.cs @@ -3,9 +3,9 @@ [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("1.0.35")] -[assembly: AssemblyFileVersion("1.0.35")] -[assembly: AssemblyInformationalVersion("1.0.35")] +[assembly: AssemblyVersion("1.0.36")] +[assembly: AssemblyFileVersion("1.0.36")] +[assembly: AssemblyInformationalVersion("1.0.36")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo( "vm.Aspects.Model.Tests, " + diff --git a/Aspects/NuGet/vm.Aspects.nuspec b/Aspects/NuGet/vm.Aspects.nuspec index b86cf65..f61c98f 100644 --- a/Aspects/NuGet/vm.Aspects.nuspec +++ b/Aspects/NuGet/vm.Aspects.nuspec @@ -2,7 +2,7 @@ vm.Aspects - 1.0.35-beta + 1.0.36-beta Val Melamed Val Melamed @@ -12,8 +12,8 @@ A set of classes, utilities, etc. addressing various common cross-cutting concerns or extending existing similar libraries like Enterprise Library, Unity, etc. - * Reordered the parameters of the HostFactory classes' constructors. - * Minor cosmetic changes. + * Grouped all behaviors in the vm.Aspects.Wcf.Behaviors namespace. + * Fixed a bug in the ExceptionShieldingBehavior where the ExceptionManager was not instantiated. https://github.com/vmelamed/vm/blob/master/LICENSE https://github.com/vmelamed/vm/tree/master/Aspects diff --git a/Aspects/Parsers/Properties/AssemblyInfo.cs b/Aspects/Parsers/Properties/AssemblyInfo.cs index 643a5f4..59ef6ff 100644 --- a/Aspects/Parsers/Properties/AssemblyInfo.cs +++ b/Aspects/Parsers/Properties/AssemblyInfo.cs @@ -6,9 +6,9 @@ [assembly: AssemblyTitle("vm.Aspects.Parser")] [assembly: AssemblyDescription("Text parsing readers, e.g. CSV/TSV reader.")] -[assembly: AssemblyVersion("1.0.35")] -[assembly: AssemblyFileVersion("1.0.35")] -[assembly: AssemblyInformationalVersion("1.0.35")] +[assembly: AssemblyVersion("1.0.36")] +[assembly: AssemblyFileVersion("1.0.36")] +[assembly: AssemblyInformationalVersion("1.0.36")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo( "vm.Aspects.Parsers.Tests, " + diff --git a/Aspects/Properties/AssemblyInfo.cs b/Aspects/Properties/AssemblyInfo.cs index 2ad2784..2d66343 100644 --- a/Aspects/Properties/AssemblyInfo.cs +++ b/Aspects/Properties/AssemblyInfo.cs @@ -2,9 +2,9 @@ [assembly: AssemblyTitle("vm.Aspects")] [assembly: AssemblyDescription("A set of classes addressing various common cross-cutting concerns.")] -[assembly: AssemblyVersion("1.0.35")] -[assembly: AssemblyFileVersion("1.0.35")] -[assembly: AssemblyInformationalVersion("1.0.35")] +[assembly: AssemblyVersion("1.0.36")] +[assembly: AssemblyFileVersion("1.0.36")] +[assembly: AssemblyInformationalVersion("1.0.36")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo( diff --git a/Aspects/Wcf/DIBehavior/DIBehaviorAttribute.cs b/Aspects/Wcf/Behaviors/DIBehaviorAttribute.cs similarity index 99% rename from Aspects/Wcf/DIBehavior/DIBehaviorAttribute.cs rename to Aspects/Wcf/Behaviors/DIBehaviorAttribute.cs index 8f2713a..4bff73f 100644 --- a/Aspects/Wcf/DIBehavior/DIBehaviorAttribute.cs +++ b/Aspects/Wcf/Behaviors/DIBehaviorAttribute.cs @@ -4,7 +4,7 @@ using System.ServiceModel.Description; using System.ServiceModel.Dispatcher; -namespace vm.Aspects.Wcf.DIBehavior +namespace vm.Aspects.Wcf.Behaviors { /// /// Class DIBehaviorAttribute. This class cannot be inherited. Should be applied to WCF service classes definitions that should not be created diff --git a/Aspects/Wcf/DIBehavior/DIBehaviorExtensionElement.cs b/Aspects/Wcf/Behaviors/DIBehaviorExtensionElement.cs similarity index 97% rename from Aspects/Wcf/DIBehavior/DIBehaviorExtensionElement.cs rename to Aspects/Wcf/Behaviors/DIBehaviorExtensionElement.cs index c400fa9..42261ac 100644 --- a/Aspects/Wcf/DIBehavior/DIBehaviorExtensionElement.cs +++ b/Aspects/Wcf/Behaviors/DIBehaviorExtensionElement.cs @@ -2,7 +2,7 @@ using System.Configuration; using System.ServiceModel.Configuration; -namespace vm.Aspects.Wcf.DIBehavior +namespace vm.Aspects.Wcf.Behaviors { /// /// Class DIBehaviorExtensionElement. Represents a configuration element that contains DI endpoint behavior. diff --git a/Aspects/Wcf/DIBehavior/DIEndpointBehavior.cs b/Aspects/Wcf/Behaviors/DIEndpointBehavior.cs similarity index 98% rename from Aspects/Wcf/DIBehavior/DIEndpointBehavior.cs rename to Aspects/Wcf/Behaviors/DIEndpointBehavior.cs index d44e0d9..7f60702 100644 --- a/Aspects/Wcf/DIBehavior/DIEndpointBehavior.cs +++ b/Aspects/Wcf/Behaviors/DIEndpointBehavior.cs @@ -3,7 +3,7 @@ using System.ServiceModel.Description; using System.ServiceModel.Dispatcher; -namespace vm.Aspects.Wcf.DIBehavior +namespace vm.Aspects.Wcf.Behaviors { /// /// Class DIEndpointBehavior. This class cannot be inherited. Endpoint behavior which supplies the instance provider diff --git a/Aspects/Wcf/DIBehavior/DIInstanceProvider.cs b/Aspects/Wcf/Behaviors/DIInstanceProvider.cs similarity index 99% rename from Aspects/Wcf/DIBehavior/DIInstanceProvider.cs rename to Aspects/Wcf/Behaviors/DIInstanceProvider.cs index 95ec8b1..edc476b 100644 --- a/Aspects/Wcf/DIBehavior/DIInstanceProvider.cs +++ b/Aspects/Wcf/Behaviors/DIInstanceProvider.cs @@ -4,7 +4,7 @@ using System.ServiceModel.Dispatcher; using Microsoft.Practices.ServiceLocation; -namespace vm.Aspects.Wcf.DIBehavior +namespace vm.Aspects.Wcf.Behaviors { /// /// Class DIInstanceProvider. This class cannot be inherited. Instantiates the service by resolving it from the DI container represented by the service locator. diff --git a/Aspects/Wcf/ExceptionShieldingBehavior/ExceptionShieldingAttribute.cs b/Aspects/Wcf/Behaviors/ExceptionShieldingAttribute.cs similarity index 99% rename from Aspects/Wcf/ExceptionShieldingBehavior/ExceptionShieldingAttribute.cs rename to Aspects/Wcf/Behaviors/ExceptionShieldingAttribute.cs index b7191ff..bd8511e 100644 --- a/Aspects/Wcf/ExceptionShieldingBehavior/ExceptionShieldingAttribute.cs +++ b/Aspects/Wcf/Behaviors/ExceptionShieldingAttribute.cs @@ -21,7 +21,7 @@ using System.ServiceModel.Dispatcher; using Microsoft.Practices.EnterpriseLibrary.ExceptionHandling.WCF; -namespace vm.Aspects.Wcf.ExceptionShieldingBehavior +namespace vm.Aspects.Wcf.Behaviors { /// /// Indicates that an implementation service class will use exception shielding. diff --git a/Aspects/Wcf/ExceptionShieldingBehavior/ExceptionShieldingBehavior.cs b/Aspects/Wcf/Behaviors/ExceptionShieldingBehavior.cs similarity index 99% rename from Aspects/Wcf/ExceptionShieldingBehavior/ExceptionShieldingBehavior.cs rename to Aspects/Wcf/Behaviors/ExceptionShieldingBehavior.cs index 2c2c074..37ba59c 100644 --- a/Aspects/Wcf/ExceptionShieldingBehavior/ExceptionShieldingBehavior.cs +++ b/Aspects/Wcf/Behaviors/ExceptionShieldingBehavior.cs @@ -20,7 +20,7 @@ using System.ServiceModel.Dispatcher; using Microsoft.Practices.EnterpriseLibrary.ExceptionHandling.WCF; -namespace vm.Aspects.Wcf.ExceptionShieldingBehavior +namespace vm.Aspects.Wcf.Behaviors { /// /// The behavior class that set up the diff --git a/Aspects/Wcf/ExceptionShieldingBehavior/ExceptionShieldingErrorHandler.cs b/Aspects/Wcf/Behaviors/ExceptionShieldingErrorHandler.cs similarity index 98% rename from Aspects/Wcf/ExceptionShieldingBehavior/ExceptionShieldingErrorHandler.cs rename to Aspects/Wcf/Behaviors/ExceptionShieldingErrorHandler.cs index 13175a3..38afe99 100644 --- a/Aspects/Wcf/ExceptionShieldingBehavior/ExceptionShieldingErrorHandler.cs +++ b/Aspects/Wcf/Behaviors/ExceptionShieldingErrorHandler.cs @@ -26,9 +26,10 @@ using Microsoft.Practices.EnterpriseLibrary.ExceptionHandling; using Microsoft.Practices.EnterpriseLibrary.ExceptionHandling.WCF; using Microsoft.Practices.EnterpriseLibrary.Logging; +using vm.Aspects.Facilities; using vm.Aspects.Wcf.FaultContracts; -namespace vm.Aspects.Wcf.ExceptionShieldingBehavior +namespace vm.Aspects.Wcf.Behaviors { /// /// The error handler class that implements the exception shielding logic. @@ -111,7 +112,7 @@ public void ProvideFault( Exception exceptionToThrow; // Execute the EHAB policy pipeline - if (ExceptionPolicy.HandleException(error, ExceptionPolicyName, out exceptionToThrow)) + if (Facility.ExceptionManager.HandleException(error, ExceptionPolicyName, out exceptionToThrow)) { var wrapper = exceptionToThrow as FaultContractWrapperException; @@ -131,7 +132,7 @@ public void ProvideFault( // defined in the specified policy so treat it as unhandled if not in the default policy // run first the default exception policy if (!ExceptionPolicyName.Equals(ExceptionShielding.DefaultExceptionPolicy, StringComparison.OrdinalIgnoreCase) && - ExceptionPolicy.HandleException(error, ExceptionShielding.DefaultExceptionPolicy, out exceptionToThrow)) + Facility.ExceptionManager.HandleException(error, ExceptionShielding.DefaultExceptionPolicy, out exceptionToThrow)) { var wrapper = exceptionToThrow as FaultContractWrapperException; diff --git a/Aspects/Wcf/ValidationBehavior/ValidatingBehavior.cs b/Aspects/Wcf/Behaviors/ValidatingBehavior.cs similarity index 99% rename from Aspects/Wcf/ValidationBehavior/ValidatingBehavior.cs rename to Aspects/Wcf/Behaviors/ValidatingBehavior.cs index d1b4e65..22f5ffd 100644 --- a/Aspects/Wcf/ValidationBehavior/ValidatingBehavior.cs +++ b/Aspects/Wcf/Behaviors/ValidatingBehavior.cs @@ -11,7 +11,7 @@ using vm.Aspects.Wcf.FaultContracts; using vm.Aspects.Wcf.Properties; -namespace vm.Aspects.Wcf.ValidationBehavior +namespace vm.Aspects.Wcf.Behaviors { /// /// The behavior class that set up the validation contract behavior diff --git a/Aspects/Wcf/ValidationBehavior/ValidatingBehaviorAttribute.cs b/Aspects/Wcf/Behaviors/ValidatingBehaviorAttribute.cs similarity index 99% rename from Aspects/Wcf/ValidationBehavior/ValidatingBehaviorAttribute.cs rename to Aspects/Wcf/Behaviors/ValidatingBehaviorAttribute.cs index ad37875..d9f5052 100644 --- a/Aspects/Wcf/ValidationBehavior/ValidatingBehaviorAttribute.cs +++ b/Aspects/Wcf/Behaviors/ValidatingBehaviorAttribute.cs @@ -3,7 +3,7 @@ using System.ServiceModel.Description; using System.ServiceModel.Dispatcher; -namespace vm.Aspects.Wcf.ValidationBehavior +namespace vm.Aspects.Wcf.Behaviors { /// /// Indicates that an implementation service class will use message validation constraints. diff --git a/Aspects/Wcf/ValidationBehavior/ValidatingBindingElement.cs b/Aspects/Wcf/Behaviors/ValidatingBindingElement.cs similarity index 96% rename from Aspects/Wcf/ValidationBehavior/ValidatingBindingElement.cs rename to Aspects/Wcf/Behaviors/ValidatingBindingElement.cs index 7d95f8f..647b061 100644 --- a/Aspects/Wcf/ValidationBehavior/ValidatingBindingElement.cs +++ b/Aspects/Wcf/Behaviors/ValidatingBindingElement.cs @@ -2,7 +2,7 @@ using System.ServiceModel.Channels; using System.Xml; -namespace vm.Aspects.Wcf.ValidationBehavior +namespace vm.Aspects.Wcf.Behaviors { /// /// Represents the binding element that contains the message validation policy. diff --git a/Aspects/Wcf/ValidationBehavior/ValidatingBindingElementExtension.cs b/Aspects/Wcf/Behaviors/ValidatingBindingElementExtension.cs similarity index 96% rename from Aspects/Wcf/ValidationBehavior/ValidatingBindingElementExtension.cs rename to Aspects/Wcf/Behaviors/ValidatingBindingElementExtension.cs index ad3ca45..4beb556 100644 --- a/Aspects/Wcf/ValidationBehavior/ValidatingBindingElementExtension.cs +++ b/Aspects/Wcf/Behaviors/ValidatingBindingElementExtension.cs @@ -3,7 +3,7 @@ using System.ServiceModel.Configuration; using System.Diagnostics.Contracts; -namespace vm.Aspects.Wcf.ValidationBehavior +namespace vm.Aspects.Wcf.Behaviors { /// /// Represents a configuration element that specifies a message validation. diff --git a/Aspects/Wcf/ValidationBehavior/ValidatingParameterInspector.cs b/Aspects/Wcf/Behaviors/ValidatingParameterInspector.cs similarity index 99% rename from Aspects/Wcf/ValidationBehavior/ValidatingParameterInspector.cs rename to Aspects/Wcf/Behaviors/ValidatingParameterInspector.cs index 6b63bb6..8ced922 100644 --- a/Aspects/Wcf/ValidationBehavior/ValidatingParameterInspector.cs +++ b/Aspects/Wcf/Behaviors/ValidatingParameterInspector.cs @@ -13,7 +13,7 @@ using vm.Aspects.Facilities; using vm.Aspects.Wcf.FaultContracts; -namespace vm.Aspects.Wcf.ValidationBehavior +namespace vm.Aspects.Wcf.Behaviors { /// /// Class ValidatingParameterInspector. Implements using the diff --git a/Aspects/Wcf/Bindings/BindingConfigurator.cs b/Aspects/Wcf/Bindings/BindingConfigurator.cs index 7edf028..c673b4c 100644 --- a/Aspects/Wcf/Bindings/BindingConfigurator.cs +++ b/Aspects/Wcf/Bindings/BindingConfigurator.cs @@ -138,7 +138,7 @@ public virtual Binding Configure( Contract.Requires(binding != null, nameof(binding)); IncompatibleBinding(binding); - return (CustomBinding)binding; + return binding; } /// diff --git a/Aspects/Wcf/Properties/AssemblyInfo.cs b/Aspects/Wcf/Properties/AssemblyInfo.cs index 1601a46..e5c129a 100644 --- a/Aspects/Wcf/Properties/AssemblyInfo.cs +++ b/Aspects/Wcf/Properties/AssemblyInfo.cs @@ -3,9 +3,9 @@ [assembly: AssemblyTitle("Wcf")] [assembly: AssemblyDescription("A set of classes and generics simplifying the initial configuration work of creating WCF services.")] -[assembly: AssemblyVersion("1.0.35")] -[assembly: AssemblyFileVersion("1.0.35")] -[assembly: AssemblyInformationalVersion("1.0.35")] +[assembly: AssemblyVersion("1.0.36")] +[assembly: AssemblyFileVersion("1.0.36")] +[assembly: AssemblyInformationalVersion("1.0.36")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo( "vm.Aspects.Wcf.Test, " + diff --git a/Aspects/Wcf/Tests/ExceptionShieldingErrorHandlerFixture.cs b/Aspects/Wcf/Tests/ExceptionShieldingErrorHandlerFixture.cs index 038e105..af083cd 100644 --- a/Aspects/Wcf/Tests/ExceptionShieldingErrorHandlerFixture.cs +++ b/Aspects/Wcf/Tests/ExceptionShieldingErrorHandlerFixture.cs @@ -20,7 +20,7 @@ using Microsoft.Practices.EnterpriseLibrary.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; -using ExceptionShieldingErrorHandler = vm.Aspects.Wcf.ExceptionShieldingBehavior.ExceptionShieldingErrorHandler; +using ExceptionShieldingErrorHandler = vm.Aspects.Wcf.Behaviors.ExceptionShieldingErrorHandler; namespace vm.Aspects.Wcf.Tests { diff --git a/Aspects/Wcf/WcfTypesExtensions.cs b/Aspects/Wcf/WcfTypesExtensions.cs index 7dda5c1..d7af666 100644 --- a/Aspects/Wcf/WcfTypesExtensions.cs +++ b/Aspects/Wcf/WcfTypesExtensions.cs @@ -5,7 +5,7 @@ using System.Reflection; using System.ServiceModel; using vm.Aspects.Wcf.Bindings; -using vm.Aspects.Wcf.DIBehavior; +using vm.Aspects.Wcf.Behaviors; namespace vm.Aspects.Wcf { diff --git a/Aspects/Wcf/vm.Aspects.Wcf.csproj b/Aspects/Wcf/vm.Aspects.Wcf.csproj index 3f49915..3840b7a 100644 --- a/Aspects/Wcf/vm.Aspects.Wcf.csproj +++ b/Aspects/Wcf/vm.Aspects.Wcf.csproj @@ -286,14 +286,14 @@ - - - - + + + + - - - + + + @@ -345,11 +345,11 @@ - - - - - + + + + +