fix conflit in changelog

Author: xaliciayang

.github/ISSUE_TEMPLATE/az-module-bug-report.md

@@ -29,7 +29,8 @@ assignees: ''
 
 ## Environment data
 
-<!-- Please run $PSVersionTable and paste the output in the below code block -->
+<!-- Please run $PSVersionTable and paste the output in the below code block
+     If running the Docker container image, indicate the tag of the image used and the version of Docker engine-->
 
 ```
 

ChangeLog.md

@@ -1,3 +1,75 @@
+## 3.5.0 - February 2020
+### Highlights since the last major release
+* Updated client side telemetry.
+* Az.IotHub added cmdlets to support to manage devices.
+* Az.SqlVirtualMachine added cmdlets for Availability Group Listener.
+
+#### Az.Resource
+* Fixed bug preventing correct tenant-level resource id generation.
+* Fixed typo.
+
+#### Az.Accounts
+* Added SubscriptionId, TenantId, and execution time into data of client side telemetry
+
+#### Az.Automation
+* Fixed typo in Example 1 in reference documentation for 'New-AzAutomationSoftwareUpdateConfiguration'
+
+#### Az.CognitiveServices
+* Updated SDK to 7.0
+* Improved error message when server responses empty body
+
+#### Az.Compute
+* Allowed empty value for ProximityPlacementGroupId during update
+
+#### Az.FrontDoor
+* Added cmdlet to get managed rule definitions that can be used in WAF
+
+#### Az.IotHub
+* Added support to manage devices in an Iot Hub. New Cmdlets are:
+	- 'Add-AzIotHubDevice'
+	- 'Get-AzIotHubDevice'
+	- 'Remove-AzIotHubDevice'
+	- 'Set-AzIotHubDevice'
+
+#### Az.KeyVault
+* Fixed duplicated text for Add-AzKeyVaultKey.md
+
+#### Az.Monitor
+* Fixed description of the Get-AzLog cmdlet.
+* A new parameter called ActionGroupId was added to 'New-AzMetricAlertRuleV2' command.
+	- The user can provide either ActionGroupId(string) or ActionGorup(ActivityLogAlertActionGroup).
+
+#### Az.Network
+* Added one extra parameter note for parameter '-EnableProxyProtocol' for 'New-AzPrivateLinkService' cmdlet.
+* Fixed FilterData example in Start-AzVirtualNetworkGatewayConnectionPacketCapture.md and Start-AzVirtualnetworkGatewayPacketCapture.md.
+* Added Packet Capture example for capture all inner and outer packets in Start-AzVirtualNetworkGatewayConnectionPacketCapture.md and Start-AzVirtualnetworkGatewayPacketCapture.md.
+* Supported Azure Firewall Policy on VNet Firewalls
+    - No new cmdlets are added. Relaxing the restriction for firewall policy on VNet firewalls
+
+#### Az.RecoveryServices
+* Added Support for Restore-as-files for SQL Databases.
+
+#### Az.Resources
+* Refactored template deployment cmdlets
+    - Added new cmdlets for managing deployments at management group: *-AzManagementGroupDeployment
+    - Added new cmdlets for managing deployments at tenant scope: *-AzTenantDeployment
+    - Refactored *-AzDeployment cmdlets to work specifically at subscription scope
+    - Created aliases *-AzSubscriptionDeployment for *-AzDeployment cmdlets
+* Fixed 'Update-AzADApplication' when parameter 'AvailableToOtherTenants' is not set
+* Removed ApplicationObjectWithoutCredentialParameterSet to avoid AmbiguousParameterSetException.
+* Regenerated help files
+
+#### Az.Sql
+* Added support for cross subscription point in time restore on Managed Instances.
+* Added support for changing existing Sql Managed Instance hardware generation
+* Fixed 'Update-AzSqlServerVulnerabilityAssessmentSetting' help examples: parameter/property output - EmailAdmins
+
+#### Az.SqlVirtualMachine
+* Added cmdlets for Availability Group Listener
+
+#### Az.StorageSync
+* Updated supported character sets in 'Invoke-AzStorageSyncCompatibilityCheck'.
+
 ## 3.4.0 - February 2020
 
 #### Az.CosmosDB
@@ -6,10 +78,6 @@
 * Added parameters ConflictResolutionPolicyMode, ConflictResolutionPolicyPath and ConflictResolutionPolicyPath in Set-AzCosmosDBSqlContainer.
 * Added new cmdlets for Sql API : New-CosmosDBSqlSpatialSpec, New-CosmosDBSqlCompositePath, New-CosmosDBSqlIncludedPathIndex, New-CosmosDBSqlIncludedPath
 
-### Highlights since the last major release
-* Az.CosmosDB initial version 0.1.0 released
-* Az.Network ConnectionMonitor V2 support added
-
 #### Az.Accounts
 * Disable context auto saving when AzureRmContext.json not available
 * Update the reference to Azure Powershell Common to 1.3.5-preview
@@ -120,7 +188,7 @@ Fix New-AzSqlDatabaseSecondary cmdlet to check for PartnerDatabaseName existence
 #### Az.DataFactory
 * Add AutoUpdateETA, LatestVersion, PushedVersion, TaskQueueId and VersionStatus properties for Get-AzDataFactoryV2IntegrationRuntime cmd
 * Update ADF .Net SDK version to 4.6.0
-* Add parameter 'PublicIPs' for 'Set-AzureRmDataFactoryV2IntegrationRuntime' cmd 
+* Add parameter 'PublicIPs' for 'Set-AzDataFactoryV2IntegrationRuntime' cmd 
 to enable create Azure-SSIS IR with static public IP addresses.
 
 #### Az.DevTestLabs
@@ -164,8 +232,8 @@ to enable create Azure-SSIS IR with static public IP addresses.
 #### Az.Storage
 * Add breaking change warning message for DefaultAction Value change in a future release
     - Update-AzStorageAccountNetworkRuleSet
-* Support Get last sync time of Storage account by run get-AzureRMStorageAccount with parameter -IncludeGeoReplicationStats 
-    - Get-AzureRMStorageAccount
+* Support Get last sync time of Storage account by run get-AzStorageAccount with parameter -IncludeGeoReplicationStats 
+    - Get-AzStorageAccount
 
 ## 3.2.0 - December 2019
 
@@ -268,7 +336,7 @@ to enable create Azure-SSIS IR with static public IP addresses.
 
 #### Az.DataFactory
 * Update ADF .Net SDK version to 4.4.0
-* Add parameter 'ExpressCustomSetup' for 'Set-AzureRmDataFactoryV2IntegrationRuntime' cmd to enable setup configurations and 3rd party components without custom setup script.
+* Add parameter 'ExpressCustomSetup' for 'Set-AzDataFactoryV2IntegrationRuntime' cmd to enable setup configurations and 3rd party components without custom setup script.
 
 #### Az.DataLakeStore
 * Update documentation of Get-AzDataLakeStoreDeletedItem and Restore-AzDataLakeStoreDeletedItem
@@ -478,13 +546,13 @@ to enable create Azure-SSIS IR with static public IP addresses.
         - Update-AzVirtualWan : added parameter VirtualWANType
 * Add support for EnableInternetSecurity property for HubVnetConnection, VpnConnection and ExpressRouteConnection
     - New cmdlets added:
-        - Update-AzureRmVirtualHubVnetConnection
+        - Update-AzVirtualHubVnetConnection
     - Cmdlets updated with optional parameters:
-        - New-AzureRmVirtualHubVnetConnection : added parameter EnableInternetSecurity
-        - New-AzureRmVpnConnection : added parameter EnableInternetSecurity
-        - Update-AzureRmVpnConnection : added parameter EnableInternetSecurity
-        - New-AzureRmExpressRouteConnection : added parameter EnableInternetSecurity
-        - Set-AzureRmExpressRouteConnection : added parameter EnableInternetSecurity
+        - New-AzVirtualHubVnetConnection : added parameter EnableInternetSecurity
+        - New-AzVpnConnection : added parameter EnableInternetSecurity
+        - Update-AzVpnConnection : added parameter EnableInternetSecurity
+        - New-AzExpressRouteConnection : added parameter EnableInternetSecurity
+        - Set-AzExpressRouteConnection : added parameter EnableInternetSecurity
 * Add support for Configuring TopLevel WebApplicationFirewall Policy
     - New cmdlets added:
         - New-AzApplicationGatewayFirewallPolicySetting
@@ -591,8 +659,8 @@ to enable create Azure-SSIS IR with static public IP addresses.
     - New cmdlets added:
         - New-AzureRmTrafficSelectorPolicy
     - Cmdlets updated with optional parameter -TrafficSelectorPolicies
-        -New-AzureRmVirtualNetworkGatewayConnection
-        -Set-AzureRmVirtualNetworkGatewayConnection
+        -New-AzVirtualNetworkGatewayConnection
+        -Set-AzVirtualNetworkGatewayConnection
 * Add support for ESP and AH protocols in network security rule configurations
     - Updated cmdlets:
         - Add-AzNetworkSecurityRuleConfig

Dockerfile

@@ -63,6 +63,11 @@
     <OnPremiseBuild Condition="!Exists($(OnPremiseBuildTasks))">false</OnPremiseBuild>
     <!-- CISignRepo is an environment variable that points to ci-signing repo clone -->
     <CISignRepoPath>$(CISignRepo)</CISignRepoPath>
+
+    <!-- Docker related -->
+    <DockerRoot>$(RepoRoot)docker</DockerRoot>
+    <DockerTools>$(RepoTools)Docker</DockerTools>
+    <DockerImageName Condition="'$(DockerImageName)' == ''">azure-powershell</DockerImageName>
   </PropertyGroup>
 
   <!-- Tasks -->
@@ -237,6 +242,12 @@
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. Unregister-PSRepository -Name MSIcreationrepository &quot;" />
   </Target>
 
+  <Target Name="BuildImages">
+    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(DockerTools)/GetArtifacts.ps1 -Artifacts $(RepoArtifacts) -Docker $(DockerRoot) &quot;" />
+    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(DockerTools)/BuildImages.ps1 -DOCKER $(DockerRoot) -DockerImageName $(DockerImageName) &quot;" />
+    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(DockerTools)/CleanArtifacts.ps1 -Docker $(DockerRoot) &quot;" />
+  </Target>
+
   <Target Name="Test">
     <Message Importance="high" Text="Running check in tests..." />
     <MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />

VirtualMachineCustomScriptExtensionManagedDisk.json

@@ -0,0 +1,45 @@
+FROM mcr.microsoft.com/powershell:centos-7
+
+ARG ARTIFACTS=/tmp/artifacts/
+ARG ARTIFACT=*.nupkg
+ARG TEMPREPO=tmp
+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 IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-centos-7
+
+ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-centos-7"
+
+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"
+
+# install azure-powershell from built artifacts
+COPY ${ARTIFACT} ${ARTIFACTS}
+RUN pwsh -Command Register-PSRepository -Name ${TEMPREPO} -SourceLocation ${ARTIFACTS} -PublishLocation $ARTIFACTS -InstallationPolicy Trusted -PackageManagementProvider NuGet && \
+    pwsh -Command Install-Module -Name ${MODULE} -Repository ${TEMPREPO} && \
+    pwsh -Command Get-Module -ListAvailable && \
+    pwsh -Command Unregister-PSRepository -Name ${TEMPREPO} && \
+    pwsh -Command Remove-Item ${ARTIFACTS} -Recurse
+
+# create AzureRmContextSettings.json before it was generated
+COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}
+
+CMD [ "pwsh" ]

build.proj

@@ -0,0 +1,45 @@
+FROM mcr.microsoft.com/powershell:debian-9
+
+ARG ARTIFACTS=/tmp/artifacts/
+ARG ARTIFACT=*.nupkg
+ARG TEMPREPO=tmp
+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 IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-debian-9
+
+ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-debian-9"
+
+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"
+
+# install azure-powershell from built artifacts
+COPY ${ARTIFACT} ${ARTIFACTS}
+RUN pwsh -Command Register-PSRepository -Name ${TEMPREPO} -SourceLocation ${ARTIFACTS} -PublishLocation $ARTIFACTS -InstallationPolicy Trusted -PackageManagementProvider NuGet && \
+    pwsh -Command Install-Module -Name ${MODULE} -Repository ${TEMPREPO} && \
+    pwsh -Command Get-Module -ListAvailable && \
+    pwsh -Command Unregister-PSRepository -Name ${TEMPREPO} && \
+    pwsh -Command Remove-Item ${ARTIFACTS} -Recurse
+
+# create AzureRmContextSettings.json before it was generated
+COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}
+
+CMD [ "pwsh" ]

docker/Dockerfile-centos-7

@@ -0,0 +1,45 @@
+FROM mcr.microsoft.com/powershell:ubuntu-18.04
+
+ARG ARTIFACTS=/tmp/artifacts/
+ARG ARTIFACT=*.nupkg
+ARG TEMPREPO=tmp
+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 IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-ubuntu-18.04
+
+ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-ubuntu-18.04"
+
+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"
+
+# install azure-powershell from built artifacts
+COPY ${ARTIFACT} ${ARTIFACTS}
+RUN pwsh -Command Register-PSRepository -Name ${TEMPREPO} -SourceLocation ${ARTIFACTS} -PublishLocation $ARTIFACTS -InstallationPolicy Trusted -PackageManagementProvider NuGet && \
+    pwsh -Command Install-Module -Name ${MODULE} -Repository ${TEMPREPO} && \
+    pwsh -Command Get-Module -ListAvailable && \
+    pwsh -Command Unregister-PSRepository -Name ${TEMPREPO} && \
+    pwsh -Command Remove-Item ${ARTIFACTS} -Recurse
+
+# create AzureRmContextSettings.json before it was generated
+COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}
+
+CMD [ "pwsh" ]