Merge branch 'master' of https://github.com/ServiceStack/ServiceStack…

….Redis
ServiceStack · May 2, 2014 · 715d11f · 715d11f
2 parents f494dbe + a7e17fe
commit 715d11f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/.nuget/NuGet.targets b/src/.nuget/NuGet.targets
@@ -20,7 +20,7 @@
 
  <PropertyGroup>
  <!-- NuGet command -->
- <NuGetExePath>$(NuGetToolsPath)\nuget.exe</NuGetExePath>
+ <NuGetExePath>$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
  <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
  <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
 
@@ -74,4 +74,4 @@
  LogStandardErrorAsError="true"
  Condition=" '$(OS)' == 'Windows_NT' " />
  </Target>
-</Project>
+</Project>
diff --git a/tests/ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj b/tests/ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj
@@ -308,12 +308,12 @@
  </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
  Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
  </Target>
  <Target Name="AfterBuild">
  </Target>
  -->
-</Project>
+</Project>