Bugfix RibbonTools localize

harborsiem · Nov 27, 2023 · 3f49708 · 3f49708
1 parent 4b73713
commit 3f49708
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+### RibbonTools V1.7.1
+
+#### Changed (RibbonTools)
+
+- Bugfix for Localize.
+
 ### Ribbon V2.15.0 RibbonTools V1.7.0
 
 #### Changed (Ribbon)

diff --git a/RibbonTools/Build/ResXReader.cs b/RibbonTools/Build/ResXReader.cs
@@ -79,7 +79,7 @@ public string GetString(string key)
             if (valueNavigator == null)
                 return null;
 
-            var result = valueNavigator.Value;
+            var result = valueNavigator.InnerXml; //.Value;
             return result;
         }
 

diff --git a/RibbonTools/CommandsFrame.Designer.cs b/RibbonTools/CommandsFrame.Designer.cs
diff --git a/RibbonTools/Properties/AssemblyInfo.cs b/RibbonTools/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.7.0.0")]
+[assembly: AssemblyFileVersion("1.7.1.0")]
diff --git a/Setup/RibbonTools.wxs b/Setup/RibbonTools.wxs
@@ -9,7 +9,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
      xmlns:WixUI="http://schemas.microsoft.com/wix/UIExtension">
-  <Product Id="{905B0164-4445-46A8-82A7-BCC9F8B08393}" Name="RibbonTools" Language="1033" Version="1.7.0.0" Manufacturer="RibbonLib" UpgradeCode="8D7B31EC-7EA5-4A82-A4AB-31E2B98A3D21">
+  <Product Id="{FB097045-4E9A-4CE0-A969-02B340D0FDB4}" Name="RibbonTools" Language="1033" Version="1.7.1.0" Manufacturer="RibbonLib" UpgradeCode="8D7B31EC-7EA5-4A82-A4AB-31E2B98A3D21">
     <Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine" Platform="x86" Description="Design, Build and Preview the Ribbon" />
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />