Skip to content

Commit adac4c7

Browse files
authored
Add a way to use only NuGet feed sources (PowerShell#24528)
* Update build.psm1 * update default feeds * fix issue with cgmanifest having duplicate existing entries * update pattern
1 parent 3f51dfa commit adac4c7

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

build.psm1

+9-6
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ function Switch-PSNugetConfig {
740740
param(
741741
[Parameter(Mandatory = $true, ParameterSetName = 'user')]
742742
[Parameter(Mandatory = $true, ParameterSetName = 'nouser')]
743-
[ValidateSet('Public', 'Private')]
743+
[ValidateSet('Public', 'Private', 'NuGetOnly')]
744744
[string] $Source,
745745

746746
[Parameter(Mandatory = $true, ParameterSetName = 'user')]
@@ -760,16 +760,19 @@ function Switch-PSNugetConfig {
760760
}
761761
}
762762

763+
$dotnetSdk = [NugetPackageSource] @{Url = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v2'; Name = 'dotnet' }
764+
$gallery = [NugetPackageSource] @{Url = 'https://www.powershellgallery.com/api/v2/'; Name = 'psgallery' }
765+
$nugetorg = [NugetPackageSource] @{Url = 'https://api.nuget.org/v3/index.json'; Name = 'nuget.org' }
763766
if ( $Source -eq 'Public') {
764-
$dotnetSdk = [NugetPackageSource] @{Url = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v2'; Name = 'dotnet' }
765-
$gallery = [NugetPackageSource] @{Url = 'https://www.powershellgallery.com/api/v2/'; Name = 'psgallery' }
766-
$nugetorg = [NugetPackageSource] @{Url = 'https://api.nuget.org/v3/index.json'; Name = 'nuget.org' }
767-
768767
New-NugetConfigFile -NugetPackageSource $nugetorg, $dotnetSdk -Destination "$PSScriptRoot/" @extraParams
769768
New-NugetConfigFile -NugetPackageSource $gallery -Destination "$PSScriptRoot/src/Modules/" @extraParams
770769
New-NugetConfigFile -NugetPackageSource $gallery -Destination "$PSScriptRoot/test/tools/Modules/" @extraParams
770+
} elseif ( $Source -eq 'NuGetOnly') {
771+
New-NugetConfigFile -NugetPackageSource $nugetorg -Destination "$PSScriptRoot/" @extraParams
772+
New-NugetConfigFile -NugetPackageSource $gallery -Destination "$PSScriptRoot/src/Modules/" @extraParams
773+
New-NugetConfigFile -NugetPackageSource $gallery -Destination "$PSScriptRoot/test/tools/Modules/" @extraParams
771774
} elseif ( $Source -eq 'Private') {
772-
$powerShellPackages = [NugetPackageSource] @{Url = 'https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShell-7-5-preview-test-2/nuget/v3/index.json'; Name = 'powershell' }
775+
$powerShellPackages = [NugetPackageSource] @{Url = 'https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShell/nuget/v3/index.json'; Name = 'powershell' }
773776

774777
New-NugetConfigFile -NugetPackageSource $powerShellPackages -Destination "$PSScriptRoot/" @extraParams
775778
New-NugetConfigFile -NugetPackageSource $powerShellPackages -Destination "$PSScriptRoot/src/Modules/" @extraParams

nuget.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<add key="powershell" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShell-7-5-preview-test-2/nuget/v3/index.json" />
5+
<add key="powershell" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShell/nuget/v3/index.json" />
66
</packageSources>
77
<disabledPackageSources>
88
<clear />

src/Modules/nuget.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<add key="powershell" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShell-7-5-preview-test-2/nuget/v3/index.json" />
5+
<add key="powershell" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShell/nuget/v3/index.json" />
66
</packageSources>
77
<disabledPackageSources>
88
<clear />

test/tools/Modules/nuget.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<add key="powershell" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShell-7-5-preview-test-2/nuget/v3/index.json" />
5+
<add key="powershell" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShell/nuget/v3/index.json" />
66
</packageSources>
77
<disabledPackageSources>
88
<clear />

tools/findMissingNotices.ps1

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ $existingRegistrationsJson.Registrations | ForEach-Object {
2626
$registration = [Registration]$_
2727
if ($registration.Component) {
2828
$name = $registration.Component.Name()
29-
$existingRegistrationTable.Add($name, $registration)
29+
if (!$existingRegistrationTable.ContainsKey($name)) {
30+
$existingRegistrationTable.Add($name, $registration)
31+
}
3032
}
3133
}
3234

@@ -103,7 +105,7 @@ function ConvertTo-SemVer {
103105
So, I'm making the logic work for that scenario by
104106
thorwing away any part that doesn't match non-pre-release semver portion
105107
#>
106-
$null = $Version -match '^(\d+\.\d+\.\d+)).*'
108+
$null = $Version -match '^(\d+\.\d+\.\d+).*'
107109
$desiredVersion = $matches[1]
108110
}
109111

0 commit comments

Comments
 (0)