diff --git a/BismNormalizer/AlmToolkit/AlmToolkit.csproj b/BismNormalizer/AlmToolkit/AlmToolkit.csproj index d62eeb7..abcfb9f 100644 --- a/BismNormalizer/AlmToolkit/AlmToolkit.csproj +++ b/BismNormalizer/AlmToolkit/AlmToolkit.csproj @@ -46,20 +46,20 @@ BismNorm.ico - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.Core.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.Core.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.Tabular.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.Tabular.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs index b853593..134909d 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.9.0")] -[assembly: AssemblyFileVersion("5.0.9.0")] +[assembly: AssemblyVersion("5.0.11.0")] +[assembly: AssemblyFileVersion("5.0.11.0")] diff --git a/BismNormalizer/AlmToolkit/packages.config b/BismNormalizer/AlmToolkit/packages.config index 948edb0..39b989e 100644 --- a/BismNormalizer/AlmToolkit/packages.config +++ b/BismNormalizer/AlmToolkit/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj index e9fcf7d..3717b94 100644 --- a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj +++ b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj @@ -21,6 +21,12 @@ } "Entry" { + "MsmKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" @@ -28,7 +34,7 @@ "Entry" { "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -40,12 +46,6 @@ "Entry" { "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" "OwnerKey" = "8:_3BA1BB04BE8689BEF79234210621C61F" "MsmSig" = "8:_UNDEFINED" } @@ -298,7 +298,7 @@ "Entry" { "MsmKey" = "8:_1B2251DD757994082D5D85D7C9A38F82" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -309,12 +309,6 @@ } "Entry" { - "MsmKey" = "8:_1B2251DD757994082D5D85D7C9A38F82" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_1BC4692718F94CD799480D14260E2A0D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -363,12 +357,6 @@ } "Entry" { - "MsmKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_24119C3E255B44849B7051DE458A42AA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -532,7 +520,7 @@ "Entry" { "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -544,12 +532,6 @@ "Entry" { "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -664,12 +646,6 @@ "Entry" { "MsmKey" = "8:_4BD33B3CE11FBA409F994DAC22BFA8B3" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4BD33B3CE11FBA409F994DAC22BFA8B3" "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } @@ -1006,7 +982,7 @@ "Entry" { "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1018,12 +994,6 @@ "Entry" { "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -1126,7 +1096,7 @@ "Entry" { "MsmKey" = "8:_7C49A244BD86813B688A86097B64A4BB" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1137,12 +1107,6 @@ } "Entry" { - "MsmKey" = "8:_7C49A244BD86813B688A86097B64A4BB" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_7C66897615D04979AA00553FFBE9F869" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1186,7 +1150,7 @@ "Entry" { "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1198,12 +1162,6 @@ "Entry" { "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -1233,6 +1191,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,7 +1378,7 @@ "Entry" { "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1360,12 +1390,6 @@ "Entry" { "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -1414,7 +1438,7 @@ "Entry" { "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1426,12 +1450,6 @@ "Entry" { "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -1665,6 +1683,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,7 +1798,7 @@ "Entry" { "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1768,12 +1810,6 @@ "Entry" { "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -1828,7 +1864,7 @@ "Entry" { "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1840,12 +1876,6 @@ "Entry" { "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75" "OwnerKey" = "8:_1B2251DD757994082D5D85D7C9A38F82" "MsmSig" = "8:_UNDEFINED" } @@ -1923,30 +1953,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 +2031,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,7 +2146,7 @@ "Entry" { "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2224,12 +2158,6 @@ "Entry" { "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F" "OwnerKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" "MsmSig" = "8:_UNDEFINED" } @@ -2302,7 +2230,7 @@ "Entry" { "MsmKey" = "8:_EEEF3B4DA37D965DCA452A1E7B283C82" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2313,12 +2241,6 @@ } "Entry" { - "MsmKey" = "8:_EEEF3B4DA37D965DCA452A1E7B283C82" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_EF0C782C601F42DE8C7EF094FA4ED82E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2452,6 +2374,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" } @@ -2506,12 +2446,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1F23AE629378259BAD7F2BCAB42727AD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_1AC259E78F48430A97FB3A4F9B9A4E7E" "MsmSig" = "8:_UNDEFINED" } @@ -2524,42 +2458,24 @@ "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:_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.9.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.11.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.9.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=18.7.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular, Version=19.10.0.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=18.7.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular.Json, Version=19.10.0.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=18.7.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Core, Version=19.10.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" "ScatterAssemblies" { "_E6C48E30804B563751F799BDB82D2D5F" @@ -8620,7 +8505,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices, Version=18.7.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices, Version=19.10.0.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=18.7.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.10.0.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:{E54F6469-5DD6-44D2-B2A1-6441653FE1E3}" - "PackageCode" = "8:{A9BCA3FD-5912-4CB3-8995-602C9C031F2A}" + "ProductCode" = "8:{B6A3EEDB-7E3D-49F5-84AE-03DBF908BFBF}" + "PackageCode" = "8:{EB94B769-48A1-48A6-AA4C-82D0893FB382}" "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.9" + "ProductVersion" = "8:5.0.11" "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 849fd48..f0c8274 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.9.0")] -[assembly: AssemblyFileVersion("5.0.9.0")] +[assembly: AssemblyVersion("5.0.11.0")] +[assembly: AssemblyFileVersion("5.0.11.0")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index 0bbd2e2..a8b9ba6 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.9.0")] -[assembly: AssemblyFileVersion("5.0.9.0")] +[assembly: AssemblyVersion("5.0.11.0")] +[assembly: AssemblyFileVersion("5.0.11.0")] diff --git a/BismNormalizer/BismNormalizer.Tests/BismNormalizer.Tests.csproj b/BismNormalizer/BismNormalizer.Tests/BismNormalizer.Tests.csproj index 84e57e4..e251fb4 100644 --- a/BismNormalizer/BismNormalizer.Tests/BismNormalizer.Tests.csproj +++ b/BismNormalizer/BismNormalizer.Tests/BismNormalizer.Tests.csproj @@ -40,20 +40,20 @@ 4 - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.Core.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.Core.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.Tabular.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.Tabular.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll diff --git a/BismNormalizer/BismNormalizer.Tests/packages.config b/BismNormalizer/BismNormalizer.Tests/packages.config index 61085bb..d986cbd 100644 --- a/BismNormalizer/BismNormalizer.Tests/packages.config +++ b/BismNormalizer/BismNormalizer.Tests/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe index 13d903c..b5c0a09 100644 Binary files a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe and b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe differ diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.csproj b/BismNormalizer/BismNormalizer/BismNormalizer.csproj index 815b9a7..bfdb718 100644 --- a/BismNormalizer/BismNormalizer/BismNormalizer.csproj +++ b/BismNormalizer/BismNormalizer/BismNormalizer.csproj @@ -101,20 +101,20 @@ ..\packages\Microsoft.ApplicationInsights.WindowsServer.2.8.1\lib\net45\Microsoft.AI.WindowsServer.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.Core.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.Core.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.Tabular.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.Tabular.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.18.7.0.1\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.10.0\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll ..\packages\Microsoft.ApplicationInsights.2.8.1\lib\net46\Microsoft.ApplicationInsights.dll diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.exe b/BismNormalizer/BismNormalizer/BismNormalizer.exe index 99d8ad6..b837d24 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 0869371..dd1a59c 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.9.0")] -[assembly: AssemblyFileVersion("5.0.9.0")] +[assembly: AssemblyVersion("5.0.11.0")] +[assembly: AssemblyFileVersion("5.0.11.0")] diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/CalcDependencyCollection.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/CalcDependencyCollection.cs index a02e772..2d46f24 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/CalcDependencyCollection.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/CalcDependencyCollection.cs @@ -17,12 +17,23 @@ namespace BismNormalizer.TabularCompare.TabularMetadata public CalcDependencyCollection DependenciesReferenceFrom(CalcDependencyObjectType objectType, string tableName, string objectName) { CalcDependencyCollection returnVal = new CalcDependencyCollection(); + recursionCounter = 0; LookUpDependenciesReferenceFrom(objectType, tableName, objectName, returnVal); return returnVal; } + private const int RecursionCounterMax = 1000; + static int recursionCounter = 0; private void LookUpDependenciesReferenceFrom(CalcDependencyObjectType objectType, string tableName, string objectName, CalcDependencyCollection returnVal) { + recursionCounter++; + if (recursionCounter >= RecursionCounterMax) + { + Exception infRecursion = new Exception($"Calc dependencies infinite recursion detected for type \"{objectType}\", table \"{tableName}\", name \"{objectName}\"."); + Telemetry.TrackException(infRecursion); + throw infRecursion; + } + foreach (CalcDependency calcDependency in this) { if (calcDependency.ObjectType == objectType && calcDependency.TableName == tableName && calcDependency.ObjectName == objectName) diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs index b2249f2..8641b36 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs @@ -288,7 +288,8 @@ namespace BismNormalizer.TabularCompare.TabularMetadata char[] delimiterChars = { ' ', ',', ':', '=', '\t', '\n', '[', ']', '(', ')', '{', '}' }; - //9/2020: stack overflow exception fix was to add "Data" "Item" and "Source" to list of keywords + //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" }; foreach (MObject mObject in mObjects) @@ -2258,9 +2259,12 @@ namespace BismNormalizer.TabularCompare.TabularMetadata } } - //Need recalc even if created no tables in case of new relationships without tables - _database.Model.RequestRefresh(RefreshType.Calculate); - _database.Model.SaveChanges(); + if (_comparisonInfo.OptionsInfo.OptionProcessingOption != ProcessingOption.DoNotProcess) + { + //Need recalc even if created no tables in case of new relationships without tables + _database.Model.RequestRefresh(RefreshType.Calculate); + _database.Model.SaveChanges(); + } if (refreshType != RefreshType.Calculate) { diff --git a/BismNormalizer/BismNormalizer/packages.config b/BismNormalizer/BismNormalizer/packages.config index 25aceec..eb73b2b 100644 --- a/BismNormalizer/BismNormalizer/packages.config +++ b/BismNormalizer/BismNormalizer/packages.config @@ -2,7 +2,7 @@ - + diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index 25cc83d..58d4a01 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/