1111# condition: eq(variables['Agent.OS'], 'Windows_NT')
1212# inputs:
1313# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
14- # arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
14+ # arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config
1515# env:
1616# Token: $(InternalFeedToken)
1717#
2929[CmdletBinding ()]
3030param (
3131 [Parameter (Mandatory = $true )][string ]$ConfigFile ,
32- $Password
32+ # Keep the legacy name as an alias while callers migrate secrets to the Token environment variable.
33+ [Alias (" Password" )]$Credential
3334)
3435
3536$ErrorActionPreference = " Stop"
3637Set-StrictMode - Version 2.0
3738[Net.ServicePointManager ]::SecurityProtocol = [Net.SecurityProtocolType ]::Tls12
39+ $feedCredential = if ($env: Token ) { $env: Token } else { $Credential }
3840
3941# This script only consumes helper functions from tools.ps1 to configure NuGet feeds.
4042# Skip importing configure-toolset.ps1 so that repo-specific toolset setup (e.g. acquiring
@@ -44,14 +46,14 @@ $disableConfigureToolsetImport = $true
4446. $PSScriptRoot \tools.ps1
4547
4648# Adds or enables the package source with the given name
47- function AddOrEnablePackageSource ($sources , $disabledPackageSources , $SourceName , $SourceEndPoint , $creds , $Username , $pwd ) {
48- if ($disabledPackageSources -eq $null -or -not (EnableInternalPackageSource - DisabledPackageSources $disabledPackageSources - Creds $creds - PackageSourceName $SourceName )) {
49- AddPackageSource - Sources $sources - SourceName $SourceName - SourceEndPoint $SourceEndPoint - Creds $creds - Username $userName - pwd $Password
49+ function AddOrEnablePackageSource ($sources , $disabledPackageSources , $SourceName , $SourceEndPoint , $creds , $Username , $credential ) {
50+ if ($disabledPackageSources -eq $null -or -not (EnableInternalPackageSource - DisabledPackageSources $disabledPackageSources - Creds $creds - PackageSourceName $SourceName - Credential $credential )) {
51+ AddPackageSource - Sources $sources - SourceName $SourceName - SourceEndPoint $SourceEndPoint - Creds $creds - Username $Username - credential $credential
5052 }
5153}
5254
5355# Add source entry to PackageSources
54- function AddPackageSource ($sources , $SourceName , $SourceEndPoint , $creds , $Username , $pwd ) {
56+ function AddPackageSource ($sources , $SourceName , $SourceEndPoint , $creds , $Username , $credential ) {
5557 $packageSource = $sources.SelectSingleNode (" add[@key='$SourceName ']" )
5658
5759 if ($packageSource -eq $null )
@@ -67,13 +69,13 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
6769 Write-Host " Package source $SourceName already present and enabled."
6870 }
6971
70- AddCredential - Creds $creds - Source $SourceName - Username $Username - pwd $pwd
72+ AddCredential - Creds $creds - Source $SourceName - Username $Username - credential $credential
7173}
7274
7375# Add a credential node for the specified source
74- function AddCredential ($creds , $source , $username , $pwd ) {
76+ function AddCredential ($creds , $source , $username , $credential ) {
7577 # If no cred supplied, don't do anything.
76- if (! $pwd ) {
78+ if (! $credential ) {
7779 return ;
7880 }
7981
@@ -108,27 +110,27 @@ function AddCredential($creds, $source, $username, $pwd) {
108110 $sourceElement.AppendChild ($passwordElement ) | Out-Null
109111 }
110112
111- $passwordElement.SetAttribute (" value" , $pwd )
113+ $passwordElement.SetAttribute (" value" , $credential )
112114}
113115
114116# Enable all darc-int package sources.
115- function EnableMaestroInternalPackageSources ($DisabledPackageSources , $Creds ) {
117+ function EnableMaestroInternalPackageSources ($DisabledPackageSources , $Creds , $Credential ) {
116118 $maestroInternalSources = $DisabledPackageSources.SelectNodes (" add[contains(@key,'darc-int')]" )
117119 ForEach ($DisabledPackageSource in $maestroInternalSources ) {
118- EnableInternalPackageSource - DisabledPackageSources $DisabledPackageSources - Creds $Creds - PackageSourceName $DisabledPackageSource.key
120+ EnableInternalPackageSource - DisabledPackageSources $DisabledPackageSources - Creds $Creds - PackageSourceName $DisabledPackageSource.key - Credential $Credential
119121 }
120122}
121123
122124# Enables an internal package source by name, if found. Returns true if the package source was found and enabled, false otherwise.
123- function EnableInternalPackageSource ($DisabledPackageSources , $Creds , $PackageSourceName ) {
125+ function EnableInternalPackageSource ($DisabledPackageSources , $Creds , $PackageSourceName , $Credential ) {
124126 $DisabledPackageSource = $DisabledPackageSources.SelectSingleNode (" add[@key='$PackageSourceName ']" )
125127 if ($DisabledPackageSource ) {
126128 Write-Host " Enabling internal source '$ ( $DisabledPackageSource.key ) '."
127129
128130 # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries
129131 $DisabledPackageSources.RemoveChild ($DisabledPackageSource )
130132
131- AddCredential - Creds $creds - Source $DisabledPackageSource.Key - Username $userName - pwd $Password
133+ AddCredential - Creds $creds - Source $DisabledPackageSource.Key - Username $userName - credential $credential
132134 return $true
133135 }
134136 return $false
@@ -153,7 +155,7 @@ if ($sources -eq $null) {
153155
154156$creds = $null
155157$feedSuffix = " v3/index.json"
156- if ($Password ) {
158+ if ($feedCredential ) {
157159 $feedSuffix = " v2"
158160 # Looks for a <PackageSourceCredentials> node. Create it if none is found.
159161 $creds = $doc.DocumentElement.SelectSingleNode (" packageSourceCredentials" )
@@ -169,16 +171,16 @@ $userName = "dn-bot"
169171$disabledSources = $doc.DocumentElement.SelectSingleNode (" disabledPackageSources" )
170172if ($disabledSources -ne $null ) {
171173 Write-Host " Checking for any darc-int disabled package sources in the disabledPackageSources node"
172- EnableMaestroInternalPackageSources - DisabledPackageSources $disabledSources - Creds $creds
174+ EnableMaestroInternalPackageSources - DisabledPackageSources $disabledSources - Creds $creds - Credential $feedCredential
173175}
174176$dotnetVersions = @ (' 5' , ' 6' , ' 7' , ' 8' , ' 9' , ' 10' )
175177
176178foreach ($dotnetVersion in $dotnetVersions ) {
177179 $feedPrefix = " dotnet" + $dotnetVersion ;
178180 $dotnetSource = $sources.SelectSingleNode (" add[@key='$feedPrefix ']" )
179181 if ($dotnetSource -ne $null ) {
180- AddOrEnablePackageSource - Sources $sources - DisabledPackageSources $disabledSources - SourceName " $feedPrefix -internal" - SourceEndPoint " https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix -internal/nuget/$feedSuffix " - Creds $creds - Username $userName - pwd $Password
181- AddOrEnablePackageSource - Sources $sources - DisabledPackageSources $disabledSources - SourceName " $feedPrefix -internal-transport" - SourceEndPoint " https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix -internal-transport/nuget/$feedSuffix " - Creds $creds - Username $userName - pwd $Password
182+ AddOrEnablePackageSource - Sources $sources - DisabledPackageSources $disabledSources - SourceName " $feedPrefix -internal" - SourceEndPoint " https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix -internal/nuget/$feedSuffix " - Creds $creds - Username $userName - credential $feedCredential
183+ AddOrEnablePackageSource - Sources $sources - DisabledPackageSources $disabledSources - SourceName " $feedPrefix -internal-transport" - SourceEndPoint " https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix -internal-transport/nuget/$feedSuffix " - Creds $creds - Username $userName - credential $feedCredential
182184 }
183185}
184186
0 commit comments