Fixed a merge mistake regarding the Geckofx package version

This commit is contained in:
David Sparer
2016-07-14 10:48:15 -06:00
parent 6c5d629a88
commit 266e79a2c3
2 changed files with 5 additions and 5 deletions

View File

@@ -49,9 +49,9 @@
<Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
<HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Geckofx-Core, Version=45.0.19.0, Culture=neutral, PublicKeyToken=3209ac31600d1857, processorArchitecture=x86">
<HintPath>..\packages\Geckofx45.45.0.19.0\lib\net40\Geckofx-Core.dll</HintPath>
</Reference>
<Reference Include="Geckofx-Core, Version=45.0.20.0, Culture=neutral, PublicKeyToken=3209ac31600d1857, processorArchitecture=x86">
<HintPath>..\packages\Geckofx45.45.0.20\lib\net40\Geckofx-Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Geckofx-Winforms, Version=45.0.20.0, Culture=neutral, PublicKeyToken=3209ac31600d1857, processorArchitecture=MSIL">
@@ -1295,4 +1295,4 @@ IF %25buildenv: =%25==ReleasePortable ("$(SolutionDir)Tools\build-relport.cmd")<
</PropertyGroup>
<Error Condition="!Exists('..\packages\Geckofx45.45.0.20\build\Geckofx45.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Geckofx45.45.0.20\build\Geckofx45.targets'))" />
</Target>
</Project>
</Project>

View File

@@ -4,4 +4,4 @@
<package id="DockPanelSuite" version="2.10.0" targetFramework="net40" />
<package id="DockPanelSuite.ThemeVS2012Light" version="2.10.0" targetFramework="net40" />
<package id="Geckofx45" version="45.0.20" targetFramework="net40" />
</packages>
</packages>