Merge pull request #3847 from corbob/update-nuget-core

corbob · web-flow · commit cd7a430e8e7e · 2026-03-02T06:39:04.000-08:00
(#3852) Update to 20260219 version of NuGet.Core
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -89,6 +89,7 @@ jobs:
         key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
     - name: Build with Mono
       run: |
+        export DOTNET_ROOT=$HOME/.dotnet
         chmod +x build.sh
         $GITHUB_WORKSPACE//build.sh --verbosity=diagnostic --target=CI --testExecutionType=unit
     - name: Upload MacOS build results
diff --git a/Update-NuGet.Core.ps1 b/Update-NuGet.Core.ps1
@@ -0,0 +1,17 @@
+param(
+    [Parameter(Mandatory)]
+    $NuGetPath,
+    $ExistingNuGetVersion = '20260219',
+    $Target = 'Debug'
+)
+
+Push-Location $NuGetPath
+.\build.cmd $Target
+mkdir nuget/Chocolatey-NuGet.Core/lib/net4
+Copy-Item .\src\Core\bin\$Target\* .\nuget\Chocolatey-NuGet.Core\lib\net4\
+Push-Location nuget/Chocolatey-NuGet.Core
+.\strongname.cmd
+Pop-Location
+Pop-Location
+
+Copy-Item $NuGetPath/nuget/Chocolatey-NuGet.Core/output/* "$PSScriptRoot/lib/Chocolatey-NuGet.Core.2.11.0.$ExistingNuGetVersion/lib/net4/"
diff --git a/docs/legal/CREDITS.md b/docs/legal/CREDITS.md
@@ -11,7 +11,7 @@
   - [Checksum @ 0.2.0](#checksum--020)
   - [log4net @ 2.0.12](#log4net--2012)
   - [Microsoft.Web.Xdt @ 2.1.1](#microsoftwebxdt--211)
-  - [NuGet.Core @ 2.11.0.20230509 (modified)](#nugetcore--211020230509-modified)
+  - [NuGet.Core @ 2.11.0.20260219 (modified)](#nugetcore--211020260219-modified)
   - [Rhino.Licensing @ 1.4.1 (modified)](#rhinolicensing--141-modified)
   - [Rx (Reactive Extensions) @ 2.1.30214.0](#rx-reactive-extensions--21302140)
   - [Shim Generator (shimgen) @ 1.0.0](#shim-generator-shimgen--100)
@@ -75,7 +75,7 @@ Their details are below.
 - [Checksum @ 0.2.0](#checksum--020)
 - [log4net @ 2.0.12](#log4net--2012)
 - [Microsoft.Web.Xdt @ 2.1.1](#microsoftwebxdt--211)
-- [NuGet.Core @ 2.11.0.20230509 (modified)](#nugetcore--211020230509-modified)
+- [NuGet.Core @ 2.11.0.20260219 (modified)](#nugetcore--211020260219-modified)
 - [Rhino.Licensing @ 1.4.1 (modified)](#rhinolicensing--141-modified)
 - [Rx (Reactive Extensions) @ 2.1.30214.0](#rx-reactive-extensions--21302140)
 - [Shim Generator (shimgen) @ 1.0.0](#shim-generator-shimgen--100)
@@ -741,7 +741,7 @@ It is also a requirement of NuGet.Core.
   It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.
 ```
 
-### NuGet.Core @ 2.11.0.20230509 (modified)
+### NuGet.Core @ 2.11.0.20260219 (modified)
 
 Chocolatey uses [NuGet.Core](https://github.com/NuGet/NuGet2) [(modified)](https://github.com/chocolatey/nuget-chocolatey) to work with packaging.
 [License terms](https://github.com/NuGet/NuGet2/blob/c3d1027a51b31fd0c41e9abbe90810cf1c924c9f/COPYRIGHT.txt):
diff --git a/lib/Chocolatey-NuGet.Core.2.11.0.20230509/lib/net4/NuGet.Core.dll b/lib/Chocolatey-NuGet.Core.2.11.0.20230509/lib/net4/NuGet.Core.dll
diff --git a/lib/Chocolatey-NuGet.Core.2.11.0.20230509/lib/net4/NuGet.Core.pdb b/lib/Chocolatey-NuGet.Core.2.11.0.20230509/lib/net4/NuGet.Core.pdb
diff --git a/lib/Chocolatey-NuGet.Core.2.11.0.20260219/lib/net4/NuGet.Core.dll b/lib/Chocolatey-NuGet.Core.2.11.0.20260219/lib/net4/NuGet.Core.dll
diff --git a/lib/Chocolatey-NuGet.Core.2.11.0.20260219/lib/net4/NuGet.Core.pdb b/lib/Chocolatey-NuGet.Core.2.11.0.20260219/lib/net4/NuGet.Core.pdb
diff --git a/src/chocolatey.console/chocolatey.console.csproj b/src/chocolatey.console/chocolatey.console.csproj
@@ -133,7 +133,7 @@
     </Reference>
     <Reference Include="NuGet.Core, Version=2.11.0.0, Culture=neutral, PublicKeyToken=fd112f53c3ab578c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Chocolatey-NuGet.Core.2.11.0.20230509\lib\net4\NuGet.Core.dll</HintPath>
+      <HintPath>..\..\lib\Chocolatey-NuGet.Core.2.11.0.20260219\lib\net4\NuGet.Core.dll</HintPath>
     </Reference>
     <Reference Include="SimpleInjector, Version=2.8.3.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
       <HintPath>..\packages\SimpleInjector.2.8.3\lib\net40-client\SimpleInjector.dll</HintPath>
diff --git a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj
@@ -64,7 +64,7 @@
     </Reference>
     <Reference Include="NuGet.Core, Version=2.11.0.0, Culture=neutral, PublicKeyToken=fd112f53c3ab578c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Chocolatey-NuGet.Core.2.11.0.20230509\lib\net4\NuGet.Core.dll</HintPath>
+      <HintPath>..\..\lib\Chocolatey-NuGet.Core.2.11.0.20260219\lib\net4\NuGet.Core.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/chocolatey.tests/chocolatey.tests.csproj b/src/chocolatey.tests/chocolatey.tests.csproj
@@ -63,7 +63,7 @@
     </Reference>
     <Reference Include="NuGet.Core, Version=2.11.0.0, Culture=neutral, PublicKeyToken=fd112f53c3ab578c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Chocolatey-NuGet.Core.2.11.0.20230509\lib\net4\NuGet.Core.dll</HintPath>
+      <HintPath>..\..\lib\Chocolatey-NuGet.Core.2.11.0.20260219\lib\net4\NuGet.Core.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/chocolatey/chocolatey.csproj b/src/chocolatey/chocolatey.csproj
@@ -79,7 +79,7 @@
     </Reference>
     <Reference Include="NuGet.Core, Version=2.11.0.0, Culture=neutral, PublicKeyToken=fd112f53c3ab578c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Chocolatey-NuGet.Core.2.11.0.20230509\lib\net4\NuGet.Core.dll</HintPath>
+      <HintPath>..\..\lib\Chocolatey-NuGet.Core.2.11.0.20260219\lib\net4\NuGet.Core.dll</HintPath>
     </Reference>
     <Reference Include="Rhino.Licensing">
       <HintPath>..\..\lib\Rhino.Licensing.1.4.1\lib\net40\Rhino.Licensing.dll</HintPath>
diff --git a/tests/pester-tests/features/Extraction.Tests.ps1 b/tests/pester-tests/features/Extraction.Tests.ps1
@@ -0,0 +1,54 @@
+Import-Module helpers/common-helpers
+
+# These tests are skipped when not in Test Kitchen as the packages for this test are not available in this repository.
+# These tests also modify files outside of the tests.
+Describe "Extraction tests <_> command" -Skip:(-not $env:TEST_KITCHEN) -ForEach @(
+    'install'
+    'upgrade'
+    if (Test-PackageIsEqualOrHigher -PackageName chocolatey.extension -Version 5.0.0) {
+        'download'
+    }
+) -Tag Extraction {
+    BeforeDiscovery {
+        $Type = @(
+            'combined-extracted-path'
+            'absolute-extracted-path'
+            'relative-extracted-path'
+        )
+    }
+
+    BeforeAll {
+        Initialize-ChocolateyTestInstall
+        New-ChocolateyInstallSnapshot
+        $Command = $_
+    }
+
+    AfterAll {
+        Remove-ChocolateyTestInstall
+    }
+
+    Context '<_> extraction' -ForEach $Type {
+        BeforeAll {
+            Restore-ChocolateyInstallSnapshot
+
+            $Output = Invoke-Choco $Command $_ --confirm
+        }
+
+        AfterAll {
+            Remove-Item -Path C:\demonstration -Force -Recurse -ErrorAction SilentlyContinue
+        }
+
+        It 'Exits correctly' {
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
+        }
+
+        It 'Should output correctly' {
+            $Output.String | Should -Match "The package contains an entry '.*' which is unsafe for extraction."
+        }
+
+        It 'Should not create the file.' {
+            'C:\demonstration\demo.txt' | Should -Not -Exist -Because $Output.String
+        }
+
+    }
+}
