Merge branch 'main' of https://github.com/Azure/azure-powershell into release-2023-03-07-backup

Author: BethanyZhou

.azure-pipelines/SyncFromMainBranchConfig.json

@@ -6,6 +6,7 @@
         "src/lib",
         "src/shared",
         "build.proj",
+        "src/Az.props",
         "src/Az.Shared.props",
         "src/Az.Test.props",
         "src/Az.autorest.hybrid.props",

.azure-pipelines/util/test-steps.yml

@@ -67,6 +67,8 @@ steps:
   displayName: 'Test for AutoGen Modules With PowerShell Core'
   condition: and(succeeded(), eq('${{ parameters.testTarget }}', 'Test'))
   continueOnError: true
+  env:
+    PowerShellPlatform: ${{ parameters.powerShellPlatform }}
 
 - pwsh: |
     $PipelineResult = Get-Content PipelineResult.json | ConvertFrom-Json

build.proj

@@ -198,7 +198,8 @@
       <BuildAction Condition="'$(Configuration)' == 'Release'">publish</BuildAction>
     </PropertyGroup>
 
-    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -Build -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -GenerateDocumentationFile $(GenerateDocumentationFile) -EnableTestCoverage $(TurnOnTestCoverage) -BuildAction $(BuildAction)&quot;" />
+    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -Build -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -GenerateDocumentationFile $(GenerateDocumentationFile) -EnableTestCoverage $(TurnOnTestCoverage) -BuildAction $(BuildAction)&quot;" Condition="$(PullRequestNumber) == ''"/>
+    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -Build -PullRequestNumber $(PullRequestNumber) -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -GenerateDocumentationFile $(GenerateDocumentationFile) -EnableTestCoverage $(TurnOnTestCoverage) -BuildAction $(BuildAction)&quot;" Condition="$(PullRequestNumber) != ''"/>
 
     <!-- Build version controller -->
     <Exec Command="dotnet build $(RepoTools)VersionController/VersionController.Netcore.csproj -c $(Configuration)" />

docker/Dockerfile-mariner-2-arm64

@@ -0,0 +1,52 @@
+FROM mcr.microsoft.com/powershell:mariner-2.0-arm64
+
+ARG REPOSITORY=PSGallery
+ARG MODULE=Az
+ARG CONFIG=config
+ARG AZURERM_CONTEXT_SETTINGS=AzureRmContextSettings.json
+ARG AZURE=/root/.Azure
+ARG VCS_REF="none"
+ARG BUILD_DATE=
+ARG VERSION=
+ARG LATEST=
+ARG BLOB_URL=
+ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-mariner-2.0
+
+ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-mariner-2.0"
+
+LABEL maintainer="Azure PowerShell Team <[email protected]>" \
+      readme.md="http://aka.ms/azpsdockerreadme" \
+      description="This Dockerfile will install the latest release of Azure PowerShell." \
+      org.label-schema.build-date=${BUILD_DATE} \
+      org.label-schema.usage="http://aka.ms/azpsdocker" \
+      org.label-schema.url="http://aka.ms/azpsdockerreadme" \
+      org.label-schema.vcs-url="https://github.com/Azure/azure-powershell" \
+      org.label-schema.name="azure powershell" \
+      org.label-schema.vendor="Azure PowerShell" \
+      org.label-schema.version=${VERSION} \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vcs-ref=${VCS_REF} \
+      org.label-schema.docker.cmd="docker run --rm ${IMAGE_NAME} pwsh -c '\$PSVERSIONTABLE'" \
+      org.label-schema.docker.cmd.devel="docker run -it --rm -e 'DebugPreference=Continue' ${IMAGE_NAME} pwsh" \
+      org.label-schema.docker.cmd.test="currently not available" \
+      org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
+
+RUN if [ "${LATEST}" = True ] ; then \
+        # install latest azure-powershell from BLOB
+        pwsh -Command Invoke-WebRequest -uri ${BLOB_URL} -OutFile latest.tar.gz && \       
+        mkdir latest  && \
+        tdnf install -y tar gzip && \
+        tdnf clean all && \ 
+        tar -zxvf ./latest.tar.gz -C ./latest  && \
+        pwsh -Command ./latest/InstallModule.ps1 ;\
+    else \
+        # install old azure-powershell from PSGallery
+        pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
+        pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
+        pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted ;\
+    fi
+
+# create AzureRmContextSettings.json before it was generated
+COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}
+
+CMD [ "pwsh" ]

documentation/development-docs/azure-powershell-developer-guide.md

@@ -47,6 +47,7 @@ The following prerequisites should be completed before contributing to the Azure
 - Install [Visual Studio 2019 or above](https://www.visualstudio.com/downloads/)
 - Install the latest version of [Git](https://git-scm.com/downloads)
 - Install the [`platyPS` module](help-generation.md#Installing-platyPS)
+- Install [PSScriptAnalyzer](https://github.com/PowerShell/PSScriptAnalyzer#installation)
 - Install [**.NET Core 3.1, the Latest .NET, and .NET Framework Dev Pack 4.7.2**](https://dotnet.microsoft.com/en-us/download/dotnet) or greater
 - Install [PowerShell 7](https://github.com/PowerShell/PowerShell/releases/latest)
 - Set the PowerShell [execution policy](https://technet.microsoft.com/en-us/library/ee176961.aspx) to **Unrestricted** for the following versions of PowerShell:

src/Monitor/Monitor/Az.Monitor.psd1

@@ -56,8 +56,7 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.11.2'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = 'Microsoft.Azure.Management.Monitor.dll', 
-               'Microsoft.Azure.PowerShell.AutoMapper.dll', 
+RequiredAssemblies = 'Microsoft.Azure.Management.Monitor.dll',
                'ActivityLogAlert.Autorest\bin\Az.ActivityLogAlert.private.dll', 
                'DiagnosticSetting.Autorest\bin\Az.DiagnosticSetting.private.dll', 
                'ScheduledQueryRule.Autorest\bin\Az.ScheduledQueryRule.private.dll', 

src/Monitor/Monitor/Monitor.csproj

@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Monitor" Version="0.28.0-preview" />
-    <PackageReference Include="Microsoft.Azure.PowerShell.AutoMapper" Version="6.2.2" />
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />

src/Monitor/Monitor/OutputClasses/PSMonitorPrivateLinkScope.cs

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using Microsoft.Azure.Management.Monitor.Models;
 using Newtonsoft.Json;
 
 namespace Microsoft.Azure.Commands.Insights.OutputClasses
@@ -34,6 +35,19 @@ public PSMonitorPrivateLinkScope() { }
             this.ProvisioningState = provisioningState;
         }
 
+        internal static PSMonitorPrivateLinkScope ToPSMonitorPrivateLinkScope(AzureMonitorPrivateLinkScope scope)
+        {
+            return new PSMonitorPrivateLinkScope
+            {
+                Id = scope.Id,
+                Name = scope.Name,
+                Type = scope.Type,
+                Location = scope.Location,
+                Tags = scope.Tags,
+                ProvisioningState = scope.ProvisioningState
+            };
+        }
+
         /// <summary>
         /// Gets azure resource Id
         /// </summary>

src/Monitor/Monitor/OutputClasses/PSMonitorPrivateLinkScopedResource.cs

@@ -13,6 +13,8 @@
 // ----------------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Net.Mail;
+using Microsoft.Azure.Management.Monitor.Models;
 using Newtonsoft.Json;
 
 namespace Microsoft.Azure.Commands.Insights.OutputClasses
@@ -57,5 +59,17 @@ public class PSMonitorPrivateLinkScopedResource
         /// </summary>
         [JsonProperty(PropertyName = "properties.provisioningState")]
         public string ProvisioningState { get; private set; }
+
+        internal static PSMonitorPrivateLinkScopedResource ToPSMonitorPrivateLinkScopedResource(ScopedResource scope)
+        {
+            return new PSMonitorPrivateLinkScopedResource
+            {
+                Id = scope.Id,
+                Name = scope.Name,
+                Type = scope.Type,
+                LinkedResourceId = scope.LinkedResourceId,
+                ProvisioningState = scope.ProvisioningState
+            };
+        }
     }
 }

src/Monitor/Monitor/PrivateLinkScopes/AzureInsightsPrivateLinkScopeCreateOrUpdateCmdletBase.cs

@@ -17,7 +17,6 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Monitor.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
-using Microsoft.Azure.Commands.Insights.Utils;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
 using System.Collections.Generic;
 using System.Linq;