Skip to content

Commit

Permalink
Merge branch 'release-7.2.9'
Browse files Browse the repository at this point in the history
  • Loading branch information
bovender committed Feb 15, 2017
2 parents 02b16fa + 5b3d1cc commit abbcbcc
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ publish:
git push --tags
publish/create-release.rb
update-bovender:
find XLToolbox XLToolboxForExcel Tests -name '*.csproj' -o -name 'packages.config' -print0 | xargs -0 sed -i 's/0\.16\.0/0.16.1/'
find XLToolbox XLToolboxForExcel Tests -name '*.csproj' -o -name 'packages.config' -print0 | xargs -0 sed -i 's/0\.16\.1/0.16.2/'
4 changes: 2 additions & 2 deletions Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.0")]
[assembly: AssemblyFileVersion("7.2.8.0")]
[assembly: AssemblyVersion("7.2.9.0")]
[assembly: AssemblyFileVersion("7.2.9.0")]
10 changes: 5 additions & 5 deletions Tests/Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29'">
<Reference Include="Bovender, Version=0.16.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<Reference Include="Bovender, Version=0.16.2.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Bovender.0.16.0.0\lib\net40\Bovender.dll</HintPath>
<HintPath>..\packages\Bovender.0.16.2.0\lib\net40\Bovender.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release'">
<Reference Include="Bovender, Version=0.16.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<Reference Include="Bovender, Version=0.16.2.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Bovender.0.16.0.0\lib\net40\Bovender.dll</HintPath>
<HintPath>..\packages\Bovender.0.16.2.0\lib\net40\Bovender.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -209,4 +209,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion Tests/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
limitations under the License.
-->
<packages>
<package id="Bovender" version="0.16.1.0" targetFramework="net40" />
<package id="Bovender" version="0.16.2.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" />
Expand Down
4 changes: 2 additions & 2 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
7.2.8
7.2.8.0
7.2.9
7.2.9.0
4 changes: 2 additions & 2 deletions XLToolbox/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.0")]
[assembly: AssemblyFileVersion("7.2.8.0")]
[assembly: AssemblyVersion("7.2.9.0")]
[assembly: AssemblyFileVersion("7.2.9.0")]
10 changes: 5 additions & 5 deletions XLToolbox/XLToolbox.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29|AnyCPU'">
<Reference Include="Bovender, Version=0.16.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<Reference Include="Bovender, Version=0.16.2.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Bovender.0.16.0.0\lib\net40\Bovender.dll</HintPath>
<HintPath>..\packages\Bovender.0.16.2.0\lib\net40\Bovender.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release'">
<Reference Include="Bovender, Version=0.16.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<Reference Include="Bovender, Version=0.16.2.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Bovender.0.16.0.0\lib\net40\Bovender.dll</HintPath>
<HintPath>..\packages\Bovender.0.16.2.0\lib\net40\Bovender.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -559,4 +559,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
Expand Down
2 changes: 1 addition & 1 deletion XLToolbox/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
limitations under the License.
-->
<packages>
<package id="Bovender" version="0.16.1.0" targetFramework="net40" />
<package id="Bovender" version="0.16.2.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" />
Expand Down
4 changes: 2 additions & 2 deletions XLToolboxForExcel/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.0")]
[assembly: AssemblyFileVersion("7.2.8.0")]
[assembly: AssemblyVersion("7.2.9.0")]
[assembly: AssemblyFileVersion("7.2.9.0")]

[assembly: NeutralResourcesLanguageAttribute("en-US")]
10 changes: 5 additions & 5 deletions XLToolboxForExcel/XLToolboxForExcel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,15 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Debug %28Bovender via NuGet%29'">
<Reference Include="Bovender, Version=0.16.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<Reference Include="Bovender, Version=0.16.2.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Bovender.0.16.0.0\lib\net40\Bovender.dll</HintPath>
<HintPath>..\packages\Bovender.0.16.2.0\lib\net40\Bovender.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release'">
<Reference Include="Bovender, Version=0.16.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<Reference Include="Bovender, Version=0.16.2.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Bovender.0.16.0.0\lib\net40\Bovender.dll</HintPath>
<HintPath>..\packages\Bovender.0.16.2.0\lib\net40\Bovender.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -333,4 +333,4 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>
2 changes: 1 addition & 1 deletion XLToolboxForExcel/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
limitations under the License.
-->
<packages>
<package id="Bovender" version="0.16.1.0" targetFramework="net40" />
<package id="Bovender" version="0.16.2.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" />
Expand Down

0 comments on commit abbcbcc

Please sign in to comment.