Skip to content

Commit

Permalink
Merge branch 'hotfix-2.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
andreasohlund committed Sep 29, 2014
2 parents a49815e + 0e4bb66 commit 125ccbb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions GitVersionConfig.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
assemblyVersioningScheme: Major
8 changes: 4 additions & 4 deletions src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Fody.1.25.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.25.0\build\Fody.targets'))" />
<Error Condition="!Exists('..\packages\GitVersionTask.1.2.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.1.2.1\Build\GitVersionTask.targets'))" />
<Error Condition="!Exists('..\packages\NuGetPackager.0.1.4\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.1.4\build\NuGetPackager.targets'))" />
<Error Condition="!Exists('..\packages\NuGetPackager.0.1.6\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.1.6\build\NuGetPackager.targets'))" />
<Error Condition="!Exists('..\packages\GitVersionTask.1.3.0\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.1.3.0\Build\GitVersionTask.targets'))" />
</Target>
<Import Project="..\packages\Fody.1.25.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.25.0\build\Fody.targets')" />
<Import Project="..\packages\GitVersionTask.1.2.1\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.1.2.1\Build\GitVersionTask.targets')" />
<Import Project="..\packages\NuGetPackager.0.1.4\build\NuGetPackager.targets" Condition="Exists('..\packages\NuGetPackager.0.1.4\build\NuGetPackager.targets')" />
<Import Project="..\packages\NuGetPackager.0.1.6\build\NuGetPackager.targets" Condition="Exists('..\packages\NuGetPackager.0.1.6\build\NuGetPackager.targets')" />
<Import Project="..\packages\GitVersionTask.1.3.0\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.1.3.0\Build\GitVersionTask.targets')" />
</Project>
4 changes: 2 additions & 2 deletions src/NServiceBus.RabbitMQ/packages.config
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Fody" version="1.25.0" targetFramework="net45" />
<package id="GitVersionTask" version="1.2.1" targetFramework="net45" developmentDependency="true" />
<package id="GitVersionTask" version="1.3.0" targetFramework="net45" developmentDependency="true" />
<package id="Janitor.Fody" version="1.1.0.0" targetFramework="net45" developmentDependency="true" />
<package id="NServiceBus" version="5.0.0" targetFramework="net45" />
<package id="NuGetPackager" version="0.1.4" targetFramework="net45" />
<package id="NuGetPackager" version="0.1.6" targetFramework="net45" />
<package id="Obsolete.Fody" version="3.1.0.0" targetFramework="net45" developmentDependency="true" />
<package id="RabbitMQ.Client" version="3.3.5" targetFramework="net45" />
</packages>

0 comments on commit 125ccbb

Please sign in to comment.