Merge branch 'release-7.2.13'

bovender · Nov 26, 2017 · 3efaaf9 · 3efaaf9
2 parents 04703e0 + d17ab50
commit 3efaaf9
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 35 deletions.
diff --git a/Tests/Properties/AssemblyInfo.cs b/Tests/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // 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("7.2.12.0")]
-[assembly: AssemblyFileVersion("7.2.12.0")]
+[assembly: AssemblyVersion("7.2.13.0")]
+[assembly: AssemblyFileVersion("7.2.13.0")]
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -74,7 +74,7 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.3.7\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.core">
@@ -105,8 +105,8 @@
     </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
-    <Reference Include="YamlDotNet, Version=4.1.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
-      <HintPath>..\packages\YamlDotNet.Signed.4.1.0\lib\net35\YamlDotNet.dll</HintPath>
+    <Reference Include="YamlDotNet, Version=4.2.1.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.Signed.4.2.1\lib\net35\YamlDotNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -209,4 +209,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/Tests/app.config b/Tests/app.config
@@ -35,7 +35,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Tests/packages.config b/Tests/packages.config
@@ -21,7 +21,7 @@
 <packages>
   <package id="Bovender" version="0.17.0.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
-  <package id="NLog" version="4.4.3" targetFramework="net40" />
+  <package id="NLog" version="4.4.12" targetFramework="net40" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net40" />
-  <package id="YamlDotNet.Signed" version="4.1.0" targetFramework="net40" />
+  <package id="YamlDotNet.Signed" version="4.2.1" targetFramework="net40" />
 </packages>
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-7.2.12
-7.2.12.0
+7.2.13
+7.2.13.0
diff --git a/XLToolbox/Excel/ViewModels/Instance.cs b/XLToolbox/Excel/ViewModels/Instance.cs
@@ -649,18 +649,28 @@ internal string LoadAddinFromEmbeddedResource(string resourceName)
                 {
                     Logger.Warn("LoadAddinFromEmbeddedResource: COM exception caught, falling back to CorruptLoad");
                     DisableDisplayAlerts();
+
+                    // Temporarily set locale to en-US to prevent errors on opening add-in
+                    // See https://stackoverflow.com/a/27756126/270712
+                    Logger.Info("LoadAddinFromEmbeddedResource: Temporarily setting locale to en-US");
+                    System.Globalization.CultureInfo oldLocale = System.Threading.Thread.CurrentThread.CurrentCulture;
+                    System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US");
+
                     try
                     {
-                        Workbooks.Open(addinPath, CorruptLoad: XlCorruptLoad.xlExtractData);
+                        // Workbooks.Open(addinPath, CorruptLoad: XlCorruptLoad.xlExtractData);
+                        Workbooks.Open(addinPath);
                     }
                     catch (System.Runtime.InteropServices.COMException e)
                     {
-                        Logger.Fatal("LoadAddinFromEmbeddedResource: COM exception occurred after calling Workbooks.Open");
+                        Logger.Fatal("LoadAddinFromEmbeddedResource: COM exception occurred when calling Workbooks.Open");
                         Logger.Fatal(e);
                         throw new XLToolbox.Excel.ExcelException("Excel failed to load the legacy Toolbox add-in", e);
                     }
                     finally
                     {
+                        Logger.Info("LoadAddinFromEmbeddedResource: Setting locale back to #{0}", oldLocale.ToString());
+                        System.Threading.Thread.CurrentThread.CurrentCulture = oldLocale;
                         EnableDisplayAlerts();
                     }
                 }

diff --git a/XLToolbox/Export/Exporter.cs b/XLToolbox/Export/Exporter.cs
@@ -339,7 +339,9 @@ private void ExportEmf(Metafile metafile)
             IntPtr handle = metafile.GetHenhmetafile();
             PercentCompleted = 50;
             Logger.Info("ExportEmf, handle: {0}", handle);
-            Bovender.Unmanaged.Pinvoke.CopyEnhMetaFile(handle, FileName);
+            IntPtr copy = Bovender.Unmanaged.Pinvoke.CopyEnhMetaFile(handle, FileName);
+            Logger.Info("Deleting meta file handle: {0}", copy);
+            Bovender.Unmanaged.Pinvoke.DeleteEnhMetaFile(copy);
             PercentCompleted = 100;
         }
 

diff --git a/XLToolbox/Export/ViewModels/BatchExportSettingsViewModel.cs b/XLToolbox/Export/ViewModels/BatchExportSettingsViewModel.cs
@@ -169,6 +169,7 @@ public bool IsOpenWorkbooksEnabled
             set
             {
                 _isOpenWorkbooksEnabled = value;
+                if (!value && Scope.AsEnum == BatchExportScope.OpenWorkbooks) Scope.AsEnum = BatchExportScope.ActiveWorkbook;
                 OnPropertyChanged("IsAllWorkbooksEnabled");
             }
         }
@@ -195,6 +196,7 @@ public bool IsChartsAndShapesEnabled
             set
             {
                 _isChartsAndShapesEnabled = value;
+                if (!value && Objects.AsEnum == BatchExportObjects.ChartsAndShapes) Objects.AsEnum = BatchExportObjects.Charts;
                 OnPropertyChanged("IsChartsAndShapesEnabled");
             }
         }
@@ -221,7 +223,8 @@ public bool IsSheetLayoutEnabled
             set
             {
                 _isSheetLayoutEnabled = value;
-                OnPropertyChanged("IsPreserveLayoutEnabled");
+                if (!value && Layout.AsEnum == BatchExportLayout.SheetLayout) Layout.AsEnum = BatchExportLayout.SingleItems;
+                OnPropertyChanged("IsSheetLayoutEnabled");
             }
         }
 

diff --git a/XLToolbox/Properties/AssemblyInfo.cs b/XLToolbox/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // 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("7.2.12.0")]
-[assembly: AssemblyFileVersion("7.2.12.0")]
+[assembly: AssemblyVersion("7.2.13.0")]
+[assembly: AssemblyFileVersion("7.2.13.0")]
diff --git a/XLToolbox/XLToolbox.csproj b/XLToolbox/XLToolbox.csproj
@@ -78,11 +78,11 @@
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.3.7\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net40\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.1\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
@@ -100,8 +100,8 @@
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
     <Reference Include="WindowsFormsIntegration" />
-    <Reference Include="YamlDotNet, Version=4.1.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
-      <HintPath>..\packages\YamlDotNet.Signed.4.1.0\lib\net35\YamlDotNet.dll</HintPath>
+    <Reference Include="YamlDotNet, Version=4.2.1.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.Signed.4.2.1\lib\net35\YamlDotNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/XLToolbox/app.config b/XLToolbox/app.config
@@ -89,7 +89,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/XLToolbox/packages.config b/XLToolbox/packages.config
@@ -21,7 +21,7 @@
 <packages>
   <package id="Bovender" version="0.17.0.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
-  <package id="NLog" version="4.4.3" targetFramework="net40" />
-  <package id="NUnit" version="3.6.0" targetFramework="net40" />
-  <package id="YamlDotNet.Signed" version="4.1.0" targetFramework="net40" />
+  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="NUnit" version="3.7.1" targetFramework="net40" />
+  <package id="YamlDotNet.Signed" version="4.2.1" targetFramework="net40" />
 </packages>
diff --git a/XLToolboxForExcel/Properties/AssemblyInfo.cs b/XLToolboxForExcel/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // 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("7.2.12.0")]
-[assembly: AssemblyFileVersion("7.2.12.0")]
+[assembly: AssemblyVersion("7.2.13.0")]
+[assembly: AssemblyFileVersion("7.2.13.0")]
 
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/XLToolboxForExcel/XLToolboxForExcel.csproj b/XLToolboxForExcel/XLToolboxForExcel.csproj
@@ -160,7 +160,7 @@
     </Reference>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.3.7\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
@@ -180,8 +180,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="WindowsBase" />
     <Reference Include="WindowsFormsIntegration" />
-    <Reference Include="YamlDotNet, Version=4.1.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
-      <HintPath>..\packages\YamlDotNet.Signed.4.1.0\lib\net35\YamlDotNet.dll</HintPath>
+    <Reference Include="YamlDotNet, Version=4.2.1.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.Signed.4.2.1\lib\net35\YamlDotNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -333,4 +333,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
diff --git a/XLToolboxForExcel/app.config b/XLToolboxForExcel/app.config
@@ -35,7 +35,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/XLToolboxForExcel/packages.config b/XLToolboxForExcel/packages.config
@@ -21,6 +21,6 @@
 <packages>
   <package id="Bovender" version="0.17.0.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
-  <package id="NLog" version="4.4.3" targetFramework="net40" />
-  <package id="YamlDotNet.Signed" version="4.1.0" targetFramework="net40" />
+  <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="YamlDotNet.Signed" version="4.2.1" targetFramework="net40" />
 </packages>