Role member ordering bug fix for Gerhard

This commit is contained in:
Christian Wade 2018-02-20 21:05:25 -08:00
parent 8269465dcb
commit 8fe793eb2d
5 changed files with 14 additions and 8 deletions

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.0.0.20")] [assembly: AssemblyVersion("4.0.0.21")]
[assembly: AssemblyFileVersion("4.0.0.20")] [assembly: AssemblyFileVersion("4.0.0.21")]

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.0.0.20")] [assembly: AssemblyVersion("4.0.0.21")]
[assembly: AssemblyFileVersion("4.0.0.20")] [assembly: AssemblyFileVersion("4.0.0.21")]

View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.0.0.20")] [assembly: AssemblyVersion("4.0.0.21")]
[assembly: AssemblyFileVersion("4.0.0.20")] [assembly: AssemblyFileVersion("4.0.0.21")]

View File

@ -47,6 +47,12 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
_objectDefinition = SortArray(_objectDefinition, "partitions"); _objectDefinition = SortArray(_objectDefinition, "partitions");
} }
//Order role members
if (namedMetaDataObject is Tom.ModelRole)
{
_objectDefinition = SortArray(_objectDefinition, "members");
}
//Hide privacy setting on structured data sources //Hide privacy setting on structured data sources
if (namedMetaDataObject is Tom.StructuredDataSource) if (namedMetaDataObject is Tom.StructuredDataSource)
{ {
@ -66,7 +72,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
{ {
var vals = prop.Values() var vals = prop.Values()
.OfType<JObject>() .OfType<JObject>()
.OrderBy(x => x.Property("name").Value.ToString()) .OrderBy(x => x.Property((arrayName == "members" ? "memberName" : "name")).Value.ToString())
.ToList(); .ToList();
prop.Value = JContainer.FromObject(vals); prop.Value = JContainer.FromObject(vals);
} }

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?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"> <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> <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> <DisplayName>BISM Normalizer</DisplayName>
<Description xml:space="preserve">BISM Normalizer manages Analysis Services tabular models</Description> <Description xml:space="preserve">BISM Normalizer manages Analysis Services tabular models</Description>
<MoreInfo>http://bism-normalizer.com/</MoreInfo> <MoreInfo>http://bism-normalizer.com/</MoreInfo>