* Copied the ExceptionShieldingErrorHandler from Enterprise Library a…

…nd modified to set the `HttpStatusCode`. For faults that inherit from `vm.Aspects.Wcf.FaultContract.Fault` it takes the code from the fault property `HttpStatusCode`, for all others - sets the error code to HTTP 500 - internal server error. * Added the property `HttpStatusCode` to the base class * Removed the dependency on the NuGet package Microsoft.Practices.EnterpriseLibrary.PolicyInjection which depended on Unity 3.0. Recompiled and added Microsoft.Practices.EnterpriseLibrary.PolicyInjection as a standalone assembly depending on Unity 4.0.1. * In vm.Aspects.Diagnostics.ObjectDumper added contracts to the internal DumpTextWriter.
vmelamed · Jan 27, 2016 · 9dbd0e1 · 9dbd0e1
1 parent abde052
commit 9dbd0e1
Show file tree

Hide file tree

Showing 53 changed files with 1,892 additions and 123 deletions.
diff --git a/Aspects/Diagnostics/DumpImplementation/DumpTextWriter.cs b/Aspects/Diagnostics/DumpImplementation/DumpTextWriter.cs
@@ -18,7 +18,6 @@ class DumpTextWriter : TextWriter
         // the default maximum length of the dump
         public const int DefaultMaxLength = 4 * 1024 * 1024;
 
-        bool _isClosed;
         readonly StringWriter _writer;
         readonly bool _isOwnWriter;
         int _indent;
@@ -48,7 +47,7 @@ public DumpTextWriter(
             _maxLength = maxLength;
         }
 
-        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification="N/A")]
+        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "N/A")]
         public DumpTextWriter(
             StringBuilder existing,
             int maxLength = 0)
@@ -95,9 +94,11 @@ public int IndentSize
             set { _indentSize = value < 0 ? 0 : value; }
         }
 
+        public bool IsClosed { get; private set; }
+
         public override void Close()
         {
-            _isClosed = true;
+            IsClosed = true;
             _writer.Close();
         }
 
@@ -106,34 +107,26 @@ public override void Write(string value)
             if (string.IsNullOrEmpty(value))
                 return;
 
-            if (_isClosed)
-                throw new InvalidOperationException("The writer is closed.");
-
             WriteCharBuffer(value.ToCharArray(), 0, value.Length);
         }
 
         public override void Write(char value)
         {
-            if (_isClosed)
-                throw new InvalidOperationException("The writer is closed.");
-
             WriteChar(value);
         }
 
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId="0")]
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
         public override void Write(
             char[] buffer,
             int index,
             int count)
         {
-            if (_isClosed)
-                throw new InvalidOperationException("The writer is closed.");
-
             WriteCharBuffer(buffer, index, count);
         }
 
         void WriteCharBuffer(char[] buffer, int index, int count)
         {
+            Contract.Requires<InvalidOperationException>(!IsClosed, "The writer is closed.");
             Contract.Requires(buffer != null, "buffer");
             Contract.Requires(index >= 0, "The parameter index must be non-negative.");
             Contract.Requires(count >= 0, "The parameter count must be non-negative.");
@@ -159,10 +152,10 @@ void WriteChar(char value)
                 _mustIndent = true;
             else
                 if (_mustIndent && value != '\r')   // we don't want to insert indentation blank strings on empty lines                
-                {
-                    _writer.Write(GetIndent());
-                    _mustIndent = false;
-                }
+            {
+                _writer.Write(GetIndent());
+                _mustIndent = false;
+            }
 
             _writer.Write(value);
         }
@@ -179,7 +172,7 @@ string GetIndent()
 
         protected override void Dispose(bool disposing)
         {
-            _isClosed = true;
+            IsClosed = true;
             if (disposing && _isOwnWriter)
                 _writer.Dispose();
             base.Dispose(disposing);

diff --git a/Aspects/Diagnostics/NuGet/ObjectDumper.nuspec b/Aspects/Diagnostics/NuGet/ObjectDumper.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>AspectObjectDumper</id>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
         <authors>Val Melamed</authors>
         <owners>Val Melamed</owners>
         <summary>
@@ -28,7 +28,7 @@
             * Build and tested with .NET 4.0, 4.6. This package targets .NET 4.0.
         </description>
         <releaseNotes>
-            Fixing the dependencies.
+            Added contracts to the internal DumpTextWriter.
         </releaseNotes>
         <licenseUrl>https://aspectobjectdumper.codeplex.com/license</licenseUrl>
         <projectUrl>https://aspectobjectdumper.codeplex.com/</projectUrl>

diff --git a/Aspects/Diagnostics/Properties/AssemblyInfo.cs b/Aspects/Diagnostics/Properties/AssemblyInfo.cs
@@ -2,9 +2,9 @@
 
 [assembly: AssemblyTitle("vm.Aspects.Diagnostics.ObjectDumper")]
 [assembly: AssemblyDescription("Dumps the properties' and fields' values of any .NET object in a text form.")]
-[assembly: AssemblyVersion("1.5.1")]
-[assembly: AssemblyFileVersion("1.5.1")]
-[assembly: AssemblyInformationalVersion("1.5.1")]
+[assembly: AssemblyVersion("1.5.2")]
+[assembly: AssemblyFileVersion("1.5.2")]
+[assembly: AssemblyInformationalVersion("1.5.2")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "vm.Aspects.Diagnostics.ObjectDumper.Tests, " +

diff --git a/Aspects/Diagnostics/Test/ObjectDumperTest/DumpTextWriterTest.cs b/Aspects/Diagnostics/Test/ObjectDumperTest/DumpTextWriterTest.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Text;
-using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using vm.Aspects.Diagnostics.DumpImplementation;
 
@@ -50,8 +48,14 @@ public void WriteBufferNull()
                 w.Write(new char[] { 'a', 'b', 'c' }, -1, -2);
                 Assert.Fail("Expected System.Diagnostics.Contracts.__ContractsRuntime+ContractException");
             }
+            catch (AssertFailedException x)
+            {
+                TestContext.WriteLine(x.DumpString());
+                throw;
+            }
             catch (Exception x)
             {
+                TestContext.WriteLine(x.DumpString());
                 Assert.AreEqual("System.Diagnostics.Contracts.__ContractsRuntime+ContractException", x.GetType().FullName);
             }
         }

diff --git a/Aspects/Linq/Expressions/Serialization/NuGet/ExpressionSerialization.nuspec b/Aspects/Linq/Expressions/Serialization/NuGet/ExpressionSerialization.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>AspectExpressionSerialization</id>
-        <version>1.0.33</version>
+        <version>1.0.34</version>
         <authors>Val Melamed</authors>
         <owners>Val Melamed</owners>
         <summary>

diff --git 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.33")]
-[assembly: AssemblyFileVersion("1.0.33")]
-[assembly: AssemblyInformationalVersion("1.0.33")]
+[assembly: AssemblyVersion("1.0.34")]
+[assembly: AssemblyFileVersion("1.0.34")]
+[assembly: AssemblyInformationalVersion("1.0.34")]
 
 [assembly: InternalsVisibleTo(
     "vm.Aspects.Linq.Expressions.Serialization.Test, " +

diff --git 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.33")]
-[assembly: AssemblyFileVersion("1.0.33")]
-[assembly: AssemblyInformationalVersion("1.0.33")]
+[assembly: AssemblyVersion("1.0.34")]
+[assembly: AssemblyFileVersion("1.0.34")]
+[assembly: AssemblyInformationalVersion("1.0.34")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "vm.Aspects.Model.Tests, " +

diff --git a/Aspects/Model/Tests/packages.config b/Aspects/Model/Tests/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AspectObjectDumper" version="1.5.1" targetFramework="net46" />
+  <package id="AspectObjectDumper" version="1.5.2" targetFramework="net46" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net46" />
   <package id="EnterpriseLibrary.Common" version="6.0.1304.0" targetFramework="net46" />
   <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="EntityFramework" version="6.1.3" targetFramework="net46" />
   <package id="Unity" version="4.0.1" targetFramework="net46" />

diff --git a/Aspects/Model/Tests/vm.Aspects.Model.Tests.csproj b/Aspects/Model/Tests/vm.Aspects.Model.Tests.csproj
@@ -198,8 +198,8 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Practices.EnterpriseLibrary.PolicyInjection, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\EnterpriseLibrary.PolicyInjection.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.PolicyInjection.dll</HintPath>
-      <Private>True</Private>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Externals\Microsoft.Practices.EnterpriseLibrary.PolicyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Practices.EnterpriseLibrary.Validation, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\EnterpriseLibrary.Validation.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.Validation.dll</HintPath>
@@ -234,8 +234,8 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Transactions" />
-    <Reference Include="vm.Aspects.Diagnostics.ObjectDumper, Version=1.5.1.0, Culture=neutral, PublicKeyToken=39c66c470a75c367, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\AspectObjectDumper.1.5.1\lib\net40\vm.Aspects.Diagnostics.ObjectDumper.dll</HintPath>
+    <Reference Include="vm.Aspects.Diagnostics.ObjectDumper, Version=1.5.2.0, Culture=neutral, PublicKeyToken=39c66c470a75c367, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\AspectObjectDumper.1.5.2\lib\net40\vm.Aspects.Diagnostics.ObjectDumper.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/Aspects/Model/packages.config b/Aspects/Model/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AspectObjectDumper" version="1.5.1" targetFramework="net46" />
+  <package id="AspectObjectDumper" version="1.5.2" targetFramework="net46" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net46" />
   <package id="EnterpriseLibrary.Common" version="6.0.1304.0" targetFramework="net46" />
   <package id="EnterpriseLibrary.ExceptionHandling" version="6.0.1304.0" targetFramework="net46" />

diff --git a/Aspects/Model/vm.Aspects.Model.csproj b/Aspects/Model/vm.Aspects.Model.csproj
@@ -244,8 +244,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="vm.Aspects.Diagnostics.ObjectDumper, Version=1.5.1.0, Culture=neutral, PublicKeyToken=39c66c470a75c367, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AspectObjectDumper.1.5.1\lib\net40\vm.Aspects.Diagnostics.ObjectDumper.dll</HintPath>
+    <Reference Include="vm.Aspects.Diagnostics.ObjectDumper, Version=1.5.2.0, Culture=neutral, PublicKeyToken=39c66c470a75c367, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AspectObjectDumper.1.5.2\lib\net40\vm.Aspects.Diagnostics.ObjectDumper.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git 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>1.0.33-beta</version>
+        <version>1.0.34-beta</version>
         <authors>Val Melamed</authors>
         <owners>Val Melamed</owners>
         <summary>
@@ -12,8 +12,12 @@
             A set of classes, utilities, etc. addressing various common cross-cutting concerns or extending existing similar libraries like Enterprise Library, Unity, etc.            
         </description>
         <releaseNotes>
-            Fixing the dependencies.
-            Improvement in vm.Aspects.Model.EFRepository.EFSpecifics.IsChangeTracking method.
+            * Copied the ExceptionShieldingErrorHandler from Enterprise Library and modified to set the `HttpStatusCode`.
+            For faults that inherit from `vm.Aspects.Wcf.FaultContract.Fault` it takes the code from the fault property `HttpStatusCode`,
+            for all others - sets the error code to HTTP 500 - internal server error.
+            * Added the property `HttpStatusCode` to the base class 
+            * Removed the dependency on the NuGet package Microsoft.Practices.EnterpriseLibrary.PolicyInjection which depended on Unity 3.0.
+            Recompiled and added Microsoft.Practices.EnterpriseLibrary.PolicyInjection as a standalone assembly depending on Unity 4.0.1.
         </releaseNotes>
         <licenseUrl>https://github.com/vmelamed/vm/blob/master/LICENSE</licenseUrl>
         <projectUrl>https://github.com/vmelamed/vm/tree/master/Aspects</projectUrl>
@@ -40,8 +44,6 @@
                         version="6.0.1304.0" />
             <dependency id="EnterpriseLibrary.Validation"
                         version="6.0.1304.0" />
-            <dependency id="EnterpriseLibrary.PolicyInjection"
-                        version="6.0.1304.0" />
 
             <dependency id="EntityFramework"
                         version="6.1.3" />
@@ -68,5 +70,9 @@
               target="lib\net46"/>
         <file src="..\Parsers\bin\Release\vm.Aspects.Parsers.xml"
               target="lib\net46"/>
+        <file src="..\bin\Release\Microsoft.Practices.EnterpriseLibrary.PolicyInjection.dll"
+              target="lib\net46"/>
+        <file src="..\bin\Release\Microsoft.Practices.EnterpriseLibrary.PolicyInjection.xml"
+              target="lib\net46"/>
     </files>
 </package>
diff --git 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.33")]
-[assembly: AssemblyFileVersion("1.0.33")]
-[assembly: AssemblyInformationalVersion("1.0.33")]
+[assembly: AssemblyVersion("1.0.34")]
+[assembly: AssemblyFileVersion("1.0.34")]
+[assembly: AssemblyInformationalVersion("1.0.34")]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "vm.Aspects.Parsers.Tests, " +

diff --git 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.33")]
-[assembly: AssemblyFileVersion("1.0.33")]
-[assembly: AssemblyInformationalVersion("1.0.33")]
+[assembly: AssemblyVersion("1.0.34")]
+[assembly: AssemblyFileVersion("1.0.34")]
+[assembly: AssemblyInformationalVersion("1.0.34")]
 
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(

diff --git a/Aspects/RegularExpression.cs b/Aspects/RegularExpression.cs
@@ -572,7 +572,21 @@ public static class RegularExpression
         public static Regex SemanticVersion => _semanticVersion.Value;
         #endregion
 
-        #region Misceleaneous
+        #region Guid
+        /// <summary>
+        /// Regular expression pattern which matches ...
+        /// </summary>
+        public const string RexGuid = @"(?i:^(?:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})|(?:[0-9a-f]{32})$)";
+
+        readonly static Lazy<Regex> _rexGuid = new Lazy<Regex>(() => new Regex(RexGuid, RegexOptions.Compiled));
+
+        /// <summary>
+        /// Gets a Regex object which matches ...
+        /// </summary>
+        public static Regex Guid => _rexGuid.Value;
+        #endregion
+
+
         #region ByteArray
         /// <summary>
         /// Matches a text representation of a byte array the way it is produces by BitConverter,
@@ -618,7 +632,6 @@ public static class RegularExpression
         /// </summary>
         public static Regex CSharpIdentifier => _cSharpIdentifier.Value;
         #endregion
-        #endregion
 
         /// <summary>
         /// Dumps all regular expressions in this class.