Skip to content

Commit

Permalink
(GH-205)(GH-194)(GH-290) Vendor NuGet.Core
Browse files Browse the repository at this point in the history
Vendoring NuGet.Core allows us to take advantage of our own fixes to
the provider. There are things that have been wanted for awhile that
don't have a workaround to change the setting.

- GH-290 - packages no longer have a restriction on content folders
that produces the "External packages cannot depend on packages that
target projects". I'd like to call it a bug, and for Chocolatey it
certainly is.
- GH-194 - Fix minimum NuGet client version reports Chocolatey version
instead of NuGet's version, which is fine for packages on Chocolatey,
but the ones on NuGet usually have this filled in, which makes them
impossible to install with choco.
- GH-205 - Enhance the nuspec - first wave. Add the most oftenly
requested url for the nuspec, the packageSourceUrl and several other
urls plus add in replaces, provides and conflicts as placeholders for
now.
  • Loading branch information
ferventcoder committed Jun 12, 2015
1 parent 22c8b75 commit 80160ae
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 8 deletions.
Binary file added lib/NuGet-Chocolatey/NuGet.Core.dll
Binary file not shown.
10 changes: 10 additions & 0 deletions lib/NuGet-Chocolatey/strongname.cmd
@@ -0,0 +1,10 @@
@echo off
SET DIR=%~d0%~p0%

::%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"" x86
::no need to ildasm/al

echo Make sure you have webtransform here for the merge. Continue?
pause

%DIR%..\ILMerge\ILMerge.exe NuGet.Core.dll /keyfile:%DIR%..\..\chocolatey.snk /out:%DIR%NuGet.Core.dll /targetplatform:v4 /log:%DIR%ILMerge.DELETE.log /ndebug /allowDup
4 changes: 2 additions & 2 deletions src/chocolatey.console/chocolatey.console.csproj
Expand Up @@ -85,9 +85,9 @@
<Reference Include="Microsoft.Web.XmlTransform">
<HintPath>..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
</Reference>
<Reference Include="NuGet.Core">
<Reference Include="NuGet.Core, Version=2.8.2.0, Culture=neutral, PublicKeyToken=fd112f53c3ab578c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Nuget.Core.2.8.2\lib\net40-Client\NuGet.Core.dll</HintPath>
<HintPath>..\..\lib\NuGet-Chocolatey\NuGet.Core.dll</HintPath>
</Reference>
<Reference Include="SimpleInjector">
<HintPath>..\packages\SimpleInjector.2.5.0\lib\net40-client\SimpleInjector.dll</HintPath>
Expand Down
Expand Up @@ -41,8 +41,9 @@
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
</Reference>
<Reference Include="NuGet.Core">
<HintPath>..\packages\NuGet.Core.2.8.2\lib\net40-Client\NuGet.Core.dll</HintPath>
<Reference Include="NuGet.Core, Version=2.8.2.0, Culture=neutral, PublicKeyToken=fd112f53c3ab578c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\NuGet-Chocolatey\NuGet.Core.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
5 changes: 3 additions & 2 deletions src/chocolatey.tests/chocolatey.tests.csproj
Expand Up @@ -42,8 +42,9 @@
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
</Reference>
<Reference Include="NuGet.Core">
<HintPath>..\packages\NuGet.Core.2.8.2\lib\net40-Client\NuGet.Core.dll</HintPath>
<Reference Include="NuGet.Core, Version=2.8.2.0, Culture=neutral, PublicKeyToken=fd112f53c3ab578c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\NuGet-Chocolatey\NuGet.Core.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
4 changes: 2 additions & 2 deletions src/chocolatey/chocolatey.csproj
Expand Up @@ -45,9 +45,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
</Reference>
<Reference Include="NuGet.Core">
<Reference Include="NuGet.Core, Version=2.8.2.0, Culture=neutral, PublicKeyToken=fd112f53c3ab578c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NuGet.Core.2.8.2\lib\net40-Client\NuGet.Core.dll</HintPath>
<HintPath>..\..\lib\NuGet-Chocolatey\NuGet.Core.dll</HintPath>
</Reference>
<Reference Include="Rhino.Licensing">
<HintPath>..\..\lib\Rhino.Licensing\Rhino.Licensing.dll</HintPath>
Expand Down

0 comments on commit 80160ae

Please sign in to comment.