Merge branch 'release-7.3.3'

bovender · Oct 29, 2018 · d56066d · d56066d
2 parents dfa8c8d + bb4c071
commit d56066d
Show file tree

Hide file tree

Showing 16 changed files with 158 additions and 107 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.3.2.0")]
-[assembly: AssemblyFileVersion("7.3.2.0")]
+[assembly: AssemblyVersion("7.3.3.0")]
+[assembly: AssemblyFileVersion("7.3.3.0")]
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -97,8 +97,8 @@
     </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
-    <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>
+    <Reference Include="YamlDotNet, Version=5.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.Signed.5.2.1\lib\net35\YamlDotNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

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.2.1.0" newVersion="4.2.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Tests/packages.config b/Tests/packages.config
@@ -23,5 +23,5 @@
   <package id="Expression.Blend.Sdk" version="1.0.2" 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.2.1" targetFramework="net40" />
+  <package id="YamlDotNet.Signed" version="5.2.1" targetFramework="net40" />
 </packages>
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-7.3.2
-7.3.2.0
+7.3.3
+7.3.3.0
diff --git a/XLToolbox/Legacy/LegacyToolbox.cs b/XLToolbox/Legacy/LegacyToolbox.cs
@@ -150,94 +150,102 @@ protected void Dispose(bool calledFromPublicMethod)
         public void RunCommand(Command command)
         {
             Microsoft.Office.Interop.Excel.Application app = Instance.Default.Application;
-            switch (command)
+            try
             {
-                case Command.JumpToTarget:
-                    app.Run("RunOpenFromCell");
-                    break;
-                case Command.CopyPageSetup:
-                    app.Run("RunCopyPageSetup");
-                    break;
-                case Command.SelectAllShapes:
-                    app.Run("RunSelectAllShapes");
-                    break;
-                case Command.Anova1Way:
-                    app.Run("RunANOVA");
-                    break;
-                case Command.Anova2Way:
-                    app.Run("RunANOVA2Way");
-                    break;
-                case Command.FormulaBuilder:
-                    app.Run("RunFormulaBuilder");
-                    break;
-                case Command.SelectionAssistant:
-                    app.Run("RunSelectionAssistant");
-                    break;
-                case Command.LinearRegression:
-                    app.Run("RunLinearRegression");
-                    break;
-                case Command.Correlation:
-                    app.Run("RunCorrelation");
-                    break;
-                case Command.TransposeWizard:
-                    app.Run("RunTransposeWizard");
-                    break;
-                case Command.MultiHisto:
-                    app.Run("RunMultiHistogram");
-                    break;
-                case Command.Allocate:
-                    app.Run("RunGroupAllocation");
-                    break;
-                case Command.AutomaticErrorBars:
-                    app.Run("RunErrorBarsAuto");
-                    break;
-                case Command.InteractiveErrorBars:
-                    app.Run("RunErrorBarsInteractive");
-                    break;
-                case Command.ChartDesign:
-                    app.Run("RunChartDesign");
-                    break;
-                case Command.MoveDataSeriesLeft:
-                    app.Run("RunMoveDataSeriesLeft");
-                    break;
-                case Command.MoveDataSeriesRight:
-                    app.Run("RunMoveDataSeriesRight");
-                    break;
-                case Command.Annotate:
-                    app.Run("RunChartAnnotation");
-                    break;
-                case Command.SpreadScatter:
-                    app.Run("RunSpreadScatter");
-                    break;
-                case Command.SeriesToFront:
-                    app.Run("RunSeriesToFront");
-                    break;
-                case Command.SeriesForward:
-                    app.Run("RunSeriesForward");
-                    break;
-                case Command.SeriesBackward:
-                    app.Run("RunSeriesBackward");
-                    break;
-                case Command.SeriesToBack:
-                    app.Run("RunSeriesToBack");
-                    break;
-                case Command.AddSeries:
-                    app.Run("RunAddSeries");
-                    break;
-                case Command.CopyChart:
-                    app.Run("RunCopyChart");
-                    break;
-                case Command.PointChart:
-                    app.Run("RunPointChart");
-                    break;
-                case Command.Watermark:
-                    app.Run("RunWatermark");
-                    break;
-                case Command.LegacyPrefs:
-                    app.Run("RunPreferences");
-                    break;
-                default:
-                    throw new InvalidOperationException("Unknown legacy command " + command.ToString());
+                switch (command)
+                {
+                    case Command.JumpToTarget:
+                        app.Run("RunOpenFromCell");
+                        break;
+                    case Command.CopyPageSetup:
+                        app.Run("RunCopyPageSetup");
+                        break;
+                    case Command.SelectAllShapes:
+                        app.Run("RunSelectAllShapes");
+                        break;
+                    case Command.Anova1Way:
+                        app.Run("RunANOVA");
+                        break;
+                    case Command.Anova2Way:
+                        app.Run("RunANOVA2Way");
+                        break;
+                    case Command.FormulaBuilder:
+                        app.Run("RunFormulaBuilder");
+                        break;
+                    case Command.SelectionAssistant:
+                        app.Run("RunSelectionAssistant");
+                        break;
+                    case Command.LinearRegression:
+                        app.Run("RunLinearRegression");
+                        break;
+                    case Command.Correlation:
+                        app.Run("RunCorrelation");
+                        break;
+                    case Command.TransposeWizard:
+                        app.Run("RunTransposeWizard");
+                        break;
+                    case Command.MultiHisto:
+                        app.Run("RunMultiHistogram");
+                        break;
+                    case Command.Allocate:
+                        app.Run("RunGroupAllocation");
+                        break;
+                    case Command.AutomaticErrorBars:
+                        app.Run("RunErrorBarsAuto");
+                        break;
+                    case Command.InteractiveErrorBars:
+                        app.Run("RunErrorBarsInteractive");
+                        break;
+                    case Command.ChartDesign:
+                        app.Run("RunChartDesign");
+                        break;
+                    case Command.MoveDataSeriesLeft:
+                        app.Run("RunMoveDataSeriesLeft");
+                        break;
+                    case Command.MoveDataSeriesRight:
+                        app.Run("RunMoveDataSeriesRight");
+                        break;
+                    case Command.Annotate:
+                        app.Run("RunChartAnnotation");
+                        break;
+                    case Command.SpreadScatter:
+                        app.Run("RunSpreadScatter");
+                        break;
+                    case Command.SeriesToFront:
+                        app.Run("RunSeriesToFront");
+                        break;
+                    case Command.SeriesForward:
+                        app.Run("RunSeriesForward");
+                        break;
+                    case Command.SeriesBackward:
+                        app.Run("RunSeriesBackward");
+                        break;
+                    case Command.SeriesToBack:
+                        app.Run("RunSeriesToBack");
+                        break;
+                    case Command.AddSeries:
+                        app.Run("RunAddSeries");
+                        break;
+                    case Command.CopyChart:
+                        app.Run("RunCopyChart");
+                        break;
+                    case Command.PointChart:
+                        app.Run("RunPointChart");
+                        break;
+                    case Command.Watermark:
+                        app.Run("RunWatermark");
+                        break;
+                    case Command.LegacyPrefs:
+                        app.Run("RunPreferences");
+                        break;
+                    default:
+                        throw new InvalidOperationException("Unknown legacy command " + command.ToString());
+                }
+
+            }
+            catch (System.Runtime.InteropServices.COMException e)
+            {
+                throw new UnhandledLegacyException(String.Format("Unhandled VBA exception in #{0}", Vba.Api.Default.LastLog), e);
             }
         }
 

diff --git a/XLToolbox/Legacy/UnhandledLegacyException.cs b/XLToolbox/Legacy/UnhandledLegacyException.cs
@@ -0,0 +1,35 @@
+/* Exception1.cs
+ * part of Daniel's XL Toolbox NG
+ * 
+ * Copyright 2014-2018 Daniel Kraus
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using System.Runtime.Serialization;
+
+namespace XLToolbox.Legacy
+{
+    [Serializable]
+    class UnhandledLegacyException : Exception
+    {
+        public UnhandledLegacyException() { }
+        public UnhandledLegacyException(string message) : base(message) { }
+        public UnhandledLegacyException(string message,
+            Exception innerException)
+            : base(message, innerException) { }
+        public UnhandledLegacyException(SerializationInfo info,
+            StreamingContext context)
+            : base(info, context) { }
+    }
+}
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.3.2.0")]
-[assembly: AssemblyFileVersion("7.3.2.0")]
+[assembly: AssemblyVersion("7.3.3.0")]
+[assembly: AssemblyFileVersion("7.3.3.0")]
diff --git a/XLToolbox/Vba/Api.cs b/XLToolbox/Vba/Api.cs
@@ -60,6 +60,12 @@ public static Api Default
 
         #endregion
 
+        #region Public properties
+
+        public string LastLog { get; protected set; }
+
+        #endregion
+
         #region API methods
 
         /// <summary>
@@ -184,6 +190,7 @@ public void ShowException(string message)
         /// </summary>
         public void Log(string message)
         {
+            LastLog = message;
             Logger.Info(String.Format("Log(\"{0}\")", message));
         }
 

diff --git a/XLToolbox/XLToolbox.csproj b/XLToolbox/XLToolbox.csproj
@@ -92,8 +92,8 @@
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
     <Reference Include="WindowsFormsIntegration" />
-    <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>
+    <Reference Include="YamlDotNet, Version=5.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.Signed.5.2.1\lib\net35\YamlDotNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -223,6 +223,7 @@
     <Compile Include="Keyboard\ShortcutViewModel.cs" />
     <Compile Include="Keyboard\ShortcutViewModelCollection.cs" />
     <Compile Include="Excel\ExcelException.cs" />
+    <Compile Include="Legacy\UnhandledLegacyException.cs" />
     <Compile Include="Legacy\LegacyToolbox.cs" />
     <Compile Include="Logging\IncompleteShutdownLoggingDisabled.xaml.cs">
       <DependentUpon>IncompleteShutdownLoggingDisabled.xaml</DependentUpon>

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.2.1.0" newVersion="4.2.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/XLToolbox/packages.config b/XLToolbox/packages.config
@@ -23,5 +23,5 @@
   <package id="Expression.Blend.Sdk" version="1.0.2" 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" />
+  <package id="YamlDotNet.Signed" version="5.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.3.2.0")]
-[assembly: AssemblyFileVersion("7.3.2.0")]
+[assembly: AssemblyVersion("7.3.3.0")]
+[assembly: AssemblyFileVersion("7.3.3.0")]
 
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/XLToolboxForExcel/XLToolboxForExcel.csproj b/XLToolboxForExcel/XLToolboxForExcel.csproj
@@ -172,8 +172,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="WindowsBase" />
     <Reference Include="WindowsFormsIntegration" />
-    <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>
+    <Reference Include="YamlDotNet, Version=5.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.Signed.5.2.1\lib\net35\YamlDotNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

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

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