From 947a41b55635ceaf41d3aaca3aacda60b2e07db7 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 2 Aug 2024 12:56:52 -0700 Subject: [PATCH] chore: Refactor Nuget package source creation to use New-NugetPackageSource function (#24104) --- .pipelines/templates/insert-nuget-config-azfeed.yml | 4 ++-- build.psm1 | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.pipelines/templates/insert-nuget-config-azfeed.yml b/.pipelines/templates/insert-nuget-config-azfeed.yml index 1b1dc46afb..fef9f3f401 100644 --- a/.pipelines/templates/insert-nuget-config-azfeed.yml +++ b/.pipelines/templates/insert-nuget-config-azfeed.yml @@ -6,7 +6,7 @@ steps: $configPath = "${env:NugetConfigDir}/nuget.config" Import-Module ${{ parameters.repoRoot }}/build.psm1 -Force - $powerShellPublicPackages = [NugetPackageSource] @{Url = '$(PowerShellCore_PublicPackages)'; Name= 'AzDevOpsFeed'} + $powerShellPublicPackages = New-NugetPackageSource -Url '$(PowerShellCore_PublicPackages)' -Name 'AzDevOpsFeed' New-NugetConfigFile -NugetPackageSource $powerShellPublicPackages -UserName $(AzDevopsFeedUserNameKVPAT) -ClearTextPAT $(mscodehubPackageReadPat) -Destination "${env:NugetConfigDir}" if(-not (Test-Path $configPath)) @@ -24,7 +24,7 @@ steps: $configPath = "${env:NugetConfigDir}/nuget.config" Import-Module ${{ parameters.repoRoot }}/build.psm1 -Force - $powerShellPublicPackages = [NugetPackageSource] @{Url = '$(PowerShellCore_PublicPackages)'; Name= 'AzDevOpsFeed'} + $powerShellPublicPackages = New-NugetPackageSource -Url '$(PowerShellCore_PublicPackages)' -Name 'AzDevOpsFeed' New-NugetConfigFile -NugetPackageSource $powerShellPublicPackages -UserName $(AzDevopsFeedUserNameKVPAT) -ClearTextPAT $(mscodehubPackageReadPat) -Destination "${env:NugetConfigDir}" if (-not (Test-Path $configPath)) diff --git a/build.psm1 b/build.psm1 index a3ed3fa669..39883009bc 100644 --- a/build.psm1 +++ b/build.psm1 @@ -3436,6 +3436,15 @@ class NugetPackageSource { [string] $Name } +function New-NugetPackageSource { + param( + [Parameter(Mandatory = $true)] [string]$Url, + [Parameter(Mandatory = $true)] [string] $Name + ) + + return [NugetPackageSource] @{Url = $Url; Name = $Name } +} + function New-NugetConfigFile { param( [Parameter(Mandatory = $true, ParameterSetName ='user')]