Fix the issue which caussed regression on AzurePowershell@5 (#21372)

* Fix for OpenSSL

* added missing import

* updated version

* added logs

* Try multiple imports

* Remove invalid import

* Import VstsSdk

* Upgrade VstsTaskSdk

* Remove unnecessary changes

---------

Co-authored-by: Nemanja Rogic <[email protected]>

Author: tpavlovi

Tasks/AzurePowerShellV5/ImportVstsTaskSdk.ps1

@@ -0,0 +1 @@
+Import-Module "$PSScriptRoot\ps_modules\VstsTaskSdk" -ArgumentList @{ NonInteractive = $true }

Tasks/AzurePowerShellV5/RemoveAzContext.ps1

@@ -1,3 +1,5 @@
+Import-Module "$PSScriptRoot\ps_modules\VstsTaskSdk" -ArgumentList @{ NonInteractive = $true }
+
 . "$PSScriptRoot/Utility.ps1"
 . "$PSScriptRoot/ps_modules/VstsAzureHelpers_/Utility.ps1"
 

Tasks/AzurePowerShellV5/azurepowershell.ts

@@ -19,9 +19,9 @@ async function run() {
 
     const env = process.env;
     const hostEnv = `ADO/AzurePowerShell@v5_${env.AGENT_OS || ""}_${env.AGENT_NAME || ""}_${env.BUILD_DEFINITIONNAME || ""}_${env.BUILD_BUILDID || ""}_${env.RELEASE_DEFINITIONNAME || ""}_${env.RELEASE_RELEASEID || ""}`;
-    
+
     process.env.AZUREPS_HOST_ENVIRONMENT = hostEnv;
-    console.log(`AZUREPS_HOST_ENVIRONMENT: ${hostEnv}`);    
+    console.log(`AZUREPS_HOST_ENVIRONMENT: ${hostEnv}`);
 
     try {
         tl.setResourcePath(path.join(__dirname, 'task.json'));
@@ -137,14 +137,15 @@ async function run() {
         //
         // Note, use "-Command" instead of "-File" to match the Windows implementation. Refer to
         // comment on Windows implementation for an explanation why "-Command" is preferred.
+        const importSdk = path.join(path.resolve(__dirname), 'ImportVstsTaskSdk.ps1');
         let powershell = tl.tool(tl.which('pwsh') || tl.which('powershell') || tl.which('pwsh', true))
             .arg('-NoLogo')
             .arg('-NoProfile')
             .arg('-NonInteractive')
             .arg('-ExecutionPolicy')
             .arg('Unrestricted')
             .arg('-Command')
-            .arg(`. '${filePath.replace(/'/g, "''")}'`);
+            .arg(`. '${importSdk}'; . '${filePath.replace(/'/g, "''")}'`);
 
         let options = <tr.IExecOptions>{
             cwd: input_workingDirectory,
@@ -187,7 +188,7 @@ async function run() {
                 .arg('-ExecutionPolicy')
                 .arg('Unrestricted')
                 .arg('-Command')
-                .arg(`. '${path.join(path.resolve(__dirname),'RemoveAzContext.ps1')}'`);
+                .arg(`. '${path.join(path.resolve(__dirname), 'RemoveAzContext.ps1')}'`);
 
             let options = <tr.IExecOptions>{
                     cwd: input_workingDirectory,
@@ -207,7 +208,7 @@ async function run() {
 async function getInstalledAzModuleVersion(): Promise<string | null> {
     try {
         tl.debug('Checking installed Az PowerShell module version...');
-        
+
         // PowerShell command to get the installed Az module version
         const powershell = tl.tool(tl.which('pwsh') || tl.which('powershell') || tl.which('pwsh', true))
             .arg('-NoLogo')
@@ -217,7 +218,7 @@ async function getInstalledAzModuleVersion(): Promise<string | null> {
             .arg('Unrestricted')
             .arg('-Command')
             .arg(`. '${path.join(path.resolve(__dirname),'Utility.ps1')}'; Get-InstalledMajorRelease -moduleName 'Az' -iswin $false`);
-            
+
         const result = await powershell.execSync()
         if (result.code === 0 && result.stdout) {
             const version = result.stdout.trim();

Tasks/AzurePowerShellV5/make.json

@@ -23,7 +23,7 @@
         "nugetv2": [
             {
                 "name": "VstsTaskSdk",
-                "version": "0.20.1",
+                "version": "0.21.0",
                 "repository": "https://www.powershellgallery.com/api/v2/",
                 "cp": [
                     {

Tasks/AzurePowerShellV5/task.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 5,
-    "Minor": 263,
+    "Minor": 264,
     "Patch": 0
   },
   "releaseNotes": "Added support for Az Module and cross platform agents.",

Tasks/AzurePowerShellV5/task.loc.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 5,
-    "Minor": 263,
+    "Minor": 264,
     "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",