Skip to content

Commit

Permalink
Update to the latest version of NuGet.Extras, including fix for multi…
Browse files Browse the repository at this point in the history
…ple sources under GET
  • Loading branch information
BenPhegan committed Feb 27, 2013
1 parent cb83ce5 commit 64db848
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions NuGet.Extensions.Tests/NuGet.Extensions.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
<Reference Include="NuGet">
<HintPath>..\packages\NuGet.CommandLine.1.7.0\tools\NuGet.exe</HintPath>
</Reference>
<Reference Include="NuGet.Extras, Version=1.0.0.12, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Extras, Version=1.0.0.14, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Extras.1.0.0.12\lib\net40\NuGet.Extras.dll</HintPath>
<HintPath>..\packages\NuGet.Extras.1.0.0.14\lib\net40\NuGet.Extras.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
Expand Down Expand Up @@ -103,7 +103,7 @@
</PreBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- 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>
Expand Down
1 change: 1 addition & 0 deletions NuGet.Extensions.Tests/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
<package id="Moq" version="4.0.10827" />
<package id="NuGet.CommandLine.Extensions.Core" version="1.2" />
<package id="NuGet.Extras" version="1.0.0.12" />
<package id="NuGet.Extras" version="1.0.0.14" />
</packages>
8 changes: 4 additions & 4 deletions NuGet.Extensions/NuGet.Extensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
<Reference Include="NuGet">
<HintPath>..\packages\NuGet.CommandLine.1.7.0\tools\NuGet.exe</HintPath>
</Reference>
<Reference Include="NuGet.Extras, Version=1.0.0.12, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="NuGet.Extras, Version=1.0.0.14, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Extras.1.0.0.12\lib\net40\NuGet.Extras.dll</HintPath>
<HintPath>..\packages\NuGet.Extras.1.0.0.14\lib\net40\NuGet.Extras.dll</HintPath>
</Reference>
<Reference Include="QuickGraph">
<HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.dll</HintPath>
Expand Down Expand Up @@ -123,11 +123,11 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>if not exist $(TargetDir)Merged mkdir $(TargetDir)Merged
copy $(TargetDir)NuGet.Extensions.nuspec $(TargetDir)Merged\Nuget.Extensions.nuspec /y
copy $(TargetDir)NuGet.Extensions.nuspec $(TargetDir)Merged\Nuget.Extensions.nuspec /y
$(SolutionDir)tools\ilmerge\ilmerge.exe /v4 /t:library /out:$(TargetDir)Merged\$(TargetFileName) $(TargetPath) $(TargetDir)Nuget.Extras.dll $(TargetDir)QuickGraph.dll $(TargetDir)QuickGraph.Serialization.dll $(TargetDir)RestSharp.dll</PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- 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>
Expand Down
2 changes: 1 addition & 1 deletion NuGet.Extensions/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NuGet.Extras" version="1.0.0.12" />
<package id="NuGet.Extras" version="1.0.0.14" />
<package id="QuickGraph" version="3.6.61119.7" />
<package id="RestSharp" version="103.1" />
</packages>
Binary file not shown.
Binary file not shown.
File renamed without changes.
Binary file not shown.

0 comments on commit 64db848

Please sign in to comment.