Azure · grizzlytheodore · Jun 15, 2021 · Mar 26, 2021 · Mar 29, 2021 · Apr 8, 2021
diff --git a/.azure-pipelines/daily-build.yml b/.azure-pipelines/daily-build.yml
@@ -5,7 +5,7 @@ schedules:
   displayName: Daily Midnight Build
   branches:
     include:
-    - master
+    - main
 
 pr: none
 

diff --git a/.azure-pipelines/powershell-core.yml b/.azure-pipelines/powershell-core.yml
@@ -2,14 +2,23 @@ variables:
   WindowsName: windows
   WindowsImage: vs2017-win2016
   LinuxName: linux
-  LinuxImage: ubuntu-18.04
+  LinuxImage: ubuntu-20.04
   MacOSName: macOS
   MacOSImage: macOS-10.14
   TestFramework: netcoreapp2.1
   TestTarget: Test
   Configuration: Debug
   DebugLocalBuildTasks: true
 
+trigger: none
+
+pr:
+  branches:
+    include:
+      - '*'
+    exclude:
+      - Azs-tzl
+
 jobs:
 - job: Build
   displayName: Build

diff --git a/.azure-pipelines/util/analyze-steps.yml b/.azure-pipelines/util/analyze-steps.yml
@@ -11,7 +11,7 @@ steps:
   displayName: 'Use .NET Core sdk'
   inputs:
     packageType: sdk
-    version: 2.1.x
+    version: 3.1.x
 
 - pwsh: 'Install-Module platyPS -Force -Confirm:$false -Scope CurrentUser'
   displayName: 'Install platyPS'

diff --git a/.azure-pipelines/util/build-steps.yml b/.azure-pipelines/util/build-steps.yml
@@ -13,7 +13,7 @@ steps:
   displayName: 'Use .NET Core sdk'
   inputs:
     packageType: sdk
-    version: 2.1.x
+    version: 3.1.x
 
 - task: DotNetCoreCLI@2
   displayName: Build

diff --git a/.azure-pipelines/windows-powershell.yml b/.azure-pipelines/windows-powershell.yml
@@ -6,6 +6,15 @@ variables:
   Configuration: Debug
   DebugLocalBuildTasks: true
 
+trigger: none
+
+pr:
+  branches:
+    include:
+      - '*'
+    exclude:
+      - Azs-tzl
+
 jobs:
 - job: Build
   displayName: Build

diff --git a/.gitignore b/.gitignore
@@ -226,6 +226,7 @@ launchSettings.json
 /ModuleMappings.json
 /tools/Modules/tmp
 /tools/Az/Az.psm1
+/tools/AzPreview/AzPreview.psm1
 /Azure.PowerShell.sln
 
 # Added due to scan

diff --git a/ChangeLog.md b/ChangeLog.md
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Run the following command in an elevated PowerShell session to install the rollu
 Install-Module -Name Az
 ```
 
-This module runs on Windows PowerShell with [.NET Framework 4.7.2][DotNetFramework] or greater, or [PowerShell Core][PowerShellCore]. The `Az` module replaces `AzureRM`. You should not install `Az` side-by-side with `AzureRM`.
+This module runs on Windows PowerShell with [.NET Framework 4.7.2][DotNetFramework] or greater, or [the latest version of PowerShell 7][PowerShellCore]. The `Az` module replaces `AzureRM`. You should not install `Az` side-by-side with `AzureRM`.
 
 If you have an earlier version of the Azure PowerShell modules installed from the PowerShell Gallery and would like to update to the latest version, run the following commands in an elevated PowerShell session:
 

diff --git a/build.proj b/build.proj
@@ -103,15 +103,15 @@
   </Target>
 
   <Target Name="BuildTools">
-    <Exec Command="dotnet publish $(RepoTools)StaticAnalysis/StaticAnalysis.Netcore.csproj -c $(Configuration) -f netcoreapp2.1" />
+    <Exec Command="dotnet publish $(RepoTools)StaticAnalysis/StaticAnalysis.Netcore.csproj -c $(Configuration)" />
   </Target>
 
   <Target Name="FilterBuild" Condition="$(PullRequestNumber) != '' OR $(TargetModule) != ''" DependsOnTargets="BuildTools">
     <Message Importance="high" Text="Filtering projects and modules..." />
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/CreateFilterMappings.ps1&quot;" />
 
     <!-- Build the Microsoft.Azure.Build.Tasks project -->
-    <Exec Command="dotnet publish $(RepoTools)BuildPackagesTask/Microsoft.Azure.Build.Tasks/Microsoft.Azure.Build.Tasks.csproj -c $(Configuration) -f netstandard2.0" />
+    <Exec Command="dotnet publish $(RepoTools)BuildPackagesTask/Microsoft.Azure.Build.Tasks/Microsoft.Azure.Build.Tasks.csproj -c $(Configuration)" />
 
     <!-- Get all of the files changed in the given pull request -->
     <FilesChangedTask RepositoryOwner="Azure" RepositoryName="azure-powershell" PullRequestNumber="$(PullRequestNumber)" TargetModule="$(TargetModule)">
@@ -268,11 +268,11 @@
   </Target>
 
   <Target Name="AzToolsInstaller">
-    <Exec Command="dotnet msbuild $(RepoTools)/Az.Tools.Installer/build.proj /t:'clean;build;test'" />
+    <Exec Command='dotnet msbuild $(RepoTools)/Az.Tools.Installer/build.proj /t:"clean;build;test"' />
   </Target>
 
   <Target Name="AzToolsPredictor">
-    <Exec Command="dotnet msbuild $(RepoTools)/Az.Tools.Predictor/build.proj /t:'clean;build;test'" />
+    <Exec Command='dotnet msbuild $(RepoTools)/Az.Tools.Predictor/build.proj /t:"clean;build;test"' />
   </Target>
 
   <Target Name="ChangeLogErrorMessage">

diff --git a/documentation/Debugging-StaticAnalysis-Errors.md b/documentation/Debugging-StaticAnalysis-Errors.md
@@ -42,7 +42,7 @@ _Note_: Sometimes the error listed in the .csv file can be a false positive (for
 We take breaking changes very seriously, so please be mindful about the violations that you suppress in our repo.
 
 ### Signature Issues
-Signature issues occur when your cmdlets do not follow PowerShell standards.  Please check the [_Cmdlet Best Practices_](https://github.com/Azure/azure-powershell/blob/master/documentation/development-docs/design-guidelines/cmdlet-best-practices.md) and the [_Parameter Best Practices_](https://github.com/Azure/azure-powershell/blob/master/documentation/development-docs/design-guidelines/parameter-best-practices.md) documents to ensure you are following PowerShell guidelines.  Issues with severity 0 or 1 must be addressed, while issues with severity 2 are advisory.  If you have an issue with severity 0 or 1 that has been approved by the Azure PowerShell team, you can suppress them following these steps:
+Signature issues occur when your cmdlets do not follow PowerShell standards.  Please check the [_Cmdlet Best Practices_](https://github.com/Azure/azure-powershell/blob/main/documentation/development-docs/design-guidelines/cmdlet-best-practices.md) and the [_Parameter Best Practices_](https://github.com/Azure/azure-powershell/blob/main/documentation/development-docs/design-guidelines/parameter-best-practices.md) documents to ensure you are following PowerShell guidelines.  Issues with severity 0 or 1 must be addressed, while issues with severity 2 are advisory.  If you have an issue with severity 0 or 1 that has been approved by the Azure PowerShell team, you can suppress them following these steps:
 
 - Download the `SignatureIssues.csv` file from the Jenkins build
 - Open the file using a text editor (such as VS Code) and copy each of the errors you'd like to suppress
@@ -51,4 +51,4 @@ Signature issues occur when your cmdlets do not follow PowerShell standards.  Pl
 - Push the changes to the .csv file and ensure the errors no longer show up in the `SignatureIssues.csv` file output from the Jenkins build.
 
 ### Help Issues
-Most help issues that cause StaticAnalysis to fail occur when help has not been added for a particular cmdlet.  If you have not generated help for your new cmdlets, please follow the instructions [here](https://github.com/Azure/azure-powershell/blob/master/documentation/development-docs/help-generation.md). If this is not the issue, follow the steps listed under "Remediation" for each violation listed in HelpIssues.csv.
+Most help issues that cause StaticAnalysis to fail occur when help has not been added for a particular cmdlet.  If you have not generated help for your new cmdlets, please follow the instructions [here](https://github.com/Azure/azure-powershell/blob/main/documentation/development-docs/help-generation.md). If this is not the issue, follow the steps listed under "Remediation" for each violation listed in HelpIssues.csv.
diff --git a/documentation/announcing-az-module.md b/documentation/announcing-az-module.md
@@ -1,13 +1,13 @@
 # Announcing New Module 'Az'
-In August 2018 we released a new module, 'Az' which combines the functionality of the AzureRM and AzureRM.Netcore modules.  Az will go to version 1.0 on 12/18/2018. Az runs on both Windows PowerShell 5.1 and PowerShell Core.  'Az' ensures that the Windows PowerShell and PowerShell Core cmdlets for managing Azure resources will always be in sync and up to date.  In addition, Az will simplify and regularize the naming of Azure cmdlets, and the organization of Azure modules.  Az is intended as a replacement for the AzureRM.Netcore and AzureRM modules.
+In August 2018 we released a new module, 'Az' which combines the functionality of the AzureRM and AzureRM.Netcore modules.  Az goes to version 1.0 on 12/18/2018. Az runs on both Windows PowerShell 5.1 and PowerShell 7.  'Az' ensures that the Windows PowerShell and PowerShell 7 cmdlets for managing Azure resources will always be in sync and up to date.  In addition, Az will simplify and regularize the naming of Azure cmdlets, and the organization of Azure modules.  Az is intended as a replacement for the AzureRM.Netcore and AzureRM modules.
 
 Az currently ships in Cloud Shell, and can be found on the PowerShell Gallery [here](https://www.powershellgallery.com/packages/Az/)
 
 Az is a new module, and reorganizing and simplifying cmdlet names involves breaking changes, so we have [added features to Az to make it easier to transition to the simplified, normalized names in your existing scripts](#migrating-from-azurerm). 
 
 ## New Features
-  - Windows PowerShell 5.1 and PowerShell Core support in the same module
-  - PowerShell Core and Windows PowerShell cmdlets are always in sync and up to date with latest Azure capabilities
+  - Windows PowerShell 5.1 and PowerShell 7 support in the same module
+  - PowerShell 7 and Windows PowerShell cmdlets are always in sync and up to date with latest Azure capabilities
   - Shortened and normalized cmdlet names - all cmdlets use the noun prefix 'Az'
   - Simplified and normalized module organization - data plane and management plane cmdlets in the same module for each service
   - Enhanced authentication for Netcore
@@ -17,8 +17,7 @@ Az is a new module, and reorganizing and simplifying cmdlet names involves break
 
 ## Supported Platforms
   - PowerShell 5.1 with .Net Framework 4.7.2 or later [Windows only]
-  - PowerShell Core 6.0 - Windows, Linux, macOS
-  - PowerShell Core 6.1 - Windows, Linux, macOS
+  - PowerShell 7 - Windows, Linux, macOS
 
 ## Timeline
 
@@ -170,12 +169,12 @@ For scripts that import modules directly, or use ```#Requires``` statements to s
 ### Installing Az and AzureRM Side-by-Side
 
 Az and AzureRM cannot be imported side-by-side into the same PowerShell session.  If you do not want to migrate your scripts from AzureRM to Az right away, there are two main options:
-- Install Az in PowerShell Core, and leave AzureRM in Windows PowerShell
+- Install Az in PowerShell 7, and leave AzureRM in Windows PowerShell
 - Install Az and AzureRM side-by-side in Windows PowerShell and ensure scripts do not mix the modules
 
-#### Install Az in PowerShell Core
-You can follow the instructions in [Installing PowerShell Core on Windows](https://docs.microsoft.com/powershell/scripting/install/installing-powershell-core-on-windows?view=powershell-6
-) to install PowerShell Core, then use ```Install-Module Az``` in PowerShell Core to acquire the Az module.  Since Windows PowerShell and PowerShell Core can exist side-by-side and do not share module directories, this will effectively isolate the two modules.
+#### Install Az in PowerShell 7
+You can follow the instructions in [Installing PowerShell 7 on Windows](https://docs.microsoft.com/powershell/scripting/install/installing-powershell-core-on-windows
+) to install PowerShell 7, then use ```Install-Module Az``` in PowerShell 7 to acquire the Az module.  Since Windows PowerShell and PowerShell 7 can exist side-by-side and do not share module directories, this will effectively isolate the two modules.
 
 #### Install Az and AzureRM Side-by-Side
 If you need to have both modules installed:

diff --git a/documentation/azure-powershell-modules.md b/documentation/azure-powershell-modules.md
@@ -42,6 +42,7 @@ Custom Resource Providers             | `Az.CustomProviders`
 Data Box                              | `Az.DataBox`                            | [![DataBox]][DataBoxGallery]
 Data Box Edge (Stack Edge)            | `Az.DataBoxEdge`                        | [![DataBoxEdge]][DataBoxEdgeGallery]
 Databricks                            | `Az.Databricks`                         | [![Databricks]][DatabricksGallery]
+DataDog                               | `Az.DataDog`                            | [![DataDog]][DataDogGallery]
 Data Factory                          | `Az.DataFactory`                        | [![DataFactory]][DataFactoryGallery]
 Data Lake Analytics                   | `Az.DataLakeAnalytics`                  | [![DataLakeAnalytics]][DataLakeAnalyticsGallery]
 Data Lake Store                       | `Az.DataLakeStore`                      | [![DataLakeStore]][DataLakeStoreGallery]

diff --git a/documentation/development-docs/azure-powershell-developer-guide.md b/documentation/development-docs/azure-powershell-developer-guide.md
@@ -48,7 +48,7 @@ The following prerequisites should be completed before contributing to the Azure
 - Install the latest version of [Git](https://git-scm.com/downloads)
 - Install the [`platyPS` module](help-generation.md#Installing-platyPS)
 - Install the latest [**.NET Core SDK** and **.NET Framework Dev Pack 4.7.2**](https://dotnet.microsoft.com/download) or greater
-- Install [PowerShell Core](https://github.com/PowerShell/PowerShell/releases/latest)
+- 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:
   - `C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe`
   - `C:\Windows\SysWOW64\WindowsPowerShell\v1.0\powershell.exe`
@@ -76,10 +76,10 @@ You now be able to create your own branches, commit changes, and push commits to
 git remote add upstream https://github.com/Azure/azure-powershell.git
 ```
 
-Then, to pull changes from the **master** branch in _Azure/azure-powershell_ into your local working branch, run the following command:
+Then, to pull changes from the **main** branch in _Azure/azure-powershell_ into your local working branch, run the following command:
 
 ```
-git pull upstream master
+git pull upstream main
 ```
 
 ## Building the Environment
@@ -92,7 +92,7 @@ After cloning the repository to your local machine, you want to ensure that you
 msbuild build.proj
 ```
 
-Alternatively, you can open any command prompt (Command Prompt, Windows PowerShell, or PowerShell Core), navigate to the root of the repository, and run:
+Alternatively, you can open any command prompt (Command Prompt, Windows PowerShell, or PowerShell 7), navigate to the root of the repository, and run:
 
 ```powershell
 PS C:\azure-powershell> dotnet msbuild build.proj
@@ -124,7 +124,7 @@ Launch `VS Developer Command Prompt` and run the following command (from the roo
 msbuild build.proj /t:Test
 ```
 
-Alternatively, you can open any command prompt (Command Prompt, Windows PowerShell, or PowerShell Core), navigate to the root of the repository, and run:
+Alternatively, you can open any command prompt (Command Prompt, Windows PowerShell, or PowerShell 7), navigate to the root of the repository, and run:
 
 ```powershell
 PS C:\azure-powershell> dotnet msbuild build.proj /t:Test

diff --git a/documentation/development-docs/cleaning-up-commits.md b/documentation/development-docs/cleaning-up-commits.md
@@ -60,10 +60,10 @@ For more information on squashing, click [here](https://git-scm.com/book/en/v2/G
 
 If you want to merge specific commits from another branch into the current one you are working from, use **cherry-picking**. 
 
-For example, if you're working on the **master** branch and want to pull commit X (the commit-hash) from the **feature** branch, you may run the following commands:
+For example, if you're working on the **main** branch and want to pull commit X (the commit-hash) from the **feature** branch, you may run the following commands:
 
 ```
-git checkout master
+git checkout main
 git cherry-pick X -n
 ```
 
@@ -73,7 +73,7 @@ Now, if you want to cherry-pick a range of commits, say X through Y, from the **
 
 ```
 git checkout -b temp-branch X
-git rebase --onto master Y^
+git rebase --onto main Y^
 ```
 
 For more information on cherry-picking, click [here](https://git-scm.com/docs/git-cherry-pick).
diff --git a/documentation/development-docs/design-guidelines/cmdlet-best-practices.md b/documentation/development-docs/design-guidelines/cmdlet-best-practices.md
@@ -139,7 +139,7 @@ $job | Wait-Job
 $subscriptions = $job | Receive-Job
 ````
 
-To set a custom job name, please use [`SetBackgroupJobDescription`](https://github.com/Azure/azure-powershell-common/blob/master/src/Common/AzurePSCmdlet.cs#L810). The default job description is: "Long Running Operation for '{cmdlet name}' on resource '{resource name}'"
+To set a custom job name, please use [`SetBackgroupJobDescription`](https://github.com/Azure/azure-powershell-common/blob/main/src/Common/AzurePSCmdlet.cs#L810). The default job description is: "Long Running Operation for '{cmdlet name}' on resource '{resource name}'"
 
 ### Required Parameter Sets
 

diff --git a/documentation/development-docs/examples/private-link-resource-example.md b/documentation/development-docs/examples/private-link-resource-example.md
@@ -23,18 +23,18 @@ if "List Private Endpoint Connection API" is not available, `Private Endpoint Co
 `privateEndpointConnections` need to be defined under this API
 
 ## Code Changes Needed
-Add corresponding {Provider}, {Top-Level-Resource} and {API-Version} into [ProviderConfiguration.cs](https://github.com/Azure/azure-powershell/blob/master/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/ProviderConfiguration.cs#L12)
+Add corresponding {Provider}, {Top-Level-Resource} and {API-Version} into [ProviderConfiguration.cs](https://github.com/Azure/azure-powershell/blob/main/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/ProviderConfiguration.cs#L12)
 in following pattern:
 ```
 RegisterConfiguration("{Provider}/{Top-Level-Resource}", "{API-Version}")
 ```
 For example:
 
-if "List Private Endpoint Connection API" is [available](https://github.com/Azure/azure-powershell/blob/master/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/GenericProvider.cs#L74),
+if "List Private Endpoint Connection API" is [available](https://github.com/Azure/azure-powershell/blob/main/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/GenericProvider.cs#L74),
 ```
 RegisterConfiguration("Microsoft.Sql/servers", "2018-06-01-preview")
 ```
-if "List Private Endpoint Connection API" is [not available](https://github.com/Azure/azure-powershell/blob/master/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/GenericProvider.cs#L93), provide extra bool parameter 'false'
+if "List Private Endpoint Connection API" is [not available](https://github.com/Azure/azure-powershell/blob/main/src/Network/Network/PrivateLinkService/PrivateLinkServiceProvider/GenericProvider.cs#L93), provide extra bool parameter 'false'
 ```
 RegisterConfiguration("Microsoft.Storage/storageAccounts", "2019-06-01", false)
 ```