Fixed the way bytes are handled for Guid

Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <VlingoVersion>0.9.0</VlingoVersion>
+    <VlingoVersion>0.9.1</VlingoVersion>
   </PropertyGroup>
 </Project>

src/Vlingo.UUID.Tests/NameBasedGeneratorTests.cs

@@ -26,9 +26,9 @@ public void GeneratedUUID_ShouldHaveProperVersion(HashType hashType)
             {
                 var guid = generator.GenerateGuid(nameSpace, name);
 
-                var array = guid.ToByteArray();
+                var array = guid.ToActuallyOrderedBytes();
 
-                Assert.Equal(expectedVersion, array[7] & 0xf0);
+                Assert.Equal(expectedVersion, array[6] & 0xf0);
             }
         }
 
@@ -120,5 +120,19 @@ public void UUIDGenerated_InWithSameName_InDifferentCustomNameSpace_ShouldBeDiff
                 Assert.NotEqual(first, second);
             }
         }
+
+        [Fact]
+        public void UUIDGenerated_ShouldGenerateProperNamebasedGuid_ForCustomNamespaceAndName()
+        {
+            // bugfix for issue: https://github.com/vlingo-net/vlingo-net-uuid/issues/7
+
+            var uuidNamespace = Guid.Parse("a4405a8d-8bb2-467a-bbc3-961ab93bb538");
+            var name = "9912310000";
+
+            var generator = new NameBasedGenerator(HashType.Sha1);
+            var uuidV5 = generator.GenerateGuid(uuidNamespace, name);
+
+            Assert.Equal("a045c4bc-d81c-5fc4-88bd-313db5b2d1fc", uuidV5.ToString());
+        }
     }
 }

src/Vlingo.UUID.Tests/RandomBasedGeneratorTests.cs

@@ -18,9 +18,9 @@ public void GeneratedUUID_ShouldHaveProperVersion()
             var expectedVersion = 0x40;
 
             var guid = generator.GenerateGuid();
-            var array = guid.ToByteArray();
+            var array = guid.ToActuallyOrderedBytes();
 
-            Assert.Equal(expectedVersion, array[7] & 0xf0);
+            Assert.Equal(expectedVersion, array[6] & 0xf0);
         }
     }
 }

src/Vlingo.UUID.Tests/TimeBasedGeneratorTests.cs

@@ -20,9 +20,9 @@ public void GeneratedUUID_ShouldHaveProperVersion(GuidGenerationMode mode)
             var expectedVersion = 0x10;
 
             var guid = generator.GenerateGuid(mode);
-            var array = guid.ToByteArray();
+            var array = guid.ToActuallyOrderedBytes();
 
-            Assert.Equal(expectedVersion, array[7] & 0xf0);
+            Assert.Equal(expectedVersion, array[6] & 0xf0);
         }
     }
 }

src/Vlingo.UUID/ByteMarker.cs

@@ -14,7 +14,7 @@ internal static class ByteMarker
         private const int VariantIndexPosition = 8;
         private const int VariantMask = 0x3f;
         private const int VariantBits = 0x80;
-        private const int VersionIndexPosition = 7;
+        private const int VersionIndexPosition = 6;
         private const int VersionMask = 0x0f;
 
         /// <summary>

src/Vlingo.UUID/GuidExtensions.cs

@@ -11,23 +11,58 @@ namespace Vlingo.UUID
 {
     public static class GuidExtensions
     {
-        public static long ToLeastSignificantBits(this Guid id)
+        /// <summary>
+        /// Converts the Guid into the byte order as they appear in Guid string
+        /// </summary>
+        /// <remarks>
+        /// Reference: https://docs.microsoft.com/en-us/dotnet/api/system.guid.tobytearray?view=netcore-3.1#remarks
+        /// </remarks>
+        /// <param name="guid"></param>
+        /// <returns>Array of bytes</returns>
+        public static byte[] ToActuallyOrderedBytes(this Guid guid)
         {
-            var bytes = id.ToByteArray();
-            var boolArray = new bool[bytes.Length];
-            for(var i = 0; i < bytes.Length; i++)
-            {
-                boolArray[i] = GetBit(bytes[i]);
-            }
+            var array = guid.ToByteArray();
+            ChangeGuidByteOrders(array);
+            return array;
+        }
 
-            return BitConverter.ToInt64(bytes, 0);
+        /// <summary>
+        /// Converts the byte array so that it appears in the Guid string in the same order
+        /// Caution: mutates the actual array to save memory
+        /// </summary>
+        /// <remarks>
+        /// Reference: https://docs.microsoft.com/en-us/dotnet/api/system.guid.tobytearray?view=netcore-3.1#remarks
+        /// </remarks>
+        /// <param name="array"></param>
+        /// <returns>A Guid</returns>
+        public static Guid ToGuidFromActuallyOrderedBytes(this byte[] array)
+        {
+            ChangeGuidByteOrders(array);
+            return new Guid(array);
         }
-
-        public static Guid ToGuid(this long id)
+
+        /// <summary>
+        /// Swaps bytes in positions as:
+        /// 0 <-> 3, 1 <-> 2, 4 <-> 5, 6 <-> 7
+        /// </summary>
+        /// <param name="array"></param>
+        private static void ChangeGuidByteOrders(byte[] array)
         {
-            var bytes = new byte[16];
-            BitConverter.GetBytes(id).CopyTo(bytes, 0);
-            return new Guid(bytes);
+            var temp = array[0];
+            array[0] = array[3];
+            array[3] = temp;
+
+            temp = array[1];
+            array[1] = array[2];
+            array[2] = temp;
+
+            temp = array[4];
+            array[4] = array[5];
+            array[5] = temp;
+
+            temp = array[6];
+            array[6] = array[7];
+            array[7] = temp;
         }
 
         private static bool GetBit(byte b) => (b & 1) != 0;

src/Vlingo.UUID/NameBasedGenerator.cs

@@ -71,7 +71,7 @@ public NameBasedGenerator()
         /// <returns>RFC4122 UUID generated using the <paramref name="customNamespaceGuid"/> and the <paramref name="name"/></returns>
         public Guid GenerateGuid(Guid customNamespaceGuid, string name)
         {
-            var nsBytes = Guid.Empty == customNamespaceGuid ? new byte[0] : customNamespaceGuid.ToByteArray();
+            var nsBytes = Guid.Empty == customNamespaceGuid ? new byte[0] : customNamespaceGuid.ToActuallyOrderedBytes();
             var nameBytes = Encoding.UTF8.GetBytes(name);
             var data = new byte[nsBytes.Length + nameBytes.Length];
             if(nsBytes.Length > 0)
@@ -86,7 +86,7 @@ public Guid GenerateGuid(Guid customNamespaceGuid, string name)
                 .AddVariantMarker()
                 .AddVersionMarker(_version);
 
-            return new Guid(result);
+            return result.ToGuidFromActuallyOrderedBytes();
         }
 
         public void Dispose()

src/Vlingo.UUID/RandomBasedGenerator.cs

@@ -45,7 +45,7 @@ public Guid GenerateGuid()
 
             data.AddVariantMarker().AddVersionMarker(UUIDVersion.Random);
 
-            return new Guid(data);
+            return data.ToGuidFromActuallyOrderedBytes();
         }
     }
 }

src/Vlingo.UUID/TimeBasedGenerator.cs

@@ -152,7 +152,7 @@ private static Guid GenerateGuid(DateTimeOffset dateTime, byte[] clockSequenceDa
 
             data.AddVariantMarker().AddVersionMarker(UUIDVersion.TimeBased);
 
-            return new Guid(data);
+            return data.ToGuidFromActuallyOrderedBytes();
         }
 
         private static byte[] GetClockSequenceData(long ticks)