Move Set-EnvVars.ps1 to tools

microsoft · Aug 19, 2020 · 5439be7 · 5439be7
1 parent 9469bdf
commit 5439be7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/init.ps1 b/init.ps1
@@ -74,7 +74,7 @@ try {
  }
  }
 
- & "$PSScriptRoot\azure-pipelines\Set-EnvVars.ps1" -Variables $EnvVars | Out-Null
+ & "$PSScriptRoot/tools/Set-EnvVars.ps1" -Variables $EnvVars | Out-Null
 }
 catch {
  Write-Error $error[0]

diff --git a/tools/Install-DotNetSdk.ps1 b/tools/Install-DotNetSdk.ps1
@@ -165,5 +165,5 @@ $runtimeVersions | Get-Unique |% {
 }
 
 if ($PSCmdlet.ShouldProcess("Set DOTNET environment variables to discover these installed runtimes?")) {
- & "$PSScriptRoot/../azure-pipelines/Set-EnvVars.ps1" -Variables $envVars -PrependPath $DotNetInstallDir | Out-Null
+ & "$PSScriptRoot/Set-EnvVars.ps1" -Variables $envVars -PrependPath $DotNetInstallDir | Out-Null
 }
diff --git a/tools/Install-NuGetCredProvider.ps1 b/tools/Install-NuGetCredProvider.ps1
@@ -19,6 +19,8 @@ Param (
  [string]$AccessToken
 )
 
+$envVars = @{}
+
 $toolsPath = & "$PSScriptRoot\..\azure-pipelines\Get-TempToolsPath.ps1"
 
 if ($IsMacOS -or $IsLinux) {
@@ -66,9 +68,9 @@ if ($AccessToken) {
  Add-Member -InputObject $auth -MemberType NoteProperty -Name endpointCredentials -Value $endpoints
 
  $authJson = ConvertTo-Json -InputObject $auth
- $envVars = @{
+ $envVars += @{
  'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS'=$authJson;
  }
-
- & "$PSScriptRoot\..\azure-pipelines\Set-EnvVars.ps1" -Variables $envVars | Out-Null
 }
+
+& "$PSScriptRoot/Set-EnvVars.ps1" -Variables $envVars | Out-Null
diff --git a/azure-pipelines/Set-EnvVars.ps1 → tools/Set-EnvVars.ps1 b/azure-pipelines/Set-EnvVars.ps1 → tools/Set-EnvVars.ps1