diff --git a/lib/NuGet-Chocolatey/NuGet.Core.dll b/lib/NuGet-Chocolatey/NuGet.Core.dll new file mode 100644 index 0000000000..5a425dc33c Binary files /dev/null and b/lib/NuGet-Chocolatey/NuGet.Core.dll differ diff --git a/lib/NuGet-Chocolatey/strongname.cmd b/lib/NuGet-Chocolatey/strongname.cmd new file mode 100644 index 0000000000..c902585d6a --- /dev/null +++ b/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 \ No newline at end of file diff --git a/src/chocolatey.console/chocolatey.console.csproj b/src/chocolatey.console/chocolatey.console.csproj index 63483545a4..4c663d1e50 100644 --- a/src/chocolatey.console/chocolatey.console.csproj +++ b/src/chocolatey.console/chocolatey.console.csproj @@ -85,9 +85,9 @@ ..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - + False - ..\packages\Nuget.Core.2.8.2\lib\net40-Client\NuGet.Core.dll + ..\..\lib\NuGet-Chocolatey\NuGet.Core.dll ..\packages\SimpleInjector.2.5.0\lib\net40-client\SimpleInjector.dll diff --git a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj index 9e688e9abb..b2c8269cd6 100644 --- a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj +++ b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj @@ -41,8 +41,9 @@ ..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll - - ..\packages\NuGet.Core.2.8.2\lib\net40-Client\NuGet.Core.dll + + False + ..\..\lib\NuGet-Chocolatey\NuGet.Core.dll False diff --git a/src/chocolatey.tests/chocolatey.tests.csproj b/src/chocolatey.tests/chocolatey.tests.csproj index 9033d98df5..fe703dc39f 100644 --- a/src/chocolatey.tests/chocolatey.tests.csproj +++ b/src/chocolatey.tests/chocolatey.tests.csproj @@ -42,8 +42,9 @@ ..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll - - ..\packages\NuGet.Core.2.8.2\lib\net40-Client\NuGet.Core.dll + + False + ..\..\lib\NuGet-Chocolatey\NuGet.Core.dll False diff --git a/src/chocolatey/chocolatey.csproj b/src/chocolatey/chocolatey.csproj index 21367d6050..0765230bae 100644 --- a/src/chocolatey/chocolatey.csproj +++ b/src/chocolatey/chocolatey.csproj @@ -45,9 +45,9 @@ False ..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - + False - ..\packages\NuGet.Core.2.8.2\lib\net40-Client\NuGet.Core.dll + ..\..\lib\NuGet-Chocolatey\NuGet.Core.dll ..\..\lib\Rhino.Licensing\Rhino.Licensing.dll