Merge pull request chocolatey#191 from chocolatey/develop

Update Jenkins Jobs, Jenkins Version, and CCM Dependency Versions

Author: JPRuskin

Start-C4bCcmSetup.ps1

@@ -104,7 +104,7 @@ process {
     $chocoArgs = @('install', 'IIS-ApplicationInit', "--source='windowsfeatures'" ,'--no-progress', '-y')
     & choco @chocoArgs
 
-    $chocoArgs = @('install', 'dotnet-aspnetcoremodule-v2', "--version='16.0.23055'", "--source='$Ccr'", '--no-progress', '--pin', '--pin-reason="Latest version compatible with chocolatey-management-web V 0.10.1"', '-y')
+    $chocoArgs = @('install', 'dotnet-aspnetcoremodule-v2', "--version='16.0.23083'", "--source='$Ccr'", '--no-progress', '--pin', '--pin-reason="Latest version compatible with chocolatey-management-web V 0.10.1"', '-y')
     & choco @chocoArgs
 
     $chocoArgs = @('install', 'dotnet-6.0-runtime', "--source='$Ccr'", '--no-progress', '-y')

Start-C4bJenkinsSetup.ps1

@@ -40,7 +40,7 @@ process {
     & choco @chocoArgs
 
     # Install Jenkins
-    $chocoArgs = @('install', 'jenkins', '-y', "--source='$Source'", '--no-progress', "--version='2.387.1'")
+    $chocoArgs = @('install', 'jenkins', '-y', "--source='$Source'", '--no-progress')
     & choco @chocoArgs
 
     Write-Host "Giving Jenkins 30 seconds to complete background setup..." -ForegroundColor Green

jenkins/scripts/Get-UpdatedPackage.ps1

@@ -16,12 +16,12 @@ Param (
 . "$PSScriptRoot\ConvertTo-ChocoObject.ps1"
 
 Write-Verbose "Getting list of local packages from '$LocalRepo'."
-$localPkgs = choco list --source $LocalRepo -r | ConvertTo-ChocoObject
+$localPkgs = choco search --source $LocalRepo -r | ConvertTo-ChocoObject
 Write-Verbose "Retrieved list of $(($localPkgs).count) packages from '$Localrepo'."
 
 $localPkgs | ForEach-Object {
     Write-Verbose "Getting remote package information for '$($_.name)'."
-    $remotePkg = choco list $_.name --source $RemoteRepo --exact -r | ConvertTo-ChocoObject
+    $remotePkg = choco search $_.name --source $RemoteRepo --exact -r | ConvertTo-ChocoObject
     if ([version]($remotePkg.version) -gt ([version]$_.version)) {
         Write-Verbose "Package '$($_.name)' has a remote version of '$($remotePkg.version)' which is later than the local version '$($_.version)'."
         Write-Verbose "Internalizing package '$($_.name)' with version '$($remotePkg.version)'."

jenkins/scripts/Update-ProdRepoFromTest.ps1

@@ -14,8 +14,8 @@ param (
 )
 
 Write-Verbose "Checking the list of packages available in the test and prod repositories"
-$testPkgs = choco list --source $TestRepo --all-versions --limit-output | ConvertFrom-Csv -Delimiter '|' -Header Name, Version
-$prodPkgs = choco list --source $ProdRepo --all-versions --limit-output | ConvertFrom-Csv -Delimiter '|' -Header Name, Version
+$testPkgs = choco search --source $TestRepo --all-versions --limit-output | ConvertFrom-Csv -Delimiter '|' -Header Name, Version
+$prodPkgs = choco search --source $ProdRepo --all-versions --limit-output | ConvertFrom-Csv -Delimiter '|' -Header Name, Version
 $tempPath = Join-Path -Path $env:TEMP -ChildPath ([GUID]::NewGuid()).GUID
 
 $Packages = if ($null -eq $testPkgs) {