More objects for Desktop target hardened

This commit is contained in:
Christian Wade 2023-06-16 16:52:16 -07:00
parent ecbd60861d
commit 24c34d96e3
9 changed files with 146 additions and 52 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("5.0.42.0")] [assembly: AssemblyVersion("5.0.43.0")]
[assembly: AssemblyFileVersion("5.0.42.0")] [assembly: AssemblyFileVersion("5.0.43.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:_6B0FABA5989346D0B8E84750E592385D" "OwnerKey" = "8:_6B0FABA5989346D0B8E84750E592385D"
"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:_6B0FABA5989346D0B8E84750E592385D" "OwnerKey" = "8:_6B0FABA5989346D0B8E84750E592385D"
"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:_6B0FABA5989346D0B8E84750E592385D" "OwnerKey" = "8:_6B0FABA5989346D0B8E84750E592385D"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -1125,6 +1155,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"
@ -1180,6 +1216,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979" "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979"
"OwnerKey" = "8:_6B0FABA5989346D0B8E84750E592385D" "OwnerKey" = "8:_6B0FABA5989346D0B8E84750E592385D"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -1354,6 +1396,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC" "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC"
"OwnerKey" = "8:_6B0FABA5989346D0B8E84750E592385D" "OwnerKey" = "8:_6B0FABA5989346D0B8E84750E592385D"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -1414,6 +1462,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA" "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA"
"OwnerKey" = "8:_6B0FABA5989346D0B8E84750E592385D" "OwnerKey" = "8:_6B0FABA5989346D0B8E84750E592385D"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -1768,6 +1822,12 @@
"Entry" "Entry"
{ {
"MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9" "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9"
"OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9"
"OwnerKey" = "8:_6B0FABA5989346D0B8E84750E592385D" "OwnerKey" = "8:_6B0FABA5989346D0B8E84750E592385D"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -1834,6 +1894,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"
} }
@ -2212,6 +2278,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"
} }
@ -2295,6 +2367,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"
@ -2530,6 +2608,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"
} }
@ -2836,7 +2920,7 @@
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.41.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.42.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL"
"ScatterAssemblies" "ScatterAssemblies"
{ {
"_0020EC0A2900F50F0F5DCC3E7BBE4237" "_0020EC0A2900F50F0F5DCC3E7BBE4237"
@ -3769,6 +3853,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.42.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"
@ -5583,7 +5698,7 @@
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular, Version=19.57.2.4, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular, Version=19.65.4.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
"ScatterAssemblies" "ScatterAssemblies"
{ {
"_7344099411A9D2DBF4A784E3DE9EA77D" "_7344099411A9D2DBF4A784E3DE9EA77D"
@ -6149,7 +6264,7 @@
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular.Json, Version=19.57.2.4, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular.Json, Version=19.65.4.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
"ScatterAssemblies" "ScatterAssemblies"
{ {
"_82DAFE8276E3EAF6338E99A4D478878D" "_82DAFE8276E3EAF6338E99A4D478878D"
@ -8411,7 +8526,7 @@
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Core, Version=19.57.2.4, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Core, Version=19.65.4.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
"ScatterAssemblies" "ScatterAssemblies"
{ {
"_E6C48E30804B563751F799BDB82D2D5F" "_E6C48E30804B563751F799BDB82D2D5F"
@ -8633,7 +8748,7 @@
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices, Version=19.57.2.4, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices, Version=19.65.4.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
"ScatterAssemblies" "ScatterAssemblies"
{ {
"_EEEF3B4DA37D965DCA452A1E7B283C82" "_EEEF3B4DA37D965DCA452A1E7B283C82"
@ -8764,7 +8879,7 @@
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.57.2.4, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.65.4.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"
"ScatterAssemblies" "ScatterAssemblies"
{ {
"_F27EC43FC3B12703E1AC626345868C2F" "_F27EC43FC3B12703E1AC626345868C2F"
@ -9301,15 +9416,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:{A796DD0E-6D7A-48C7-8A3B-79B45767997A}" "ProductCode" = "8:{825F05E3-E7DB-4F2E-88D2-CE7634DA0B60}"
"PackageCode" = "8:{AC2CF828-B839-4F3E-AFB3-D7A1E61CF1ED}" "PackageCode" = "8:{B658B9F8-52BE-4B54-95EA-3B10C5B84476}"
"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.42" "ProductVersion" = "8:5.0.43"
"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.42.0")] [assembly: AssemblyVersion("5.0.43.0")]
[assembly: AssemblyFileVersion("5.0.42.0")] [assembly: AssemblyFileVersion("5.0.43.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.42.0")] [assembly: AssemblyVersion("5.0.43.0")]
[assembly: AssemblyFileVersion("5.0.42.0")] [assembly: AssemblyFileVersion("5.0.43.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.42.0")] [assembly: AssemblyVersion("5.0.43.0")]
[assembly: AssemblyFileVersion("5.0.42.0")] [assembly: AssemblyFileVersion("5.0.43.0")]

View File

@ -902,36 +902,27 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
foreach (ComparisonObject comparisonObject in _comparisonObjects) foreach (ComparisonObject comparisonObject in _comparisonObjects)
{ {
if (comparisonObject.ComparisonObjectType == ComparisonObjectType.Role && comparisonObject.MergeAction == MergeAction.Delete) if (comparisonObject.ComparisonObjectType == ComparisonObjectType.Role && comparisonObject.MergeAction == MergeAction.Delete)
{
if (DesktopHardened(comparisonObject, ValidationMessageType.Role))
{ {
_targetTabularModel.DeleteRole(comparisonObject.TargetObjectInternalName); _targetTabularModel.DeleteRole(comparisonObject.TargetObjectInternalName);
OnValidationMessage(new ValidationMessageEventArgs($"Delete role [{comparisonObject.TargetObjectName}].", ValidationMessageType.Role, ValidationMessageStatus.Informational)); OnValidationMessage(new ValidationMessageEventArgs($"Delete role [{comparisonObject.TargetObjectName}].", ValidationMessageType.Role, ValidationMessageStatus.Informational));
} }
} }
}
foreach (ComparisonObject comparisonObject in _comparisonObjects) foreach (ComparisonObject comparisonObject in _comparisonObjects)
{ {
if (comparisonObject.ComparisonObjectType == ComparisonObjectType.Role && comparisonObject.MergeAction == MergeAction.Create) if (comparisonObject.ComparisonObjectType == ComparisonObjectType.Role && comparisonObject.MergeAction == MergeAction.Create)
{
if (DesktopHardened(comparisonObject, ValidationMessageType.Role))
{ {
_targetTabularModel.CreateRole(_sourceTabularModel.Roles.FindById(comparisonObject.SourceObjectInternalName).TomRole); _targetTabularModel.CreateRole(_sourceTabularModel.Roles.FindById(comparisonObject.SourceObjectInternalName).TomRole);
OnValidationMessage(new ValidationMessageEventArgs($"Create role [{comparisonObject.SourceObjectName}].", ValidationMessageType.Role, ValidationMessageStatus.Informational)); OnValidationMessage(new ValidationMessageEventArgs($"Create role [{comparisonObject.SourceObjectName}].", ValidationMessageType.Role, ValidationMessageStatus.Informational));
} }
} }
}
foreach (ComparisonObject comparisonObject in _comparisonObjects) foreach (ComparisonObject comparisonObject in _comparisonObjects)
{ {
if (comparisonObject.ComparisonObjectType == ComparisonObjectType.Role && comparisonObject.MergeAction == MergeAction.Update) if (comparisonObject.ComparisonObjectType == ComparisonObjectType.Role && comparisonObject.MergeAction == MergeAction.Update)
{
if (DesktopHardened(comparisonObject, ValidationMessageType.Role))
{ {
_targetTabularModel.UpdateRole(_sourceTabularModel.Roles.FindById(comparisonObject.SourceObjectInternalName), _targetTabularModel.Roles.FindById(comparisonObject.TargetObjectInternalName)); _targetTabularModel.UpdateRole(_sourceTabularModel.Roles.FindById(comparisonObject.SourceObjectInternalName), _targetTabularModel.Roles.FindById(comparisonObject.TargetObjectInternalName));
OnValidationMessage(new ValidationMessageEventArgs($"Update role [{comparisonObject.TargetObjectName}].", ValidationMessageType.Role, ValidationMessageStatus.Informational)); OnValidationMessage(new ValidationMessageEventArgs($"Update role [{comparisonObject.TargetObjectName}].", ValidationMessageType.Role, ValidationMessageStatus.Informational));
} }
} }
}
_targetTabularModel.RolesCleanup(); _targetTabularModel.RolesCleanup();
@ -1707,10 +1698,6 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
{ {
if (comparisonObject.ComparisonObjectType == ComparisonObjectType.Relationship && comparisonObject.MergeAction == MergeAction.Delete) if (comparisonObject.ComparisonObjectType == ComparisonObjectType.Relationship && comparisonObject.MergeAction == MergeAction.Delete)
{ {
if (!DesktopHardened(comparisonObject, ValidationMessageType.Relationship))
{
return;
};
foreach (Table tableTarget in _targetTabularModel.Tables) foreach (Table tableTarget in _targetTabularModel.Tables)
{ {
Relationship relationshipTarget = tableTarget.Relationships.FindByName(comparisonObject.TargetObjectName.Trim()); Relationship relationshipTarget = tableTarget.Relationships.FindByName(comparisonObject.TargetObjectName.Trim());
@ -1731,10 +1718,6 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
{ {
if (comparisonObject.ComparisonObjectType == ComparisonObjectType.Relationship && comparisonObject.MergeAction == MergeAction.Create) if (comparisonObject.ComparisonObjectType == ComparisonObjectType.Relationship && comparisonObject.MergeAction == MergeAction.Create)
{ {
if (!DesktopHardened(comparisonObject, ValidationMessageType.Relationship))
{
return;
};
Table tableSource = _sourceTabularModel.Tables.FindByName(tableName); Table tableSource = _sourceTabularModel.Tables.FindByName(tableName);
Table tableTarget = _targetTabularModel.Tables.FindByName(tableName); Table tableTarget = _targetTabularModel.Tables.FindByName(tableName);
Relationship relationshipSource = tableSource.Relationships.FindByInternalName(comparisonObject.SourceObjectInternalName); Relationship relationshipSource = tableSource.Relationships.FindByInternalName(comparisonObject.SourceObjectInternalName);
@ -1756,10 +1739,6 @@ namespace BismNormalizer.TabularCompare.TabularMetadata
{ {
if (comparisonObject.ComparisonObjectType == ComparisonObjectType.Relationship && comparisonObject.MergeAction == MergeAction.Update) if (comparisonObject.ComparisonObjectType == ComparisonObjectType.Relationship && comparisonObject.MergeAction == MergeAction.Update)
{ {
if (!DesktopHardened(comparisonObject, ValidationMessageType.Relationship))
{
return;
};
Table tableSource = _sourceTabularModel.Tables.FindByName(tableName); Table tableSource = _sourceTabularModel.Tables.FindByName(tableName);
Table tableTarget = _targetTabularModel.Tables.FindByName(tableName); Table tableTarget = _targetTabularModel.Tables.FindByName(tableName);
Relationship relationshipSource = tableSource.Relationships.FindByInternalName(comparisonObject.SourceObjectInternalName); Relationship relationshipSource = tableSource.Relationships.FindByInternalName(comparisonObject.SourceObjectInternalName);

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