Sync tools folder from main branch to generation branch (#25326)

Co-authored-by: azurepowershell <[email protected]>
Azure · Jun 25, 2024 · 10b4466 · 10b4466
1 parent 78bf4a8
commit 10b4466
Show file tree

Hide file tree

Showing 15 changed files with 52 additions and 17 deletions.
diff --git a/.azure-pipelines/live-test.yml b/.azure-pipelines/live-test.yml
@@ -10,11 +10,11 @@ parameters:
 - name: os_linux
   displayName: Linux Image Version
   type: string
-  default: ubuntu-20.04
+  default: ubuntu-latest
 - name: os_macos
   displayName: MacOS Image Version
   type: string
-  default: macOS-11
+  default: macOS-latest
 - name: win_ps_5_1
   displayName: Windows PowerShell 5.1 Version
   type: string

diff --git a/.azure-pipelines/powershell-core.yml b/.azure-pipelines/powershell-core.yml
@@ -7,7 +7,7 @@ variables:
   LinuxAgentPoolVMImage: ''
   MacOSName: macOS
   MacOSAgentPoolName: 'Azure Pipelines'
-  MacOSAgentPoolVMImage: macOS-11
+  MacOSAgentPoolVMImage: macOS-latest
   TestFramework: net6.0
   TestTarget: Test
   Configuration: Debug

diff --git a/.azure-pipelines/release-test.yml b/.azure-pipelines/release-test.yml
@@ -42,7 +42,7 @@ variables:
   linuxAgentPoolName: pool-ubuntu-2004
   linuxAgentPoolVMImage: ''
   macOsAgentPoolName: Azure Pipelines
-  macOsAgentPoolVMImage: macOS-11
+  macOsAgentPoolVMImage: macOS-latest
 
 pr: none
 trigger: none

diff --git a/src/lib/netstandard2.0/Azure.Core.dll b/src/lib/netstandard2.0/Azure.Core.dll
diff --git a/src/lib/netstandard2.0/Azure.Identity.dll b/src/lib/netstandard2.0/Azure.Identity.dll
diff --git a/src/lib/netstandard2.0/Microsoft.Identity.Client.Broker.dll b/src/lib/netstandard2.0/Microsoft.Identity.Client.Broker.dll
diff --git a/src/lib/netstandard2.0/Microsoft.Identity.Client.Extensions.Msal.dll b/src/lib/netstandard2.0/Microsoft.Identity.Client.Extensions.Msal.dll
diff --git a/src/lib/netstandard2.0/Microsoft.Identity.Client.NativeInterop.dll b/src/lib/netstandard2.0/Microsoft.Identity.Client.NativeInterop.dll
diff --git a/src/lib/netstandard2.0/Microsoft.Identity.Client.dll b/src/lib/netstandard2.0/Microsoft.Identity.Client.dll
diff --git a/src/lib/netstandard2.0/msalruntime.dll b/src/lib/netstandard2.0/msalruntime.dll
diff --git a/src/lib/netstandard2.0/msalruntime_arm64.dll b/src/lib/netstandard2.0/msalruntime_arm64.dll
diff --git a/src/lib/netstandard2.0/msalruntime_x86.dll b/src/lib/netstandard2.0/msalruntime_x86.dll
diff --git a/tools/Common.Netcore.Dependencies.targets b/tools/Common.Netcore.Dependencies.targets
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.38.0"/>
+    <PackageReference Include="Azure.Core" Version="1.40.0"/>
   </ItemGroup>
   <ItemGroup Condition="'$(IsTestProject)' != 'true'">
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.18.0">

diff --git a/tools/TestFx/EnvironmentSetupHelper.cs b/tools/TestFx/EnvironmentSetupHelper.cs
@@ -538,9 +538,14 @@ public virtual Collection<PSObject> RunPowerShellTest(params string[] scripts)
                 output = powershell.Invoke();
                 watch.Stop();
 
-                var resultFormatting = watch.ElapsedMilliseconds < 5000 ? "##[section]" : "##[warning]";
-
-                Console.WriteLine($"{resultFormatting}Test {testName} completed in {watch.ElapsedMilliseconds}ms");
+                if (watch.ElapsedMilliseconds < 5000)
+                {
+                    Console.WriteLine($"INFO : Test {testName} completed in {watch.ElapsedMilliseconds}ms");
+                }
+                else
+                {
+                    Console.WriteLine($"##[warning]WARNING : Test {testName} completed in {watch.ElapsedMilliseconds}ms");
+                }
 
                 if (powershell.Streams.Error.Count > 0)
                 {

diff --git a/tools/TestFx/Utilities/CommonUtility.ps1 b/tools/TestFx/Utilities/CommonUtility.ps1
@@ -2,19 +2,49 @@ function RemovePreInstalledModule {
     [CmdletBinding()]
     param(
         [Parameter(Mandatory, Position = 0)]
-        [Alias("ModuleName")]
         [ValidateNotNullOrEmpty()]
-        [string] $Name
+        [hashtable] $ModuleToRemove
     )
 
-    # Remove Az modules
-    Get-Module -Name $Name* -ListAvailable | ForEach-Object {
-        $moduleDirectory = $_.Path | Split-Path | Split-Path
-        if (Test-Path -LiteralPath $moduleDirectory) {
-            Remove-Item -LiteralPath $moduleDirectory -Recurse -Force
+    $ModuleToRemove.Keys | ForEach-Object {
+        $moduleName = $_
+        $moduleVersion = $ModuleToRemove[$moduleName]
+
+        Write-Host "##[group]Processing module $moduleName"
+
+        Write-Host "All installed modules with name $moduleName :"
+        Get-Module -Name $moduleName -ListAvailable
+        Write-Host
+
+        $modules = Get-Module -Name $moduleName -ListAvailable | Where-Object Version -gt ([Version]$moduleVersion)
+        $modules | ForEach-Object {
+            $installedModule = $_
+            $installedModuleName = $installedModule.Name
+
+            Write-Host "##[section]Unqualified pre-installed module is $installedModuleName with version $($installedModule.Version)."
+            $installedModule | Format-List
+
+            $moduleDirectory = $installedModule.Path | Split-Path | Split-Path
+            if (Test-Path -Path $moduleDirectory) {
+                Write-Host "##[section]Start to remove module located in $moduleDirectory."
+                Remove-Item -Path $moduleDirectory -Recurse -Force -ErrorAction SilentlyContinue
+                Write-Host "##[section]Module $installedModuleName has been removed."
+                Write-Host
+            }
         }
+
+        Write-Host "##[endgroup]"
+        Write-Host
     }
 }
 
-RemovePreInstalledModule -Name Az
-RemovePreInstalledModule -Name AzureRM
+$modulesToRemove = @{
+    "Az" = "0.0.0.0";
+    "Az.*" = "0.0.0.0";
+    "Azure" = "0.0.0.0";
+    "Azure.*" = "0.0.0.0";
+    "AzureRM" = "0.0.0.0";
+    "AzureRM.*" = "0.0.0.0";
+    "Pester" = "4.10.1.0"
+}
+RemovePreInstalledModule -ModuleToRemove $modulesToRemove