AlexW fix

This commit is contained in:
Christian Wade 2020-09-22 22:59:37 -07:00
parent 88060e47b3
commit b42338c7bf
10 changed files with 142 additions and 21 deletions

View File

@ -31,6 +31,10 @@
<DeploymentOptionTransactionalDeployment>False</DeploymentOptionTransactionalDeployment> <DeploymentOptionTransactionalDeployment>False</DeploymentOptionTransactionalDeployment>
<DeploymentOptionDirectQueryMode>InMemory</DeploymentOptionDirectQueryMode> <DeploymentOptionDirectQueryMode>InMemory</DeploymentOptionDirectQueryMode>
<DeploymentOptionQueryImpersonation>Default</DeploymentOptionQueryImpersonation> <DeploymentOptionQueryImpersonation>Default</DeploymentOptionQueryImpersonation>
<DeploymentOptionADALCache>Default</DeploymentOptionADALCache>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == '' ">
<DeploymentOptionADALCache>Default</DeploymentOptionADALCache>
</PropertyGroup> </PropertyGroup>
<ItemGroup /> <ItemGroup />
<ItemGroup> <ItemGroup>

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("5.0.7.0")] [assembly: AssemblyVersion("5.0.8.0")]
[assembly: AssemblyFileVersion("5.0.7.0")] [assembly: AssemblyFileVersion("5.0.8.0")]

View File

@ -21,12 +21,6 @@
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
"OwnerKey" = "8:_7936400E6C154464B76D26251125123A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12"
"OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
@ -46,6 +40,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12"
"OwnerKey" = "8:_3BA1BB04BE8689BEF79234210621C61F" "OwnerKey" = "8:_3BA1BB04BE8689BEF79234210621C61F"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -309,6 +309,12 @@
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_1B2251DD757994082D5D85D7C9A38F82"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_1BC4692718F94CD799480D14260E2A0D" "MsmKey" = "8:_1BC4692718F94CD799480D14260E2A0D"
"OwnerKey" = "8:_UNDEFINED" "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
@ -357,6 +363,12 @@
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"OwnerKey" = "8:_7936400E6C154464B76D26251125123A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_24119C3E255B44849B7051DE458A42AA" "MsmKey" = "8:_24119C3E255B44849B7051DE458A42AA"
"OwnerKey" = "8:_UNDEFINED" "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
@ -532,6 +544,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B" "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B"
"OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -652,6 +670,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_4BD33B3CE11FBA409F994DAC22BFA8B3" "MsmKey" = "8:_4BD33B3CE11FBA409F994DAC22BFA8B3"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4BD33B3CE11FBA409F994DAC22BFA8B3"
"OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -994,6 +1018,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D"
"OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -1107,6 +1137,12 @@
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_7C49A244BD86813B688A86097B64A4BB"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_7C66897615D04979AA00553FFBE9F869" "MsmKey" = "8:_7C66897615D04979AA00553FFBE9F869"
"OwnerKey" = "8:_UNDEFINED" "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
@ -1162,6 +1198,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979" "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979"
"OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -1318,6 +1360,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC" "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC"
"OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -1378,6 +1426,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA" "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA"
"OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -1714,6 +1768,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9" "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9"
"OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -1780,6 +1840,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75" "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75"
"OwnerKey" = "8:_1B2251DD757994082D5D85D7C9A38F82" "OwnerKey" = "8:_1B2251DD757994082D5D85D7C9A38F82"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -2158,6 +2224,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F" "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F"
"OwnerKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" "OwnerKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -2241,6 +2313,12 @@
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_EEEF3B4DA37D965DCA452A1E7B283C82"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_EF0C782C601F42DE8C7EF094FA4ED82E" "MsmKey" = "8:_EF0C782C601F42DE8C7EF094FA4ED82E"
"OwnerKey" = "8:_UNDEFINED" "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
@ -2476,6 +2554,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_UNDEFINED" "MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_0FD8120FEC5AB531A28085D3548D2C38" "OwnerKey" = "8:_0FD8120FEC5AB531A28085D3548D2C38"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -2770,7 +2854,7 @@
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.6.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.7.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL"
"ScatterAssemblies" "ScatterAssemblies"
{ {
"_0020EC0A2900F50F0F5DCC3E7BBE4237" "_0020EC0A2900F50F0F5DCC3E7BBE4237"
@ -3703,6 +3787,37 @@
"IsDependency" = "11:FALSE" "IsDependency" = "11:FALSE"
"IsolateTo" = "8:" "IsolateTo" = "8:"
} }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1F23AE629378259BAD7F2BCAB42727AD"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.7.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_1F23AE629378259BAD7F2BCAB42727AD"
{
"Name" = "8:BismNormalizer.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:..\\BismNormalizer\\bin\\ReleaseObfusc\\BismNormalizer.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_CAD31D6A85364CAA9F9BFC2750F80458"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_24119C3E255B44849B7051DE458A42AA" "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_24119C3E255B44849B7051DE458A42AA"
{ {
"SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\d3dcompiler_47.dll" "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\d3dcompiler_47.dll"
@ -9173,15 +9288,15 @@
{ {
"Name" = "8:Microsoft Visual Studio" "Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Power BI ALM Toolkit" "ProductName" = "8:Power BI ALM Toolkit"
"ProductCode" = "8:{D4630409-3CA0-4144-9911-6424351E4BA1}" "ProductCode" = "8:{4BF4F9F9-C56F-447B-92C7-B0AC76A3FF17}"
"PackageCode" = "8:{43347DEF-66EF-43F9-AF84-0DDC70A48278}" "PackageCode" = "8:{DEC1A28A-6652-4F2A-88BD-95C2F94EFF70}"
"UpgradeCode" = "8:{96819CFD-6462-4AD1-ADB4-7903F30ADB92}" "UpgradeCode" = "8:{96819CFD-6462-4AD1-ADB4-7903F30ADB92}"
"AspNetVersion" = "8:4.0.30319.0" "AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE" "RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE" "InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:5.0.7" "ProductVersion" = "8:5.0.8"
"Manufacturer" = "8:Power BI ALM Toolkit" "Manufacturer" = "8:Power BI ALM Toolkit"
"ARPHELPTELEPHONE" = "8:" "ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:" "ARPHELPLINK" = "8:"

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("5.0.7.0")] [assembly: AssemblyVersion("5.0.8.0")]
[assembly: AssemblyFileVersion("5.0.7.0")] [assembly: AssemblyFileVersion("5.0.8.0")]

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("5.0.7.0")] [assembly: AssemblyVersion("5.0.8.0")]
[assembly: AssemblyFileVersion("5.0.7.0")] [assembly: AssemblyFileVersion("5.0.8.0")]

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("5.0.7.0")] [assembly: AssemblyVersion("5.0.8.0")]
[assembly: AssemblyFileVersion("5.0.7.0")] [assembly: AssemblyFileVersion("5.0.8.0")]

View File

@ -221,7 +221,9 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
{ {
if (relationship.TomRelationship.IsActive && if (relationship.TomRelationship.IsActive &&
(relationship.FromTableName == this.Name || (relationship.FromTableName == this.Name ||
(relationship.ToTableName == this.Name && relationship.TomRelationship.CrossFilteringBehavior == CrossFilteringBehavior.BothDirections && (!checkSecurityBehavior || (checkSecurityBehavior && relationship.TomRelationship.SecurityFilteringBehavior == SecurityFilteringBehavior.BothDirections))) //Alex Whittles fix 9/20 removed !checkSecurityBehavior ||
//(relationship.ToTableName == this.Name && relationship.TomRelationship.CrossFilteringBehavior == CrossFilteringBehavior.BothDirections && (!checkSecurityBehavior || (checkSecurityBehavior && relationship.TomRelationship.SecurityFilteringBehavior == SecurityFilteringBehavior.BothDirections)))
(relationship.ToTableName == this.Name && relationship.TomRelationship.CrossFilteringBehavior == CrossFilteringBehavior.BothDirections && (checkSecurityBehavior && relationship.TomRelationship.SecurityFilteringBehavior == SecurityFilteringBehavior.BothDirections))
) )
) )
{ {

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="5.0.7.0" Language="en-US" Publisher="BISM Normalizer" /> <Identity Id="BismNormalizer.ea2aeb43-64a6-4dee-8816-099fb44513fa" Version="5.0.8.0" 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>