From e998ee81d5ba877ed75c4f6098761ec6143b87b9 Mon Sep 17 00:00:00 2001 From: Christian Wade Date: Thu, 13 May 2021 19:15:00 -0700 Subject: [PATCH] Retain role members --- .../AlmToolkit/Properties/AssemblyInfo.cs | 4 +- .../AlmToolkitSetup/AlmToolkitSetup.vdproj | 535 +++++++----------- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../BismNormalizer.IconSetup.exe | Bin 10240 -> 10240 bytes .../BismNormalizer/BismNormalizer.exe | Bin 16384 -> 16384 bytes .../BismNormalizer/Properties/AssemblyInfo.cs | 4 +- .../BismNormalizer/Settings.Designer.cs | 12 + .../BismNormalizer/Settings.settings | 3 + .../TabularCompare/OptionsInfo.cs | 9 + .../TabularMetadata/TabularModel.cs | 32 +- .../TabularCompare/UI/Options.Designer.cs | 54 +- .../TabularCompare/UI/Options.cs | 11 +- BismNormalizer/BismNormalizer/app.config | 3 + .../source.extension.vsixmanifest | 2 +- 15 files changed, 317 insertions(+), 360 deletions(-) diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs index f6b945d..a11a9e3 100644 --- a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs +++ b/BismNormalizer/AlmToolkit/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("5.0.20.0")] -[assembly: AssemblyFileVersion("5.0.20.0")] +[assembly: AssemblyVersion("5.0.21.0")] +[assembly: AssemblyFileVersion("5.0.21.0")] diff --git a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj index bcbcb0d..b5b2cf6 100644 --- a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj +++ b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj @@ -28,19 +28,13 @@ "Entry" { "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -298,19 +292,13 @@ "Entry" { "MsmKey" = "8:_1B2251DD757994082D5D85D7C9A38F82" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1B2251DD757994082D5D85D7C9A38F82" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_1B2251DD757994082D5D85D7C9A38F82" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -363,12 +351,6 @@ } "Entry" { - "MsmKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_24119C3E255B44849B7051DE458A42AA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -532,19 +514,13 @@ "Entry" { "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -670,12 +646,6 @@ "Entry" { "MsmKey" = "8:_4BD33B3CE11FBA409F994DAC22BFA8B3" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4BD33B3CE11FBA409F994DAC22BFA8B3" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } @@ -1006,19 +976,13 @@ "Entry" { "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1126,19 +1090,13 @@ "Entry" { "MsmKey" = "8:_7C49A244BD86813B688A86097B64A4BB" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_7C49A244BD86813B688A86097B64A4BB" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_7C49A244BD86813B688A86097B64A4BB" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1186,19 +1144,13 @@ "Entry" { "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1233,6 +1185,78 @@ } "Entry" { + "MsmKey" = "8:_8057CFAC2C91B33E07353DBF9DC742C3" + "OwnerKey" = "8:_ADC91BA5A95EFABB65AA7C0220E14DDD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8057CFAC2C91B33E07353DBF9DC742C3" + "OwnerKey" = "8:_505B9CD6FBF318D5810A11D52DB3B890" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8057CFAC2C91B33E07353DBF9DC742C3" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8057CFAC2C91B33E07353DBF9DC742C3" + "OwnerKey" = "8:_EA698E8642334E208E6882C8AD9B959D" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8057CFAC2C91B33E07353DBF9DC742C3" + "OwnerKey" = "8:_E2CA400A177D4496948B1A908908ECF8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8057CFAC2C91B33E07353DBF9DC742C3" + "OwnerKey" = "8:_B25F8298714748818A5C47AD281101F2" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8057CFAC2C91B33E07353DBF9DC742C3" + "OwnerKey" = "8:_7990580A65964262A834E0D37E8ABE09" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8057CFAC2C91B33E07353DBF9DC742C3" + "OwnerKey" = "8:_A5BA815907352422F79655A4124433EC" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8057CFAC2C91B33E07353DBF9DC742C3" + "OwnerKey" = "8:_4325F12850DE4B4D8AFE5931FC66A032" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8057CFAC2C91B33E07353DBF9DC742C3" + "OwnerKey" = "8:_36AE2BAEFAF249D5A38A96B93E1B57B1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8057CFAC2C91B33E07353DBF9DC742C3" + "OwnerKey" = "8:_1AC259E78F48430A97FB3A4F9B9A4E7E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8057CFAC2C91B33E07353DBF9DC742C3" + "OwnerKey" = "8:_0FBBFBF06B3F464CA9AF1150458B5F77" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_82DAFE8276E3EAF6338E99A4D478878D" "OwnerKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" "MsmSig" = "8:_UNDEFINED" @@ -1348,19 +1372,13 @@ "Entry" { "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1414,19 +1432,13 @@ "Entry" { "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1665,6 +1677,30 @@ } "Entry" { + "MsmKey" = "8:_ADC91BA5A95EFABB65AA7C0220E14DDD" + "OwnerKey" = "8:_0FBBFBF06B3F464CA9AF1150458B5F77" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ADC91BA5A95EFABB65AA7C0220E14DDD" + "OwnerKey" = "8:_505B9CD6FBF318D5810A11D52DB3B890" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ADC91BA5A95EFABB65AA7C0220E14DDD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ADC91BA5A95EFABB65AA7C0220E14DDD" + "OwnerKey" = "8:_4325F12850DE4B4D8AFE5931FC66A032" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_AE19FD158816476484739690E13FADEE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1756,19 +1792,13 @@ "Entry" { "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1828,19 +1858,13 @@ "Entry" { "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1923,30 +1947,6 @@ } "Entry" { - "MsmKey" = "8:_D03859C17E6D24BBDABA95F7EB5C42A6" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D03859C17E6D24BBDABA95F7EB5C42A6" - "OwnerKey" = "8:_4325F12850DE4B4D8AFE5931FC66A032" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D03859C17E6D24BBDABA95F7EB5C42A6" - "OwnerKey" = "8:_0FBBFBF06B3F464CA9AF1150458B5F77" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D03859C17E6D24BBDABA95F7EB5C42A6" - "OwnerKey" = "8:_505B9CD6FBF318D5810A11D52DB3B890" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_D2C640EAFC1348949382B5A1A523618E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2025,78 +2025,6 @@ } "Entry" { - "MsmKey" = "8:_D6E65017D7D98E6E7C666755CCD11A9B" - "OwnerKey" = "8:_D03859C17E6D24BBDABA95F7EB5C42A6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D6E65017D7D98E6E7C666755CCD11A9B" - "OwnerKey" = "8:_EA698E8642334E208E6882C8AD9B959D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D6E65017D7D98E6E7C666755CCD11A9B" - "OwnerKey" = "8:_E2CA400A177D4496948B1A908908ECF8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D6E65017D7D98E6E7C666755CCD11A9B" - "OwnerKey" = "8:_B25F8298714748818A5C47AD281101F2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D6E65017D7D98E6E7C666755CCD11A9B" - "OwnerKey" = "8:_7990580A65964262A834E0D37E8ABE09" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D6E65017D7D98E6E7C666755CCD11A9B" - "OwnerKey" = "8:_A5BA815907352422F79655A4124433EC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D6E65017D7D98E6E7C666755CCD11A9B" - "OwnerKey" = "8:_4325F12850DE4B4D8AFE5931FC66A032" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D6E65017D7D98E6E7C666755CCD11A9B" - "OwnerKey" = "8:_36AE2BAEFAF249D5A38A96B93E1B57B1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D6E65017D7D98E6E7C666755CCD11A9B" - "OwnerKey" = "8:_1AC259E78F48430A97FB3A4F9B9A4E7E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D6E65017D7D98E6E7C666755CCD11A9B" - "OwnerKey" = "8:_0FBBFBF06B3F464CA9AF1150458B5F77" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D6E65017D7D98E6E7C666755CCD11A9B" - "OwnerKey" = "8:_505B9CD6FBF318D5810A11D52DB3B890" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D6E65017D7D98E6E7C666755CCD11A9B" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_D8EDFE87E30E4A728F792BAFABBDD9D8" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2212,19 +2140,13 @@ "Entry" { "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2302,19 +2224,13 @@ "Entry" { "MsmKey" = "8:_EEEF3B4DA37D965DCA452A1E7B283C82" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_EEEF3B4DA37D965DCA452A1E7B283C82" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_EEEF3B4DA37D965DCA452A1E7B283C82" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2452,6 +2368,24 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_F6EABBB09E898B70DA1090707FAF54BA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_505B9CD6FBF318D5810A11D52DB3B890" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_EA698E8642334E208E6882C8AD9B959D" "MsmSig" = "8:_UNDEFINED" } @@ -2518,6 +2452,18 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_ADC91BA5A95EFABB65AA7C0220E14DDD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8057CFAC2C91B33E07353DBF9DC742C3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } @@ -2530,36 +2476,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_F6EABBB09E898B70DA1090707FAF54BA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_505B9CD6FBF318D5810A11D52DB3B890" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D03859C17E6D24BBDABA95F7EB5C42A6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D6E65017D7D98E6E7C666755CCD11A9B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_0FD8120FEC5AB531A28085D3548D2C38" "MsmSig" = "8:_UNDEFINED" } @@ -2842,7 +2758,7 @@ { "Name" = "8:.NET Framework" "Message" = "8:[VSDNETMSG]" - "FrameworkVersion" = "8:v4.6.1 " + "FrameworkVersion" = "8:v4.6.1 " "AllowLaterVersions" = "11:FALSE" "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728" } @@ -2854,7 +2770,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.19.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.20.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" "ScatterAssemblies" { "_0020EC0A2900F50F0F5DCC3E7BBE4237" @@ -3787,37 +3703,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1F23AE629378259BAD7F2BCAB42727AD" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.19.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" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\d3dcompiler_47.dll" @@ -5632,7 +5517,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular, Version=19.12.7.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular, Version=19.20.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" "ScatterAssemblies" { "_7344099411A9D2DBF4A784E3DE9EA77D" @@ -6163,11 +6048,42 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8057CFAC2C91B33E07353DBF9DC742C3" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:CefSharp, Version=63.0.3.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86" + "ScatterAssemblies" + { + "_8057CFAC2C91B33E07353DBF9DC742C3" + { + "Name" = "8:CefSharp.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:CefSharp.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_DE6572CD9A214556BCB94A103A75EBB8" + "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:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_82DAFE8276E3EAF6338E99A4D478878D" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular.Json, Version=19.12.7.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular.Json, Version=19.20.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" "ScatterAssemblies" { "_82DAFE8276E3EAF6338E99A4D478878D" @@ -7193,6 +7109,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_ADC91BA5A95EFABB65AA7C0220E14DDD" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:CefSharp.Core, Version=63.0.3.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86" + "ScatterAssemblies" + { + "_ADC91BA5A95EFABB65AA7C0220E14DDD" + { + "Name" = "8:CefSharp.Core.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:CefSharp.Core.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_DE6572CD9A214556BCB94A103A75EBB8" + "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:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AE19FD158816476484739690E13FADEE" { "SourcePath" = "8:..\\AlmToolkit\\License.rtf" @@ -7828,37 +7775,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D03859C17E6D24BBDABA95F7EB5C42A6" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:CefSharp.Core, Version=63.0.3.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86" - "ScatterAssemblies" - { - "_D03859C17E6D24BBDABA95F7EB5C42A6" - { - "Name" = "8:CefSharp.Core.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:CefSharp.Core.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_DE6572CD9A214556BCB94A103A75EBB8" - "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:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D2C640EAFC1348949382B5A1A523618E" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x64\\locales\\am.pak" @@ -8021,37 +7937,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D6E65017D7D98E6E7C666755CCD11A9B" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:CefSharp, Version=63.0.3.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86" - "ScatterAssemblies" - { - "_D6E65017D7D98E6E7C666755CCD11A9B" - { - "Name" = "8:CefSharp.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:CefSharp.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_DE6572CD9A214556BCB94A103A75EBB8" - "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:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D8EDFE87E30E4A728F792BAFABBDD9D8" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\locales\\bn.pak" @@ -8398,7 +8283,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Core, Version=19.12.7.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Core, Version=19.20.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" "ScatterAssemblies" { "_E6C48E30804B563751F799BDB82D2D5F" @@ -8620,7 +8505,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices, Version=19.12.7.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices, Version=19.20.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" "ScatterAssemblies" { "_EEEF3B4DA37D965DCA452A1E7B283C82" @@ -8751,7 +8636,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.12.7.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.20.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" "ScatterAssemblies" { "_F27EC43FC3B12703E1AC626345868C2F" @@ -9288,15 +9173,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Power BI ALM Toolkit" - "ProductCode" = "8:{EA1AB47E-3B7A-488E-99A3-314C9BB108F9}" - "PackageCode" = "8:{DAD5F3CE-F137-4874-832F-EE38D98A2E60}" + "ProductCode" = "8:{0CD8B236-42D7-4C31-9757-C8FCE0D48E4B}" + "PackageCode" = "8:{B1F45D6E-1B1F-42F4-ADC2-0D050719C8BD}" "UpgradeCode" = "8:{96819CFD-6462-4AD1-ADB4-7903F30ADB92}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:5.0.20" + "ProductVersion" = "8:5.0.21" "Manufacturer" = "8:Power BI ALM Toolkit" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs index 1bc2d2f..99b51e6 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("5.0.20.0")] -[assembly: AssemblyFileVersion("5.0.20.0")] +[assembly: AssemblyVersion("5.0.21.0")] +[assembly: AssemblyFileVersion("5.0.21.0")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index b8be261..680d8b1 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("5.0.20.0")] -[assembly: AssemblyFileVersion("5.0.20.0")] +[assembly: AssemblyVersion("5.0.21.0")] +[assembly: AssemblyFileVersion("5.0.21.0")] diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe index 730f83495c4ab1cd6d661a8c92cc04eae8306f05..54c46cd8915b6aefa8af63709f3e22eb5e70e29a 100644 GIT binary patch delta 134 zcmZn&Xb70l!Mx$l+>PD8*%?JQw{r+`3P^2LiTqnt>Dc=GkGW<<_m<5o1fMW68cyyN z4%Y!HO<({5CLoq!WMKGX2*kn+3_-yz!SC*BT>9)f-+gcXm+s}U%r7?!h-_ox6a}he d1!B?7=f&!Q#%%VN*bXv{UCJ8BahBT43jiWIEocA$ delta 134 zcmZn&Xb70l!ECr>!p833?2ICt+c^X|1$1`&He9zd*L!AwBtz!ceNQ*95PZVOXfU}~ zI9vy)G=TvKn1EP@k%8flArK2QFa!m=1arEHMIVWK=(crf`4a!%O0t^;M7A+;iU3uz d0bIsYzLXfE@chmI7{v21ppjsDX0Jd diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.exe b/BismNormalizer/BismNormalizer/BismNormalizer.exe index 319efd7e53f7bfb75762b802dd46e4d6e84b33e7..002d84a2fdf1e0cddaaab40ef9854a6c6e464186 100644 GIT binary patch delta 122 zcmZo@U~Fh$oY29%;m+KR-OGg;MJF4Js4|Lfjudg15s1w@SQ6Wn>oWVW0mJ>~aDzezi{1sy9+l-@kW*oc`^l!1YP6^KPQpEqk~ XWHj6yZZR21O@3`@4dkd>-DCv->KQ9O delta 122 zcmZo@U~Fh$oY28+xMae{?&ZRaB9o0pR2fA!M~b-12;8bW!oaYa-*<)ca{ True + + False + \ No newline at end of file diff --git a/BismNormalizer/BismNormalizer/TabularCompare/OptionsInfo.cs b/BismNormalizer/BismNormalizer/TabularCompare/OptionsInfo.cs index a01edcd..3b61b65 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/OptionsInfo.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/OptionsInfo.cs @@ -17,6 +17,7 @@ namespace BismNormalizer.TabularCompare private bool _optionCultures; private bool _optionMergeCultures; private bool _optionRoles; + private bool _optionRetainRoleMembers; private bool _optionActions; private bool _optionPartitions; private bool _optionLineageTag; @@ -38,6 +39,7 @@ namespace BismNormalizer.TabularCompare _optionCultures = Settings.Default.OptionCultures; _optionMergeCultures = Settings.Default.OptionMergeCultures; _optionRoles = Settings.Default.OptionRoles; + _optionRetainRoleMembers = Settings.Default.OptionRetainRoleMembers; _optionActions = Settings.Default.OptionActions; _optionPartitions = Settings.Default.OptionPartitions; _optionLineageTag = Settings.Default.OptionLineageTag; @@ -94,6 +96,12 @@ namespace BismNormalizer.TabularCompare set { _optionRoles = value; } } + public bool OptionRetainRoleMembers + { + get { return _optionRetainRoleMembers; } + set { _optionRetainRoleMembers = value; } + } + /// /// A Boolean specifying whether to include actions in the comparison. /// @@ -198,6 +206,7 @@ namespace BismNormalizer.TabularCompare Settings.Default.OptionCultures = _optionCultures; Settings.Default.OptionMergeCultures = _optionMergeCultures; Settings.Default.OptionRoles = _optionRoles; + Settings.Default.OptionRetainRoleMembers = _optionRetainRoleMembers; Settings.Default.OptionActions = _optionActions; Settings.Default.OptionPartitions = _optionPartitions; Settings.Default.OptionLineageTag = _optionLineageTag; diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs index 0961850..9ed51a7 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs @@ -1836,7 +1836,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata /// Create role associated with the TabularModel object. /// /// Tabular Object Model ModelRole object from the source tabular model to be abstracted in the target. - public void CreateRole(ModelRole tomRoleSource) + public ModelRole CreateRole(ModelRole tomRoleSource) { ModelRole tomRoleTarget = new ModelRole(); tomRoleSource.CopyTo(tomRoleTarget); @@ -1859,10 +1859,21 @@ namespace BismNormalizer.TabularCompare.TabularMetadata tomRoleTarget.TablePermissions.Remove(name); } + //Workaround for bug where can't specify role member ID, only UPN + tomRoleTarget.Members.Clear(); + foreach (ModelRoleMember roleMemberOrig in tomRoleSource.Members) + { + ModelRoleMember roleMemberTarget = roleMemberOrig.Clone(); + roleMemberTarget.MemberID = null; + tomRoleTarget.Members.Add(roleMemberTarget); + } + _database.Model.Roles.Add(tomRoleTarget); // shell model _roles.Add(new Role(this, tomRoleTarget)); + + return tomRoleTarget; } /// @@ -1872,8 +1883,23 @@ namespace BismNormalizer.TabularCompare.TabularMetadata /// Role object in the target tabular model to be updated. public void UpdateRole(Role roleSource, Role roleTarget) { - DeleteRole(roleTarget.Name); - CreateRole(roleSource.TomRole); + if (_comparisonInfo.OptionsInfo.OptionRetainRoleMembers) + { + Tom.ModelRole tomModelRoleBackup = roleTarget.TomRole.Clone(); + DeleteRole(roleTarget.Name); + Tom.ModelRole tomModelRoleNew = CreateRole(roleSource.TomRole); + tomModelRoleNew.Members.Clear(); + foreach (ModelRoleMember roleMemberOrig in tomModelRoleBackup.Members) + { + ModelRoleMember roleMemberTarget = roleMemberOrig.Clone(); + tomModelRoleNew.Members.Add(roleMemberTarget); + } + } + else + { + DeleteRole(roleTarget.Name); + CreateRole(roleSource.TomRole); + } } /// diff --git a/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.Designer.cs b/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.Designer.cs index 444697b..101b5b9 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.Designer.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.Designer.cs @@ -35,6 +35,7 @@ this.chkMeasureDependencies = new System.Windows.Forms.CheckBox(); this.chkPerspectives = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.chkLineageTag = new System.Windows.Forms.CheckBox(); this.chkRetainStorageMode = new System.Windows.Forms.CheckBox(); this.chkRetainPolicyPartitions = new System.Windows.Forms.CheckBox(); this.chkRetainPartitions = new System.Windows.Forms.CheckBox(); @@ -45,7 +46,7 @@ this.chkAffectedTables = new System.Windows.Forms.CheckBox(); this.cboProcessingOption = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); - this.chkLineageTag = new System.Windows.Forms.CheckBox(); + this.chkRetainRoleMembers = new System.Windows.Forms.CheckBox(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.SuspendLayout(); @@ -54,7 +55,7 @@ // this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(274, 477); + this.btnCancel.Location = new System.Drawing.Point(274, 489); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 21; @@ -65,7 +66,7 @@ // this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(194, 477); + this.btnOK.Location = new System.Drawing.Point(194, 489); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(75, 23); this.btnOK.TabIndex = 20; @@ -84,11 +85,12 @@ this.chkRoles.TabIndex = 5; this.chkRoles.Text = "Include roles"; this.chkRoles.UseVisualStyleBackColor = true; + this.chkRoles.CheckedChanged += new System.EventHandler(this.chkRoles_CheckedChanged); // // chkPartitions // this.chkPartitions.AutoSize = true; - this.chkPartitions.Location = new System.Drawing.Point(14, 151); + this.chkPartitions.Location = new System.Drawing.Point(14, 172); this.chkPartitions.Name = "chkPartitions"; this.chkPartitions.Size = new System.Drawing.Size(224, 17); this.chkPartitions.TabIndex = 6; @@ -102,7 +104,7 @@ this.chkMeasureDependencies.AutoSize = true; this.chkMeasureDependencies.Checked = true; this.chkMeasureDependencies.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkMeasureDependencies.Location = new System.Drawing.Point(14, 290); + this.chkMeasureDependencies.Location = new System.Drawing.Point(14, 311); this.chkMeasureDependencies.Name = "chkMeasureDependencies"; this.chkMeasureDependencies.Size = new System.Drawing.Size(47, 17); this.chkMeasureDependencies.TabIndex = 7; @@ -125,6 +127,7 @@ this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox1.Controls.Add(this.chkRetainRoleMembers); this.groupBox1.Controls.Add(this.chkLineageTag); this.groupBox1.Controls.Add(this.chkRetainStorageMode); this.groupBox1.Controls.Add(this.chkRetainPolicyPartitions); @@ -138,15 +141,25 @@ this.groupBox1.Controls.Add(this.chkRoles); this.groupBox1.Location = new System.Drawing.Point(12, 11); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(338, 346); + this.groupBox1.Size = new System.Drawing.Size(338, 358); this.groupBox1.TabIndex = 22; this.groupBox1.TabStop = false; this.groupBox1.Text = "Comparison Options"; // + // chkLineageTag + // + this.chkLineageTag.AutoSize = true; + this.chkLineageTag.Location = new System.Drawing.Point(14, 203); + this.chkLineageTag.Name = "chkLineageTag"; + this.chkLineageTag.Size = new System.Drawing.Size(208, 17); + this.chkLineageTag.TabIndex = 13; + this.chkLineageTag.Text = "Consider LineageTag when comparing"; + this.chkLineageTag.UseVisualStyleBackColor = true; + // // chkRetainStorageMode // this.chkRetainStorageMode.AutoSize = true; - this.chkRetainStorageMode.Location = new System.Drawing.Point(14, 264); + this.chkRetainStorageMode.Location = new System.Drawing.Point(14, 285); this.chkRetainStorageMode.Name = "chkRetainStorageMode"; this.chkRetainStorageMode.Size = new System.Drawing.Size(207, 17); this.chkRetainStorageMode.TabIndex = 12; @@ -157,7 +170,7 @@ // this.chkRetainPolicyPartitions.AutoSize = true; this.chkRetainPolicyPartitions.Enabled = false; - this.chkRetainPolicyPartitions.Location = new System.Drawing.Point(34, 235); + this.chkRetainPolicyPartitions.Location = new System.Drawing.Point(34, 256); this.chkRetainPolicyPartitions.Name = "chkRetainPolicyPartitions"; this.chkRetainPolicyPartitions.Size = new System.Drawing.Size(221, 17); this.chkRetainPolicyPartitions.TabIndex = 11; @@ -167,7 +180,7 @@ // chkRetainPartitions // this.chkRetainPartitions.AutoSize = true; - this.chkRetainPartitions.Location = new System.Drawing.Point(14, 214); + this.chkRetainPartitions.Location = new System.Drawing.Point(14, 235); this.chkRetainPartitions.Name = "chkRetainPartitions"; this.chkRetainPartitions.Size = new System.Drawing.Size(185, 17); this.chkRetainPartitions.TabIndex = 10; @@ -215,7 +228,7 @@ this.groupBox2.Controls.Add(this.chkAffectedTables); this.groupBox2.Controls.Add(this.cboProcessingOption); this.groupBox2.Controls.Add(this.label1); - this.groupBox2.Location = new System.Drawing.Point(12, 364); + this.groupBox2.Location = new System.Drawing.Point(12, 376); this.groupBox2.Name = "groupBox2"; this.groupBox2.Size = new System.Drawing.Size(338, 101); this.groupBox2.TabIndex = 23; @@ -258,15 +271,17 @@ this.label1.TabIndex = 0; this.label1.Text = "Processing Option:"; // - // chkLineageTag + // chkRetainRoleMembers // - this.chkLineageTag.AutoSize = true; - this.chkLineageTag.Location = new System.Drawing.Point(14, 182); - this.chkLineageTag.Name = "chkLineageTag"; - this.chkLineageTag.Size = new System.Drawing.Size(208, 17); - this.chkLineageTag.TabIndex = 13; - this.chkLineageTag.Text = "Consider LineageTag when comparing"; - this.chkLineageTag.UseVisualStyleBackColor = true; + this.chkRetainRoleMembers.AutoSize = true; + this.chkRetainRoleMembers.Checked = true; + this.chkRetainRoleMembers.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkRetainRoleMembers.Location = new System.Drawing.Point(34, 144); + this.chkRetainRoleMembers.Name = "chkRetainRoleMembers"; + this.chkRetainRoleMembers.Size = new System.Drawing.Size(179, 17); + this.chkRetainRoleMembers.TabIndex = 14; + this.chkRetainRoleMembers.Text = "For role updates, retain members"; + this.chkRetainRoleMembers.UseVisualStyleBackColor = true; // // Options // @@ -274,7 +289,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(362, 516); + this.ClientSize = new System.Drawing.Size(362, 528); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.btnCancel); @@ -316,5 +331,6 @@ private System.Windows.Forms.CheckBox chkRetainPolicyPartitions; private System.Windows.Forms.CheckBox chkRetainStorageMode; private System.Windows.Forms.CheckBox chkLineageTag; + private System.Windows.Forms.CheckBox chkRetainRoleMembers; } } \ No newline at end of file diff --git a/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.cs b/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.cs index 0c23115..22426a6 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.cs @@ -48,7 +48,7 @@ namespace BismNormalizer.TabularCompare.UI chkCultures.Checked = _comparisonInfo.OptionsInfo.OptionCultures; chkMergeCultures.Checked = _comparisonInfo.OptionsInfo.OptionMergeCultures; chkRoles.Checked = _comparisonInfo.OptionsInfo.OptionRoles; - //chkActions.Checked = _comparisonInfo.OptionsInfo.OptionActions; + chkRetainRoleMembers.Checked = _comparisonInfo.OptionsInfo.OptionRetainRoleMembers; chkPartitions.Checked = _comparisonInfo.OptionsInfo.OptionPartitions; chkLineageTag.Checked = _comparisonInfo.OptionsInfo.OptionLineageTag; chkRetainPartitions.Checked = _comparisonInfo.OptionsInfo.OptionRetainPartitions; @@ -57,7 +57,6 @@ namespace BismNormalizer.TabularCompare.UI chkMeasureDependencies.Checked = _comparisonInfo.OptionsInfo.OptionMeasureDependencies; string processingOption = _comparisonInfo.OptionsInfo.OptionProcessingOption.ToString(); cboProcessingOption.Text = processingOption == "DoNotProcess" ? "Do Not Process" : processingOption; - //chkTransaction.Checked = _comparisonInfo.OptionsInfo.OptionTransaction; chkAffectedTables.Checked = _comparisonInfo.OptionsInfo.OptionAffectedTables; } @@ -68,7 +67,7 @@ namespace BismNormalizer.TabularCompare.UI _comparisonInfo.OptionsInfo.OptionCultures = chkCultures.Checked; _comparisonInfo.OptionsInfo.OptionMergeCultures = chkMergeCultures.Checked; _comparisonInfo.OptionsInfo.OptionRoles = chkRoles.Checked; - //_comparisonInfo.OptionsInfo.OptionActions = chkActions.Checked; + _comparisonInfo.OptionsInfo.OptionRetainRoleMembers = chkRetainRoleMembers.Checked; _comparisonInfo.OptionsInfo.OptionActions = false; _comparisonInfo.OptionsInfo.OptionPartitions = chkPartitions.Checked; _comparisonInfo.OptionsInfo.OptionLineageTag = chkLineageTag.Checked; @@ -77,7 +76,6 @@ namespace BismNormalizer.TabularCompare.UI _comparisonInfo.OptionsInfo.OptionRetainStorageMode = chkRetainStorageMode.Checked; _comparisonInfo.OptionsInfo.OptionMeasureDependencies = chkMeasureDependencies.Checked; _comparisonInfo.OptionsInfo.OptionProcessingOption = (ProcessingOption)Enum.Parse(typeof(ProcessingOption), cboProcessingOption.Text.Replace(" ", "")); - //_comparisonInfo.OptionsInfo.OptionTransaction = chkTransaction.Checked; _comparisonInfo.OptionsInfo.OptionTransaction = false; _comparisonInfo.OptionsInfo.OptionAffectedTables = chkAffectedTables.Checked; @@ -94,6 +92,11 @@ namespace BismNormalizer.TabularCompare.UI chkMergeCultures.Enabled = chkCultures.Checked; } + private void chkRoles_CheckedChanged(object sender, EventArgs e) + { + chkRetainRoleMembers.Enabled = chkRoles.Checked; + } + private void ChkRetainPartitions_CheckedChanged(object sender, EventArgs e) { chkRetainPolicyPartitions.Enabled = chkRetainPartitions.Checked; diff --git a/BismNormalizer/BismNormalizer/app.config b/BismNormalizer/BismNormalizer/app.config index ce30cf9..4dbefdf 100644 --- a/BismNormalizer/BismNormalizer/app.config +++ b/BismNormalizer/BismNormalizer/app.config @@ -91,6 +91,9 @@ True + + False + diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index 3142ef1..a511a63 100644 --- a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest +++ b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + BISM Normalizer BISM Normalizer manages Analysis Services tabular models http://bism-normalizer.com/