Merge branch 'release-7.1.4'

bovender · Sep 15, 2016 · 34fb191 · 34fb191
2 parents 9136c50 + b433e58
commit 34fb191
Show file tree

Hide file tree

Showing 13 changed files with 99 additions and 25 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.1.3.0")]
-[assembly: AssemblyFileVersion("7.1.3.0")]
+[assembly: AssemblyVersion("7.1.4.0")]
+[assembly: AssemblyFileVersion("7.1.4.0")]
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -57,15 +57,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29'">
-    <Reference Include="Bovender, Version=0.14.5.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.14.6.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.14.5.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.14.6.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <Reference Include="Bovender, Version=0.14.5.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.14.6.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.14.5.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.14.6.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Tests/packages.config b/Tests/packages.config
@@ -19,7 +19,7 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.14.5.0" targetFramework="net40" />
+  <package id="Bovender" version="0.14.6.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
   <package id="NLog" version="4.3.7" targetFramework="net40" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net40" />

diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-7.1.3
-7.1.3.0
+7.1.4
+7.1.4.0
diff --git a/XLToolbox/Excel/ExcelException.cs b/XLToolbox/Excel/ExcelException.cs
@@ -0,0 +1,35 @@
+/* ExcelException.cs
+ * part of Daniel's XL Toolbox NG
+ * 
+ * Copyright 2014-2016 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.Excel
+{
+    [Serializable]
+    class ExcelException : Exception
+    {
+        public ExcelException() { }
+        public ExcelException(string message) : base(message) { }
+        public ExcelException(string message,
+            Exception innerException)
+            : base(message, innerException) { }
+        public ExcelException(SerializationInfo info,
+            StreamingContext context)
+            : base(info, context) { }
+    }
+}
diff --git a/XLToolbox/Excel/ViewModels/Instance.cs b/XLToolbox/Excel/ViewModels/Instance.cs
@@ -147,6 +147,10 @@ public Application Application
             [DebuggerStepThrough]
             get
             {
+                if (_application == null)
+                {
+                    Logger.Warn("Application_get: Returning null!");
+                }
                 return _application;
             }
         }
@@ -535,9 +539,15 @@ public Workbook FindWorkbook(string workbookName)
             Workbook wb = null;
             try
             {
+                Logger.Debug("FindWorkbook: Looking for {0}", workbookName);
                 wb = Workbooks[workbookName];
             }
-            catch { }
+            catch (Exception e)
+            {
+                Logger.Debug("FindWorkbook: Caught an exception");
+                Logger.Debug(e);
+                Logger.Debug("FindWorkbook: Evidently \"{0}\" is not open", workbookName);
+            }
             return wb;
         }
 
@@ -606,7 +616,31 @@ internal string LoadAddinFromEmbeddedResource(string resourceName)
                 resourceStream.CopyTo(tempStream);
                 tempStream.Close();
                 resourceStream.Close();
-                Workbooks.Open(addinPath, CorruptLoad: XlCorruptLoad.xlExtractData);
+                try
+                {
+                    Logger.Info("LoadAddinFromEmbeddedResource: Loading...");
+                    Workbooks.Open(addinPath);
+                }
+                catch (System.Runtime.InteropServices.COMException)
+                {
+                    Logger.Warn("LoadAddinFromEmbeddedResource: COM exception caught, falling back to CorruptLoad");
+                    DisableDisplayAlerts();
+                    try
+                    {
+                        Workbooks.Open(addinPath, CorruptLoad: XlCorruptLoad.xlExtractData);
+                    }
+                    catch (System.Runtime.InteropServices.COMException e)
+                    {
+                        Logger.Fatal("LoadAddinFromEmbeddedResource: COM exception occurred after calling Workbooks.Open");
+                        Logger.Fatal(e);
+                        throw new XLToolbox.Excel.ExcelException("Excel failed to load the legacy Toolbox add-in", e);
+                    }
+                    finally
+                    {
+                        EnableDisplayAlerts();
+                    }
+                }
+
                 Logger.Info("LoadAddinFromEmbeddedResource: Loaded {0}", addinPath);
             }
             else
@@ -647,6 +681,10 @@ public Instance() : base() { }
         public Instance(Application application)
             : this()
         {
+            if (application == null)
+            {
+                Logger.Warn("Instance(Application): Got null value!");
+            }
             _application = application;
         }
 

diff --git a/XLToolbox/Legacy/XLToolboxLegacyAddin.xlam b/XLToolbox/Legacy/XLToolboxLegacyAddin.xlam
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.1.3.0")]
-[assembly: AssemblyFileVersion("7.1.3.0")]
+[assembly: AssemblyVersion("7.1.4.0")]
+[assembly: AssemblyFileVersion("7.1.4.0")]
diff --git a/XLToolbox/XLToolbox.csproj b/XLToolbox/XLToolbox.csproj
@@ -54,15 +54,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29|AnyCPU'">
-    <Reference Include="Bovender, Version=0.14.5.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.14.6.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.14.5.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.14.6.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <Reference Include="Bovender, Version=0.14.5.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.14.6.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.14.5.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.14.6.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -225,6 +225,7 @@
     </Compile>
     <Compile Include="Keyboard\ShortcutViewModel.cs" />
     <Compile Include="Keyboard\ShortcutViewModelCollection.cs" />
+    <Compile Include="Excel\ExcelException.cs" />
     <Compile Include="Legacy\LegacyToolbox.cs" />
     <Compile Include="Logging\IncompleteShutdownLoggingDisabled.xaml.cs">
       <DependentUpon>IncompleteShutdownLoggingDisabled.xaml</DependentUpon>

diff --git a/XLToolbox/packages.config b/XLToolbox/packages.config
@@ -19,7 +19,7 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.14.5.0" targetFramework="net40" />
+  <package id="Bovender" version="0.14.6.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
   <package id="NLog" version="4.3.7" targetFramework="net40" />
   <package id="NUnit" version="3.4.1" targetFramework="net40" />

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.1.3.0")]
-[assembly: AssemblyFileVersion("7.1.3.0")]
+[assembly: AssemblyVersion("7.1.4.0")]
+[assembly: AssemblyFileVersion("7.1.4.0")]
 
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/XLToolboxForExcel/XLToolboxForExcel.csproj b/XLToolboxForExcel/XLToolboxForExcel.csproj
@@ -139,15 +139,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29'">
-    <Reference Include="Bovender, Version=0.14.5.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.14.6.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.14.5.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.14.6.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <Reference Include="Bovender, Version=0.14.5.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.14.6.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.14.5.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.14.6.0\lib\net40\Bovender.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/XLToolboxForExcel/packages.config b/XLToolboxForExcel/packages.config
@@ -19,7 +19,7 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.14.5.0" targetFramework="net40" />
+  <package id="Bovender" version="0.14.6.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
   <package id="NLog" version="4.3.7" targetFramework="net40" />
   <package id="YamlDotNet.Signed" version="3.9.0" targetFramework="net40" />