diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs index a11a9e3..2734fa1 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.21.0")] -[assembly: AssemblyFileVersion("5.0.21.0")] +[assembly: AssemblyVersion("5.0.22.0")] +[assembly: AssemblyFileVersion("5.0.22.0")] diff --git a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj index b5b2cf6..7bf19fa 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,13 +34,13 @@ "Entry" { "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -292,13 +298,13 @@ "Entry" { "MsmKey" = "8:_1B2251DD757994082D5D85D7C9A38F82" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_1B2251DD757994082D5D85D7C9A38F82" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -514,13 +520,13 @@ "Entry" { "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -976,13 +982,13 @@ "Entry" { "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1090,13 +1096,13 @@ "Entry" { "MsmKey" = "8:_7C49A244BD86813B688A86097B64A4BB" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_7C49A244BD86813B688A86097B64A4BB" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1144,13 +1150,13 @@ "Entry" { "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1185,78 +1191,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" @@ -1372,13 +1306,13 @@ "Entry" { "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1432,13 +1366,13 @@ "Entry" { "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1677,30 +1611,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" @@ -1792,13 +1702,13 @@ "Entry" { "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1858,13 +1768,13 @@ "Entry" { "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1947,6 +1857,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" @@ -2025,6 +1959,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" @@ -2140,13 +2146,13 @@ "Entry" { "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2224,13 +2230,13 @@ "Entry" { "MsmKey" = "8:_EEEF3B4DA37D965DCA452A1E7B283C82" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_EEEF3B4DA37D965DCA452A1E7B283C82" - "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2368,24 +2374,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" } @@ -2452,18 +2440,6 @@ "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" } @@ -2476,6 +2452,30 @@ "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" } @@ -2758,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" } @@ -2770,7 +2770,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.20.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.21.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" "ScatterAssemblies" { "_0020EC0A2900F50F0F5DCC3E7BBE4237" @@ -6048,37 +6048,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 +7078,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 +7713,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 +7906,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 +9173,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Power BI ALM Toolkit" - "ProductCode" = "8:{0CD8B236-42D7-4C31-9757-C8FCE0D48E4B}" - "PackageCode" = "8:{B1F45D6E-1B1F-42F4-ADC2-0D050719C8BD}" + "ProductCode" = "8:{2FF30E49-E722-42F0-BFCF-E2C44813FC96}" + "PackageCode" = "8:{30E09E07-98BA-41F7-8D24-3A49E2AF8E60}" "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.21" + "ProductVersion" = "8:5.0.22" "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 99b51e6..03447b1 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.21.0")] -[assembly: AssemblyFileVersion("5.0.21.0")] +[assembly: AssemblyVersion("5.0.22.0")] +[assembly: AssemblyFileVersion("5.0.22.0")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index 680d8b1..7eff4e0 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.21.0")] -[assembly: AssemblyFileVersion("5.0.21.0")] +[assembly: AssemblyVersion("5.0.22.0")] +[assembly: AssemblyFileVersion("5.0.22.0")] diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe index 54c46cd..280f76e 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 002d84a..025b394 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 3280303..7649b72 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.21.0")] -[assembly: AssemblyFileVersion("5.0.21.0")] +[assembly: AssemblyVersion("5.0.22.0")] +[assembly: AssemblyFileVersion("5.0.22.0")] diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs index d0d8e9c..7eab542 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs @@ -521,10 +521,21 @@ namespace BismNormalizer.TabularCompare.TabularMetadata Culture cultureTarget = _targetTabularModel.Cultures.FindByName(cultureSource.Name); ComparisonObject comparisonObjectCulture; + string sourceLinguisticMetadata = String.Empty; + string targetLinguisticMetadata = String.Empty; + if (cultureSource.TomCulture?.LinguisticMetadata?.Content != null) + sourceLinguisticMetadata = Newtonsoft.Json.Linq.JToken.Parse(cultureSource.TomCulture.LinguisticMetadata.Content).ToString(); + if (cultureTarget.TomCulture?.LinguisticMetadata?.Content != null) + targetLinguisticMetadata = Newtonsoft.Json.Linq.JToken.Parse(cultureTarget.TomCulture.LinguisticMetadata.Content).ToString(); + // check if culture object definition is different //if (cultureSource.ObjectDefinition != cultureTarget.ObjectDefinition) - if ((_comparisonInfo.OptionsInfo.OptionMergeCultures && cultureTarget.ContainsOtherCultureTranslations(cultureSource)) || - (!_comparisonInfo.OptionsInfo.OptionMergeCultures && cultureTarget.ContainsOtherCultureTranslations(cultureSource) && cultureSource.ContainsOtherCultureTranslations(cultureTarget))) + if ( ( + (_comparisonInfo.OptionsInfo.OptionMergeCultures && cultureTarget.ContainsOtherCultureTranslations(cultureSource)) || + (!_comparisonInfo.OptionsInfo.OptionMergeCultures && cultureTarget.ContainsOtherCultureTranslations(cultureSource) && cultureSource.ContainsOtherCultureTranslations(cultureTarget)) + ) && + (sourceLinguisticMetadata == targetLinguisticMetadata) + ) { // they are equal, ... comparisonObjectCulture = new ComparisonObject(ComparisonObjectType.Culture, ComparisonObjectStatus.SameDefinition, cultureSource, cultureTarget, MergeAction.Skip); diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs index 9ed51a7..21f114d 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs @@ -1808,6 +1808,16 @@ namespace BismNormalizer.TabularCompare.TabularMetadata } } } + + if (tomCultureSource.LinguisticMetadata != null) + { + LinguisticMetadata linguisticMetadata = tomCultureSource.LinguisticMetadata.Clone(); + tomCultureTarget.LinguisticMetadata = linguisticMetadata; + } + else + { + tomCultureTarget.LinguisticMetadata = null; + } } #endregion diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index a511a63..3db5202 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/