From 714836c0f826a4f0d64b7cf3cc9e662bc18113a7 Mon Sep 17 00:00:00 2001 From: TheCakeIsNaOH Date: Fri, 1 Jul 2022 12:29:05 -0500 Subject: [PATCH] Add references to my forked nuget packages --- build.ps1 | 3 + build.sh | 3 + src/chocolatey.console/app.config | 2 + .../chocolatey.console.csproj | 4 +- src/chocolatey.console/packages.config | 2 +- src/chocolatey.tests.integration/App.config | 4 ++ .../chocolatey.tests.integration.csproj | 31 +++++++++- .../packages.config | 9 ++- src/chocolatey.tests/App.config | 4 ++ src/chocolatey.tests/chocolatey.tests.csproj | 31 +++++++++- src/chocolatey.tests/packages.config | 9 ++- src/chocolatey/chocolatey.csproj | 58 ++++++++++++++++++- src/chocolatey/packages.config | 17 +++++- 13 files changed, 164 insertions(+), 13 deletions(-) diff --git a/build.ps1 b/build.ps1 index 674e6d1868..97728a54f5 100644 --- a/build.ps1 +++ b/build.ps1 @@ -50,6 +50,9 @@ Param( [string[]]$ScriptArgs ) +#REMOVE ME, TEMP SET EXTRA nuget source: +$ENV:NUGETDEVRESTORE_SOURCE = "https://nuget.naoh.host/repository/nuget-public/index.json" + # Attempt to set highest encryption available for SecurityProtocol. # PowerShell will not set this by default (until maybe .NET 4.6.x). This # will typically produce a message for PowerShell v2 (just an info diff --git a/build.sh b/build.sh index dfdc92e93e..343211814c 100755 --- a/build.sh +++ b/build.sh @@ -23,6 +23,9 @@ export CAKE_PATHS_TOOLS=$TOOLS_DIR export CAKE_PATHS_ADDINS=$ADDINS_DIR export CAKE_PATHS_MODULES=$MODULES_DIR +#REMOVE ME, TEMP SET EXTRA nuget source: +export NUGETDEVRESTORE_SOURCE="https://nuget.naoh.host/repository/nuget-public/index.json" + # Define md5sum or md5 depending on Linux / macOS MD5_EXE= if [[ "$(uname -s)" == "Darwin" ]]; then diff --git a/src/chocolatey.console/app.config b/src/chocolatey.console/app.config index 9a025fe0eb..1b17a871d0 100644 --- a/src/chocolatey.console/app.config +++ b/src/chocolatey.console/app.config @@ -5,6 +5,8 @@ + + diff --git a/src/chocolatey.console/chocolatey.console.csproj b/src/chocolatey.console/chocolatey.console.csproj index cc1dc83e8c..e439c10ead 100644 --- a/src/chocolatey.console/chocolatey.console.csproj +++ b/src/chocolatey.console/chocolatey.console.csproj @@ -133,8 +133,8 @@ ..\packages\log4net.2.0.12\lib\net45\log4net.dll - - ..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll + + ..\packages\Microsoft.Web.Xdt.3.1.0\lib\net40\Microsoft.Web.XmlTransform.dll ..\packages\SimpleInjector.2.5.0\lib\net45\SimpleInjector.dll diff --git a/src/chocolatey.console/packages.config b/src/chocolatey.console/packages.config index 1cfafa8a8a..57cb1276e2 100644 --- a/src/chocolatey.console/packages.config +++ b/src/chocolatey.console/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/chocolatey.tests.integration/App.config b/src/chocolatey.tests.integration/App.config index 43fdf09b60..352c5fac2a 100644 --- a/src/chocolatey.tests.integration/App.config +++ b/src/chocolatey.tests.integration/App.config @@ -7,6 +7,10 @@ + + + + diff --git a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj index 3f405171cb..c1e60c8191 100644 --- a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj +++ b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj @@ -59,12 +59,33 @@ ..\packages\log4net.2.0.12\lib\net45\log4net.dll - - ..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll + + ..\packages\Microsoft.Web.Xdt.3.1.0\lib\net40\Microsoft.Web.XmlTransform.dll ..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\packages\Chocolatey.NuGet.Common.6.3.0-zlocal.4\lib\net472\NuGet.Common.dll + + + ..\packages\Chocolatey.NuGet.Configuration.6.3.0-zlocal.4\lib\net472\NuGet.Configuration.dll + + + ..\packages\NuGet.Frameworks.6.3.0-zlocal.4\lib\net472\NuGet.Frameworks.dll + + + ..\packages\Chocolatey.NuGet.Packaging.6.3.0-zlocal.4\lib\net472\NuGet.Packaging.dll + + + ..\packages\Chocolatey.NuGet.Protocol.6.3.0-zlocal.4\lib\net472\NuGet.Protocol.dll + + + ..\packages\Chocolatey.NuGet.Versioning.6.3.0-zlocal.4\lib\net472\NuGet.Versioning.dll + False ..\packages\NUnit.2.6.4\lib\nunit.framework.dll @@ -81,6 +102,10 @@ + + + + ..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll @@ -90,6 +115,8 @@ ..\packages\Rx-Linq.2.1.30214.0\lib\Net45\System.Reactive.Linq.dll + + diff --git a/src/chocolatey.tests.integration/packages.config b/src/chocolatey.tests.integration/packages.config index caa327a9bb..77e545857b 100644 --- a/src/chocolatey.tests.integration/packages.config +++ b/src/chocolatey.tests.integration/packages.config @@ -1,8 +1,15 @@  + + + + + - + + + diff --git a/src/chocolatey.tests/App.config b/src/chocolatey.tests/App.config index 43fdf09b60..352c5fac2a 100644 --- a/src/chocolatey.tests/App.config +++ b/src/chocolatey.tests/App.config @@ -7,6 +7,10 @@ + + + + diff --git a/src/chocolatey.tests/chocolatey.tests.csproj b/src/chocolatey.tests/chocolatey.tests.csproj index c7b0a3e512..eb4c6adfe1 100644 --- a/src/chocolatey.tests/chocolatey.tests.csproj +++ b/src/chocolatey.tests/chocolatey.tests.csproj @@ -58,12 +58,33 @@ ..\packages\log4net.2.0.12\lib\net45\log4net.dll - - ..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll + + ..\packages\Microsoft.Web.Xdt.3.1.0\lib\net40\Microsoft.Web.XmlTransform.dll ..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\packages\Chocolatey.NuGet.Common.6.3.0-zlocal.4\lib\net472\NuGet.Common.dll + + + ..\packages\Chocolatey.NuGet.Configuration.6.3.0-zlocal.4\lib\net472\NuGet.Configuration.dll + + + ..\packages\NuGet.Frameworks.6.3.0-zlocal.4\lib\net472\NuGet.Frameworks.dll + + + ..\packages\Chocolatey.NuGet.Packaging.6.3.0-zlocal.4\lib\net472\NuGet.Packaging.dll + + + ..\packages\Chocolatey.NuGet.Protocol.6.3.0-zlocal.4\lib\net472\NuGet.Protocol.dll + + + ..\packages\Chocolatey.NuGet.Versioning.6.3.0-zlocal.4\lib\net472\NuGet.Versioning.dll + False ..\packages\NUnit.2.6.4\lib\nunit.framework.dll @@ -80,6 +101,12 @@ + + + + + + diff --git a/src/chocolatey.tests/packages.config b/src/chocolatey.tests/packages.config index a6cb24100c..5e3fd09a11 100644 --- a/src/chocolatey.tests/packages.config +++ b/src/chocolatey.tests/packages.config @@ -1,8 +1,15 @@  + + + + + - + + + diff --git a/src/chocolatey/chocolatey.csproj b/src/chocolatey/chocolatey.csproj index ba5bf02e67..fd72f2bde8 100644 --- a/src/chocolatey/chocolatey.csproj +++ b/src/chocolatey/chocolatey.csproj @@ -74,9 +74,51 @@ ..\packages\log4net.2.0.12\lib\net45\log4net.dll - - False - ..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll + + + ..\packages\Microsoft.Web.Xdt.3.1.0\lib\net40\Microsoft.Web.XmlTransform.dll + + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\packages\Chocolatey.NuGet.Commands.6.3.0-zlocal.4\lib\net472\NuGet.Commands.dll + + + ..\packages\Chocolatey.NuGet.Common.6.3.0-zlocal.4\lib\net472\NuGet.Common.dll + + + ..\packages\Chocolatey.NuGet.Configuration.6.3.0-zlocal.4\lib\net472\NuGet.Configuration.dll + + + ..\packages\Chocolatey.Nuget.Credentials.6.3.0-zlocal.4\lib\net472\NuGet.Credentials.dll + + + ..\packages\Chocolatey.NuGet.DependencyResolver.Core.6.3.0-zlocal.4\lib\net472\NuGet.DependencyResolver.Core.dll + + + ..\packages\NuGet.Frameworks.6.3.0-zlocal.4\lib\net472\NuGet.Frameworks.dll + + + ..\packages\Chocolatey.NuGet.LibraryModel.6.3.0-zlocal.4\lib\net472\NuGet.LibraryModel.dll + + + ..\packages\Chocolatey.NuGet.PackageManagement.6.3.0-zlocal.4\lib\net472\NuGet.PackageManagement.dll + + + ..\packages\Chocolatey.NuGet.Packaging.6.3.0-zlocal.4\lib\net472\NuGet.Packaging.dll + + + ..\packages\Chocolatey.NuGet.ProjectModel.6.3.0-zlocal.4\lib\net472\NuGet.ProjectModel.dll + + + ..\packages\Chocolatey.NuGet.Protocol.6.3.0-zlocal.4\lib\net472\NuGet.Protocol.dll + + + ..\packages\Chocolatey.NuGet.Resolver.6.3.0-zlocal.4\lib\net472\NuGet.Resolver.dll + + + ..\packages\Chocolatey.NuGet.Versioning.6.3.0-zlocal.4\lib\net472\NuGet.Versioning.dll ..\..\lib\Rhino.Licensing.1.4.1\lib\net40\Rhino.Licensing.dll @@ -88,9 +130,14 @@ ..\packages\SimpleInjector.2.5.0\lib\net45\SimpleInjector.Diagnostics.dll + + + + + False ..\..\lib\PowerShell\System.Management.Automation.dll @@ -98,6 +145,9 @@ ..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll + + + ..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll @@ -105,6 +155,7 @@ ..\packages\Rx-Linq.2.1.30214.0\lib\Net45\System.Reactive.Linq.dll + @@ -391,6 +442,7 @@ +