Merge branch 'release-7.3.1'

bovender · Sep 6, 2018 · bca812b · bca812b
2 parents 1ff2a4c + 0a263a2
commit bca812b
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 38 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.0.0")]
-[assembly: AssemblyFileVersion("7.3.0.0")]
+[assembly: AssemblyVersion("7.3.1.0")]
+[assembly: AssemblyFileVersion("7.3.1.0")]
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -56,13 +56,11 @@
       <Name>Bovender</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <Reference Include="Bovender, Version=0.17.2.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.17.2.0\lib\net40\Bovender.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
+    <Reference Include="Bovender, Version=0.17.3.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bovender.0.17.3\lib\net40\Bovender.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>

diff --git a/Tests/packages.config b/Tests/packages.config
@@ -19,7 +19,7 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.17.2.0" targetFramework="net40" />
+  <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="NUnitTestAdapter" version="2.0.0" targetFramework="net40" />

diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-7.3.0
-7.3.0.0
+7.3.1
+7.3.1.0
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.0.0")]
-[assembly: AssemblyFileVersion("7.3.0.0")]
+[assembly: AssemblyVersion("7.3.1.0")]
+[assembly: AssemblyFileVersion("7.3.1.0")]
diff --git a/XLToolbox/XLToolbox.csproj b/XLToolbox/XLToolbox.csproj
@@ -53,19 +53,11 @@
       <Name>Bovender</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29|AnyCPU'">
-    <Reference Include="Bovender, Version=0.17.2.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.17.2.0\lib\net40\Bovender.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <Reference Include="Bovender, Version=0.17.2.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.17.2.0\lib\net40\Bovender.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
+    <Reference Include="Bovender, Version=0.17.3.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bovender.0.17.3\lib\net40\Bovender.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="FreeImageNET">
       <HintPath>..\FreeImage\Wrapper\FreeImage.NET\cs\Library\bin\Debug\FreeImageNET.dll</HintPath>
     </Reference>

diff --git a/XLToolbox/packages.config b/XLToolbox/packages.config
@@ -19,7 +19,7 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.17.2.0" targetFramework="net40" />
+  <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="NUnit" version="3.7.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.3.0.0")]
-[assembly: AssemblyFileVersion("7.3.0.0")]
+[assembly: AssemblyVersion("7.3.1.0")]
+[assembly: AssemblyFileVersion("7.3.1.0")]
 
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/XLToolboxForExcel/XLToolboxForExcel.csproj b/XLToolboxForExcel/XLToolboxForExcel.csproj
@@ -138,14 +138,12 @@
       <Name>Bovender</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <Reference Include="Bovender, Version=0.17.2.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Bovender.0.17.2.0\lib\net40\Bovender.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
+    <Reference Include="Bovender, Version=0.17.3.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bovender.0.17.3\lib\net40\Bovender.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <Private>True</Private>
     </Reference>

diff --git a/XLToolboxForExcel/packages.config b/XLToolboxForExcel/packages.config
@@ -18,7 +18,7 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.17.2.0" targetFramework="net40" />
+  <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" />

diff --git a/publish/Gemfile b/publish/Gemfile
@@ -2,3 +2,4 @@ source "https://rubygems.org"
 
 gem 'octokit', '~> 4.0'
 gem 'netrc'
+gem 'mime-types'
diff --git a/publish/VstoAddinInstaller b/publish/VstoAddinInstaller
diff --git a/publish/create-release.rb b/publish/create-release.rb
@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 # Creates an XL Toolbox NG release on GitHub
-# (c) 2016 Daniel Kraus (bovender)
+# (c) 2016-2018 Daniel Kraus (bovender)
 
 require 'octokit'
 

diff --git a/publish/make-installer.iss b/publish/make-installer.iss
@@ -1,6 +1,6 @@
 ; #define DEBUG
 #define VERSIONFILE "..\VERSION"
-#define PUB_YEARS "2017"
+#define PUB_YEARS "2014-2018"
 #define TARGET_HOST "excel"
 #define APP_GUID "{{35AD3250-5F75-4C7D-BCE0-41377E280430}"
 #define ADDIN_NAME "Daniel's XL Toolbox"
-Original file line number
+Diff line change
@@ -1,2 +1,2 @@
-.3.0
-.3.0.0
+.3.1
+.3.1.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@ source "https://rubygems.org"

		gem 'octokit', '~> 4.0'
		gem 'netrc'
		gem 'mime-types'