Skip to content

Commit d50978b

Browse files
authored
Fix the publish issues (Azure#27479)
1 parent 58bee33 commit d50978b

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

tools/BreakingChanges/Get-BreakingChangeMetadata.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ Function Get-BreakingChangeOfGeneratedModule
289289
})
290290
}
291291
Else {
292-
$AllBreakingChangeMessages[$CmdletName][$ParameterSetName].Add($BreakingChangeMessage)
292+
$null = $AllBreakingChangeMessages[$CmdletName][$ParameterSetName]["CmdletBreakingChange"].Add($BreakingChangeMessage)
293293
}
294294
}
295295
}
@@ -334,7 +334,7 @@ Function Get-BreakingChangeOfGeneratedModule
334334
})
335335
}
336336
Else {
337-
$AllBreakingChangeMessages[$CmdletName][$ParameterSetName].Add('ParameterBreakingChange', $ParameterBreakingChangeMessage)
337+
$null = $AllBreakingChangeMessages[$CmdletName][$ParameterSetName].Add('ParameterBreakingChange', $ParameterBreakingChangeMessage)
338338
}
339339
}
340340
}
@@ -363,7 +363,7 @@ Function Get-BreakingChangeOfGeneratedModule
363363
})
364364
}
365365
Else {
366-
$AllBreakingChangeMessages[$CmdletName][$AllParameterSetsName].Add($BreakingChangeMessage)
366+
$null = $AllBreakingChangeMessages[$CmdletName][$AllParameterSetsName]["CmdletBreakingChange"].Add($BreakingChangeMessage)
367367
}
368368
}
369369
}
@@ -394,7 +394,7 @@ Function Get-BreakingChangeOfGeneratedModule
394394
})
395395
}
396396
Else {
397-
$AllBreakingChangeMessages[$CmdletName][$AllParameterSetsName].Add('ParameterBreakingChange', $ParameterBreakingChangeMessage)
397+
$null = $AllBreakingChangeMessages[$CmdletName][$AllParameterSetsName]["ParameterBreakingChange"].Add($ParameterBreakingChangeMessage)
398398
}
399399
}
400400
}

tools/PublishModules.psm1

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -473,9 +473,6 @@ function Save-PackageLocally {
473473
$ModuleName = $module['ModuleName']
474474
$RequiredVersion = $module['RequiredVersion']
475475

476-
$AccessTokenSecureString = $env:SYSTEM_ACCESS_TOKEN | ConvertTo-SecureString -AsPlainText -Force
477-
$credentialsObject = [pscredential]::new("ONEBRANCH_TOKEN", $AccessTokenSecureString)
478-
479476

480477
# Only check for the modules that specifies = required exact dependency version
481478
if ($RequiredVersion -ne $null) {
@@ -496,9 +493,9 @@ function Save-PackageLocally {
496493
# We try to download the package from the PSRepositoryUrl as we are likely intending to use the existing version of the module.
497494
# If the module not found in PSRepositoryUrl, the following command would fail and hence publish to local repo process would fail as well
498495
if (Test-Path Env:\DEFAULT_PS_REPOSITORY_URL) {
499-
Save-PSResource -Name $ModuleName -Version $RequiredVersion -Path $TempRepoPath -Repository $Env:DEFAULT_PS_REPOSITORY_NAME -Credential $credentialsObject -AsNupkg
496+
Save-PSResource -Name $ModuleName -Version $RequiredVersion -Path $TempRepoPath -Repository $Env:DEFAULT_PS_REPOSITORY_NAME -Credential $credentialsObject -AsNupkg -TrustRepository
500497
} else {
501-
Save-PSResource -Name $ModuleName -Version $RequiredVersion -Path $TempRepoPath -Repository PSGallery -AsNupkg
498+
Save-PSResource -Name $ModuleName -Version $RequiredVersion -Path $TempRepoPath -Repository PSGallery -AsNupkg -TrustRepository
502499
}
503500
$NupkgFilePath = Join-Path -Path $TempRepoPath -ChildPath "$ModuleName.$RequiredVersion.nupkg"
504501
$ModulePaths = $env:PSModulePath -split ';'

0 commit comments

Comments
 (0)