Skip to content

Commit 390e298

Browse files
authored
[Eng] Fix syntax in version controller (#28371)
1 parent ada0b93 commit 390e298

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

tools/VersionController/Models/ModuleHelper.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@ internal static string GetLatestVersionFromPSGallery(string moduleName, ReleaseT
1616
{
1717
string version = null;
1818
string findModuleScript;
19+
string authScript = "";
1920

2021
if (!string.IsNullOrEmpty(System.Environment.GetEnvironmentVariable("DEFAULT_PS_REPOSITORY_URL")))
2122
{
2223
string repository = System.Environment.GetEnvironmentVariable("DEFAULT_PS_REPOSITORY_NAME");
23-
findModuleScript = @"
24-
$AccessTokenSecureString = $env:SYSTEM_ACCESS_TOKEN | ConvertTo-SecureString -AsPlainText -Force;
25-
$credentialsObject = [pscredential]::new('ONEBRANCH_TOKEN', $AccessTokenSecureString);
26-
";
27-
findModuleScript += releaseType == ReleaseType.STS
28-
? $"Find-PSResource -Name {moduleName} -Repository {repository} -Version * -Credential $credentialsObject"
24+
authScript += "$AccessTokenSecureString = $env:SYSTEM_ACCESS_TOKEN | ConvertTo-SecureString -AsPlainText -Force;$credentialsObject = [pscredential]::new('ONEBRANCH_TOKEN', $AccessTokenSecureString);";
25+
findModuleScript = releaseType == ReleaseType.STS
26+
? $"Find-PSResource -Name {moduleName} -Repository {repository} -Version * -Credential $credentialsObject"
2927
: $"Find-PSResource -Name Az -Repository {repository} -Version * -Credential $credentialsObject";
3028
}
3129
else
@@ -34,9 +32,9 @@ internal static string GetLatestVersionFromPSGallery(string moduleName, ReleaseT
3432
findModuleScript = releaseType == ReleaseType.STS ? $"Find-PSResource -Name {moduleName} -Repository {repository} -Version *" : $"Find-PSResource -Name Az -Repository {repository} -Version *";
3533
}
3634
string filterRequiredReleaseTypeScript = releaseType == ReleaseType.STS ? "" : "| Where-Object {([System.Version]($_.Version)).Major % 2 -eq 0}";
37-
string sortModuleScript = "| Sort-Object {[System.Version]($_.Version)} -Descending";
35+
string sortModuleScript = "| Sort-Object {[System.Version]$_.Version} -Descending";
3836
string getLastModuleVersionScript = releaseType == ReleaseType.STS ?
39-
$"({findModuleScript}{filterRequiredReleaseTypeScript}{sortModuleScript})[0].Version" :
37+
$"{authScript}({findModuleScript}{filterRequiredReleaseTypeScript}{sortModuleScript})[0].Version" :
4038
$"(({findModuleScript}{filterRequiredReleaseTypeScript}{sortModuleScript})[0].Dependencies | Where-Object {{$_.Name -eq '{moduleName}'}})[1]";
4139
using (PowerShell powershell = PowerShell.Create())
4240
{

0 commit comments

Comments
 (0)