diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs index 134909d..60e2eea 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.11.0")] -[assembly: AssemblyFileVersion("5.0.11.0")] +[assembly: AssemblyVersion("5.0.12.0")] +[assembly: AssemblyFileVersion("5.0.12.0")] diff --git a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj index 3717b94..668af78 100644 --- a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj +++ b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj @@ -21,12 +21,6 @@ } "Entry" { - "MsmKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" @@ -34,13 +28,19 @@ "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:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -298,13 +298,19 @@ "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:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -357,6 +363,12 @@ } "Entry" { + "MsmKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_24119C3E255B44849B7051DE458A42AA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -520,13 +532,19 @@ "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:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -652,6 +670,12 @@ "Entry" { "MsmKey" = "8:_4BD33B3CE11FBA409F994DAC22BFA8B3" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4BD33B3CE11FBA409F994DAC22BFA8B3" "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } @@ -982,13 +1006,19 @@ "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:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1096,13 +1126,19 @@ "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:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1150,13 +1186,19 @@ "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:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1191,78 +1233,6 @@ } "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" @@ -1378,13 +1348,19 @@ "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:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1438,13 +1414,19 @@ "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:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1683,30 +1665,6 @@ } "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" @@ -1798,13 +1756,19 @@ "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:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1864,13 +1828,19 @@ "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:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1953,6 +1923,30 @@ } "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" @@ -2031,6 +2025,78 @@ } "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" @@ -2146,13 +2212,19 @@ "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:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2230,13 +2302,19 @@ "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:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2374,24 +2452,6 @@ "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" } @@ -2458,24 +2518,48 @@ "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" } "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:_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" } @@ -2758,7 +2842,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" } @@ -2770,7 +2854,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.11.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.12.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" "ScatterAssemblies" { "_0020EC0A2900F50F0F5DCC3E7BBE4237" @@ -3703,6 +3787,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1F23AE629378259BAD7F2BCAB42727AD" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.11.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" @@ -6048,37 +6163,6 @@ "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" @@ -7109,37 +7193,6 @@ "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" @@ -7775,6 +7828,37 @@ "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" @@ -7937,6 +8021,37 @@ "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" @@ -9173,15 +9288,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Power BI ALM Toolkit" - "ProductCode" = "8:{B6A3EEDB-7E3D-49F5-84AE-03DBF908BFBF}" - "PackageCode" = "8:{EB94B769-48A1-48A6-AA4C-82D0893FB382}" + "ProductCode" = "8:{17B54E4C-5C2E-46C4-AAAE-302F3D233807}" + "PackageCode" = "8:{50DC115E-4EA9-4556-9264-BE02B36BC0D3}" "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.11" + "ProductVersion" = "8:5.0.12" "Manufacturer" = "8:Power BI ALM Toolkit" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -9814,7 +9929,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_577232D49DA84949B3604BA695B35542" { - "SourcePath" = "8:..\\BismNormalizer.CommandLine\\obj\\Release\\BismNormalizer.exe" + "SourcePath" = "8:..\\BismNormalizer.CommandLine\\obj\\Debug\\BismNormalizer.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_CAD31D6A85364CAA9F9BFC2750F80458" @@ -9842,7 +9957,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_7936400E6C154464B76D26251125123A" { - "SourcePath" = "8:..\\AlmToolkit\\obj\\Release\\AlmToolkit.exe" + "SourcePath" = "8:..\\AlmToolkit\\obj\\Debug\\AlmToolkit.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_CAD31D6A85364CAA9F9BFC2750F80458" diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs index f0c8274..f0ccf86 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.11.0")] -[assembly: AssemblyFileVersion("5.0.11.0")] +[assembly: AssemblyVersion("5.0.12.0")] +[assembly: AssemblyFileVersion("5.0.12.0")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index a8b9ba6..26d60db 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.11.0")] -[assembly: AssemblyFileVersion("5.0.11.0")] +[assembly: AssemblyVersion("5.0.12.0")] +[assembly: AssemblyFileVersion("5.0.12.0")] diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe index b5c0a09..1be307f 100644 Binary files a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe and b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe differ diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.exe b/BismNormalizer/BismNormalizer/BismNormalizer.exe index b837d24..96bba4d 100644 Binary files a/BismNormalizer/BismNormalizer/BismNormalizer.exe and b/BismNormalizer/BismNormalizer/BismNormalizer.exe differ diff --git a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs index dd1a59c..6ae2eca 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("5.0.11.0")] -[assembly: AssemblyFileVersion("5.0.11.0")] +[assembly: AssemblyVersion("5.0.12.0")] +[assembly: AssemblyFileVersion("5.0.12.0")] diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/CalcDependencyCollection.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/CalcDependencyCollection.cs index 2d46f24..39fd2ce 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/CalcDependencyCollection.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/CalcDependencyCollection.cs @@ -3,6 +3,18 @@ using System.Collections.Generic; namespace BismNormalizer.TabularCompare.TabularMetadata { + [Serializable] + public class CalcDependenciesInfiniteRecursionException : Exception + { + public CalcDependenciesInfiniteRecursionException() { } + + public CalcDependenciesInfiniteRecursionException(string message) + : base(message) { } + + public CalcDependenciesInfiniteRecursionException(string message, Exception inner) + : base(message, inner) { } + } + /// /// Represents a collection of CalcDependency objects. /// @@ -18,7 +30,13 @@ namespace BismNormalizer.TabularCompare.TabularMetadata { CalcDependencyCollection returnVal = new CalcDependencyCollection(); recursionCounter = 0; - LookUpDependenciesReferenceFrom(objectType, tableName, objectName, returnVal); + try + { + LookUpDependenciesReferenceFrom(objectType, tableName, objectName, returnVal); + } + catch (CalcDependenciesInfiniteRecursionException) + { //Some M is not parsable + } return returnVal; } @@ -29,7 +47,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata recursionCounter++; if (recursionCounter >= RecursionCounterMax) { - Exception infRecursion = new Exception($"Calc dependencies infinite recursion detected for type \"{objectType}\", table \"{tableName}\", name \"{objectName}\"."); + Exception infRecursion = new CalcDependenciesInfiniteRecursionException($"Calc dependencies infinite recursion detected for type \"{objectType}\", table \"{tableName}\", name \"{objectName}\"."); Telemetry.TrackException(infRecursion); throw infRecursion; } diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Table.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Table.cs index 2d6c6c9..e912e45 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Table.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Table.cs @@ -98,6 +98,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata //Check M dependency tree to see if all partitions refer only to a single DataSource CalcDependencyCollection calcDependencies = _parentTabularModel.MDependencies.DependenciesReferenceFrom(CalcDependencyObjectType.Partition, _tomTable.Name, partition.Name); + if (calcDependencies.Count == 1 && calcDependencies[0].ReferencedObjectType == CalcDependencyObjectType.DataSource) { if (_dataSourceName == "") diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs index 8641b36..62d9328 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs @@ -290,7 +290,8 @@ namespace BismNormalizer.TabularCompare.TabularMetadata //9/20/2020: stack overflow exception fix added to list of keywords: "Data", "Item", "Source", //9/28/2020: stack overflow exception fix added to list of keywords: "Severity", "SeverityID", - List keywords = new List() { "and", "as", "Data", "each", "else", "error", "false", "if", "in", "is", "Item", "let", "meta", "not", "otherwise", "or", "section", "shared", "Source", "then", "true", "try", "type", "#binary", "#date", "#datetime", "#datetimezone", "#duration", "#infinity", "#nan", "#sections", "#shared", "#table", "#time" }; + //9/29/2020: stack overflow exception fix added to list of keywords: "SQL" + List keywords = new List() { "and", "as", "Data", "each", "else", "error", "false", "if", "in", "is", "Item", "let", "meta", "not", "otherwise", "or", "section", "Severity", "SeverityID", "shared", "Source", "SQL", "then", "true", "try", "type", "#binary", "#date", "#datetime", "#datetimezone", "#duration", "#infinity", "#nan", "#sections", "#shared", "#table", "#time" }; foreach (MObject mObject in mObjects) { diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index 58d4a01..8cb2a7c 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/