From 8fe793eb2d6d7e8513213345259ff4dab3eb2023 Mon Sep 17 00:00:00 2001
From: Christian Wade <bism.normalizer@gmail.com>
Date: Tue, 20 Feb 2018 21:05:25 -0800
Subject: [PATCH] Role member ordering bug fix for Gerhard

---
 .../BismNormalizer.CommandLine/Properties/AssemblyInfo.cs | 4 ++--
 .../BismNormalizer.IconSetup/Properties/AssemblyInfo.cs   | 4 ++--
 BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs  | 4 ++--
 .../TabularCompare/TabularMetadata/TabularObject.cs       | 8 +++++++-
 .../BismNormalizer/source.extension.vsixmanifest          | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs
index 9794cff..6e0ecfc 100644
--- a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs
+++ b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0.20")]
-[assembly: AssemblyFileVersion("4.0.0.20")]
+[assembly: AssemblyVersion("4.0.0.21")]
+[assembly: AssemblyFileVersion("4.0.0.21")]
diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs
index 11dca95..40c689d 100644
--- a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs
+++ b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0.20")]
-[assembly: AssemblyFileVersion("4.0.0.20")]
+[assembly: AssemblyVersion("4.0.0.21")]
+[assembly: AssemblyFileVersion("4.0.0.21")]
diff --git a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs
index e409117..db8f8b2 100644
--- a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs
+++ b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0.20")]
-[assembly: AssemblyFileVersion("4.0.0.20")]
+[assembly: AssemblyVersion("4.0.0.21")]
+[assembly: AssemblyFileVersion("4.0.0.21")]
diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularObject.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularObject.cs
index 59430a1..2a2204b 100644
--- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularObject.cs
+++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularObject.cs
@@ -47,6 +47,12 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
                 _objectDefinition = SortArray(_objectDefinition, "partitions");
             }
 
+            //Order role members
+            if (namedMetaDataObject is Tom.ModelRole)
+            {
+                _objectDefinition = SortArray(_objectDefinition, "members");
+            }
+
             //Hide privacy setting on structured data sources
             if (namedMetaDataObject is Tom.StructuredDataSource)
             {
@@ -66,7 +72,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
                 {
                     var vals = prop.Values()
                         .OfType<JObject>()
-                        .OrderBy(x => x.Property("name").Value.ToString())
+                        .OrderBy(x => x.Property((arrayName == "members" ? "memberName" : "name")).Value.ToString())
                         .ToList();
                     prop.Value = JContainer.FromObject(vals);
                 }
diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest
index 2b5d9bd..b3f436c 100644
--- a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest
+++ b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="BismNormalizer.ea2aeb43-64a6-4dee-8816-099fb44513fa" Version="4.0.0.20" Language="en-US" Publisher="BISM Normalizer" />
+        <Identity Id="BismNormalizer.ea2aeb43-64a6-4dee-8816-099fb44513fa" Version="4.0.0.21" Language="en-US" Publisher="BISM Normalizer" />
         <DisplayName>BISM Normalizer</DisplayName>
         <Description xml:space="preserve">BISM Normalizer manages Analysis Services tabular models</Description>
         <MoreInfo>http://bism-normalizer.com/</MoreInfo>