Merge branch 'main' into sync-main

Author: VeryEarly

.azure-pipelines/test-coverage.yml

@@ -111,14 +111,10 @@ jobs:
       pwsh: true
       targetType: inline
       script: |
+        git checkout -b testcoverage-baseline
         $blDir = "./tools/TestFx/Coverage"
         $blCsv = Join-Path -Path $blDir -ChildPath "Baseline.csv"
-        if (Test-Path -Path $blCsv) {
-          Remove-Item -Path $blCsv -Force
-        }
-
-        git checkout -b testcoverage-baseline
-        Copy-Item -Path "$(Pipeline.Workspace)/artifacts/TestCoverageAnalysis/Results/Baseline.csv" -Destination $blDir
+        Copy-Item -Path "$(Pipeline.Workspace)/artifacts/TestCoverageAnalysis/Results/Baseline.csv" -Destination $blDir -Force
         git config user.email "[email protected]"
         git config user.name "azure-powershell-bot"
         git add $blCsv

src/Aks/Aks.Test/LiveTests/TestLiveScenarios.ps1

@@ -91,8 +91,8 @@ Invoke-LiveTestScenario -Name "Test_AKS_CURD" -Description "Test AKS Cluster CRU
     Write-Host "##[section]Finished updating Aks cluster : Set-AzAksCluster"
 
     Assert-AreEqual 4 $cluster.AgentPoolProfiles[0].Count
-    Assert-AreEqual "Basic" $cluster.Sku.Name
-    Assert-AreEqual "Paid" $cluster.Sku.Tier
+    #Assert-AreEqual "Basic" $cluster.Sku.Name
+    #Assert-AreEqual "Paid" $cluster.Sku.Tier
 
     # step 3: create the second node pool
     $pool1Name = "default"

src/Compute/Compute/help/New-AzGalleryImageVersion.md

@@ -112,7 +112,7 @@ $galleryImageDefinitionName = "myImage"
 $galleryImageVersionName = "1.0.0"
 $location = "eastus"
 $osSnapshot = @{Source = @{Id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mySnapshotRG/providers/Microsoft.Compute/snapshots/myOSSnapshot" }}
-New-AzGalleryImageVersion -ResourceGroupName $rgName -GalleryName $galleryName -GalleryImageDefinitionName $galleryImageDefinitionName -Name $galleryImageVersionName -Location $location -OSDiskImage $osDisk
+New-AzGalleryImageVersion -ResourceGroupName $rgName -GalleryName $galleryName -GalleryImageDefinitionName $galleryImageDefinitionName -Name $galleryImageVersionName -Location $location -OSDiskImage $osSnapshot
 ```
 
 Create an image version from a disk snapshot

src/Storage/Storage.Management/ChangeLog.md

@@ -18,6 +18,9 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Added warning messages for an upcoming cmdlet breaking change 
+    - `New-AzStorageAccount`
+    - `Set-AzStorageAccount`
 
 ## Version 5.5.0
 * Supported create storage account with DnsEndpointType

src/Storage/Storage.Management/StorageAccount/NewAzureStorageAccount.cs

@@ -12,17 +12,17 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System.Collections;
-using System.Management.Automation;
+using Microsoft.Azure.Commands.Management.Storage.Models;
+using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Storage;
 using Microsoft.Azure.Management.Storage.Models;
-using StorageModels = Microsoft.Azure.Management.Storage.Models;
-using Microsoft.Azure.Commands.Management.Storage.Models;
-using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
+using System.Management.Automation;
+using StorageModels = Microsoft.Azure.Management.Storage.Models;
 
 namespace Microsoft.Azure.Commands.Management.Storage
 {
@@ -286,6 +286,7 @@ public bool EnableAzureActiveDirectoryDomainServicesForFile
         }
         private bool? enableAzureActiveDirectoryDomainServicesForFile = null;
 
+        [CmdletParameterBreakingChange("EnableLargeFileShare", ChangeDescription = "EnableLargeFileShare parameter will be deprecated in a future release.")]
         [Parameter(Mandatory = false, HelpMessage = "Indicates whether or not the storage account can support large file shares with more than 5 TiB capacity. Once the account is enabled, the feature cannot be disabled. Currently only supported for LRS and ZRS replication types, hence account conversions to geo-redundant accounts would not be possible. Learn more in https://go.microsoft.com/fwlink/?linkid=2086047")]
         public SwitchParameter EnableLargeFileShare { get; set; }
 

src/Storage/Storage.Management/StorageAccount/SetAzureStorageAccount.cs

@@ -12,16 +12,17 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System.Collections;
-using System.Collections.Generic;
-using System.Management.Automation;
+using Microsoft.Azure.Commands.Management.Storage.Models;
+using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Storage;
 using Microsoft.Azure.Management.Storage.Models;
-using StorageModels = Microsoft.Azure.Management.Storage.Models;
-using Microsoft.Azure.Commands.Management.Storage.Models;
-using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Management.Automation;
+using StorageModels = Microsoft.Azure.Management.Storage.Models;
 
 namespace Microsoft.Azure.Commands.Management.Storage
 {
@@ -245,6 +246,7 @@ public bool EnableAzureActiveDirectoryDomainServicesForFile
         }
         private bool? enableAzureActiveDirectoryDomainServicesForFile = null;
 
+        [CmdletParameterBreakingChange("EnableLargeFileShare", ChangeDescription = "EnableLargeFileShare parameter will be deprecated in a future release.")]
         [Parameter(Mandatory = false, HelpMessage = "Indicates whether or not the storage account can support large file shares with more than 5 TiB capacity. Once the account is enabled, the feature cannot be disabled. Currently only supported for LRS and ZRS replication types, hence account conversions to geo-redundant accounts would not be possible. Learn more in https://go.microsoft.com/fwlink/?linkid=2086047")]
         public SwitchParameter EnableLargeFileShare { get; set; }
 

src/Websites/Websites/Cmdlets/DeploymentSlots/SetAzureWebAppSlot.cs

@@ -65,7 +65,7 @@ public class SetAzureWebAppSlotCmdlet : WebAppSlotBaseCmdlet
         [ValidateNotNullOrEmpty]
         public Hashtable AppSettings { get; set; }
 
-        [Parameter(Position = 11, Mandatory = false, HelpMessage = "Web app connection strings")]
+        [Parameter(Position = 11, Mandatory = false, HelpMessage = "Web app connection strings, Example: $connStrings = @{ConnectionStringName = @{ Type = \"MySql\"; Value = \"TestValue\"}}")]
         [ValidateNotNullOrEmpty]
         public Hashtable ConnectionStrings { get; set; }
 

src/Websites/Websites/help/Set-AzWebAppSlot.md

@@ -180,7 +180,7 @@ Accept wildcard characters: False
 ```
 
 ### -ConnectionStrings
-Connection Strings HashTable
+Connection Strings HashTable. Example: `$connStrings = @{ConnectionStringName = @{ Type = "MySql"; Value = "TestValue"}}`
 
 ```yaml
 Type: System.Collections.Hashtable

tools/BuildPackagesTask/Microsoft.Azure.Build.Tasks/CIFilterTask.cs

@@ -452,25 +452,7 @@ public override bool Execute()
                 {
                     return false;
                 }
-                else if (FilesChanged.Length >= OCTOKIT_CHANGED_FILE_LIMIT)
-                {
-                    var selectedModuleList = GetSelectedModuleList();
-                    Dictionary<string, HashSet<string>> influencedModuleInfo = new Dictionary<string, HashSet<string>>
-                    {
-                        [BUILD_PHASE] = new HashSet<string>(selectedModuleList),
-                        [TEST_PHASE] = new HashSet<string>(selectedModuleList)
-                    };
-                    foreach (var analysisPhase in ANALYSIS_PHASE_LIST)
-                    {
-                        influencedModuleInfo.Add(analysisPhase, new HashSet<string>(selectedModuleList));
-                    }
-                    FilterTaskResult.PhaseInfo = CalculateCsprojForBuildAndTest(influencedModuleInfo, csprojMap);
-                    return true;
-                }
-                else
-                {
-                    return ProcessFileChanged(csprojMap);
-                }
+                return ProcessFileChanged(csprojMap);
             }
             return true;
         }