Rebase master to Feature/live test other clouds.

.github/CODEOWNERS

@@ -37,7 +37,7 @@
 /sdk/search/                                    @brjohnstmsft @arv100kri @bleroy @tg-msft @heaths
 /sdk/search/Microsoft.*/                        @brjohnstmsft @arv100kri @bleroy
 
-/sdk/servicebus/                                @JoshLove-msft @ShivangiReja @jsquire
+/sdk/servicebus/                                @JoshLove-msft @ShivangiReja @jsquire @MiYanni
 /sdk/servicebus/Microsoft.*/                    @nemakam
 
 /sdk/storage/                                   @amishra-dev @seanmcc-msft @amnguye @kasobol-msft @tg-msft

.gitignore

@@ -62,6 +62,9 @@ ipch/
 *.psess
 *.vsp
 
+# VS Code
+.vscode/
+
 # Code analysis
 *.CodeAnalysisLog.xml
 

CONTRIBUTING.md

@@ -155,13 +155,10 @@ eng\scripts\Export-API.ps1 tables
 .NET is using the [ApiCompat tool](https://github.com/dotnet/arcade/tree/master/src/Microsoft.DotNet.ApiCompat) to enforce API compatibility between versions. Builds of GA'ed libraries will fail locally and in CI if there are breaking changes.
 
 ### How it works
-We use a dummy project called [ApiCompat](https://github.com/Azure/azure-sdk-for-net/tree/master/eng/ApiCompat/ApiCompat.csproj) to enforce API compatibility between the GA'ed libraries and the most recent version available on Nuget. This project includes package references to all GA'ed libraries and to Microsoft.DotNet.ApiCompat.
-Each listed library package is restored from Nuget via the package references listed in the `ApiCompat.csproj` file, in combination with the version listed for that package in [eng/Packages.Data.props](https://github.com/Azure/azure-sdk-for-net/blob/master/eng/Packages.Data.props).
-The `ApiCompatVerification` target defined in `ApiCompat.csproj` is referenced in the [eng/Directory.Build.Data.targets](https://github.com/Azure/azure-sdk-for-net/blob/master/eng/Directory.Build.Data.targets) which causes this target to be executed for each csproj that has the `EnableApiCompat` parameter set to true. The `EnableApiCompat` parameter defaults to the value of the `IsShippingClientLibrary` parameter, which is defined in [eng/Directory.Build.Data.props](https://github.com/Azure/azure-sdk-for-net/blob/master/eng/Directory.Build.Data.props). For libraries that do not yet have a public package defined in `ApiCompat.csproj` for comparison, set `<EnableApiCompat>false</EnableApiCompat>` in the csproj.
-
-### Adding a new GA'ed library
-To include add a new GA'ed library in the `ApiCompatVerification` target, add a package reference for the library to the `ApiCompat.csproj` file. You will also need to include the latest GA version of the library in [eng/Packages.Data.props](https://github.com/Azure/azure-sdk-for-net/blob/master/eng/Packages.Data.props). 
-Finally, include the `ApiCompat.csproj` in your solution so that the project will get automatically restored in Visual Studio.
+We use a dummy project called [ApiCompat](https://github.com/Azure/azure-sdk-for-net/tree/master/eng/ApiCompat/ApiCompat.csproj) to enforce API compatibility between the GA'ed libraries and the most recent version available on Nuget. This project includes package references to the GA'ed library and to Microsoft.DotNet.ApiCompat.
+Each library needs to provide a `ApiCompatVersion` property which is set to the last GA'ed version of the library which is used to compare APIs with the current to ensure no breaks
+have been introduced. 
+The `ApiCompatVerification` target defined in `ApiCompat.csproj` is referenced in the [eng/Directory.Build.Data.targets](https://github.com/Azure/azure-sdk-for-net/blob/master/eng/Directory.Build.Data.targets) which causes this target to be executed for each csproj that has the `ApiCompatVersion` property set. For libraries that wish to disable the APICompat check they can remove the `ApiCompatVersion` property from their project. Our version bump automation will automatically add or increment the `ApiCompatVersion` property to the project when it detects that the version it is changing was a GA version which usually indicates that we just shipped that GA version and so it should be the new baseline for api checks. 
 
 ### Releasing a new version of a GA'ed libary
 Since the [eng/Packages.Data.props](https://github.com/Azure/azure-sdk-for-net/blob/master/eng/Packages.Data.props) is currently maintained manually, you will need to update the version number for your library in this file when releasing a new version.

common/ManagementTestShared/ManagementRecordedTestBase.cs

@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+
+using Azure.Core;
+using Azure.Core.TestFramework;
+using Azure.Management.Resources;
+
+namespace Azure.ResourceManager.TestFramework
+{
+    public abstract class ManagementRecordedTestBase<TEnvironment> : RecordedTestBase<TEnvironment> where TEnvironment: TestEnvironment, new()
+    {
+        private static TimeSpan ZeroPollingInterval { get; } = TimeSpan.FromSeconds(0);
+
+        protected ResourceGroupCleanupPolicy CleanupPolicy { get; set; }
+
+        protected ManagementRecordedTestBase(bool isAsync) : base(isAsync)
+        {
+        }
+
+        protected ManagementRecordedTestBase(bool isAsync, RecordedTestMode mode) : base(isAsync, mode)
+        {
+        }
+
+        protected ValueTask<Response<T>> WaitForCompletionAsync<T>(Operation<T> operation)
+        {
+            if (Mode == RecordedTestMode.Playback)
+            {
+                return operation.WaitForCompletionAsync(ZeroPollingInterval, default);
+            }
+            else
+            {
+                return operation.WaitForCompletionAsync();
+            }
+        }
+
+        protected ResourcesManagementClient GetResourceManagementClient()
+        {
+            var options = Recording.InstrumentClientOptions(new ResourcesManagementClientOptions());
+            CleanupPolicy = new ResourceGroupCleanupPolicy();
+            options.AddPolicy(CleanupPolicy, HttpPipelinePosition.PerCall);
+
+            return CreateClient<ResourcesManagementClient>(
+                TestEnvironment.SubscriptionId,
+                TestEnvironment.Credential,
+                options);
+        }
+
+        protected async Task CleanupResourceGroupsAsync()
+        {
+            if (CleanupPolicy != null && Mode != RecordedTestMode.Playback)
+            {
+                var resourceGroupsClient = new ResourcesManagementClient(
+                    TestEnvironment.SubscriptionId,
+                    TestEnvironment.Credential,
+                    new ResourcesManagementClientOptions()).ResourceGroups;
+                foreach (var resourceGroup in CleanupPolicy.ResourceGroupsCreated)
+                {
+                    await resourceGroupsClient.StartDeleteAsync(resourceGroup);
+                }
+            }
+        }
+
+        protected async Task<string> GetFirstUsableLocationAsync(ProvidersOperations providersClient, string resourceProviderNamespace, string resourceType)
+        {
+            var provider = (await providersClient.GetAsync(resourceProviderNamespace)).Value;
+            return provider.ResourceTypes.Where(
+                (resType) =>
+                {
+                    if (resType.ResourceType == resourceType)
+                        return true;
+                    else
+                        return false;
+                }
+                ).First().Locations.FirstOrDefault();
+        }
+    }
+}

common/ManagementTestShared/ResourceGroupCleanupPolicy.cs

@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+using Azure.Core;
+using Azure.Core.Pipeline;
+
+namespace Azure.ResourceManager.TestFramework
+{
+    public class ResourceGroupCleanupPolicy : HttpPipelineSynchronousPolicy
+    {
+        private Regex _resourceGroupPattern = new Regex(@"/subscriptions/[^/]+/resourcegroups/([^?/]+)\?api-version");
+        private readonly IList<string> _resourceGroupCreated = new List<string>();
+
+        public IList<string> ResourceGroupsCreated
+        {
+            get { return _resourceGroupCreated; }
+        }
+
+        public override void OnSendingRequest(HttpMessage message)
+        {
+            if (message.Request.Method == RequestMethod.Put)
+            {
+                var match = _resourceGroupPattern.Match(message.Request.Uri.ToString());
+                if (match.Success)
+                {
+                    _resourceGroupCreated.Add(match.Groups[1].Value);
+                }
+            }
+        }
+    }
+}

doc/dev/Track2TestFramework.md

@@ -1,17 +1,18 @@
 # Acquiring TestFramework
 
-To start using test framework import `sdk\core\Azure.Core\tests\TestFramework.props` into test `.csproj`:
+To start using Test Framework add a project reference using the alias `AzureCoreTestFramework` into your test `.csproj`:
 
 ``` xml
 <Project Sdk="Microsoft.NET.Sdk">
 
 ...
-  <Import Project="..\..\..\core\Azure.Core\tests\TestFramework.props" />
+   <ProjectReference Include="$(AzureCoreTestFramework)" />
 ...
 
 </Project>
 
 ```
+As an example, see the [Template](https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/template/Azure.Template/tests/Azure.Template.Tests.csproj#L15) project.
 
 # Sync-async tests
 
@@ -182,13 +183,19 @@ __NOTE:__ recordings are copied from `netcoreapp2.1` directory by default, make
 
 ## Sanitizing
 
-Secrets that are part of requests, responses, headers or connections strings should be sanitized before saving the record. Common headers like `Authentication` are sanitized automatically but if custom logic is required `RecordedTest.Sanitizer` should be used as extension point.
+Secrets that are part of requests, responses, headers, or connections strings should be sanitized before saving the record. Common headers like `Authentication` are sanitized automatically but if custom logic is required and/or if request or response body need to be sanitied, the `RecordedTest.Sanitizer` should be used as extension point.
 
 For example:
 
 ``` C#
     public class ConfigurationRecordedTestSanitizer : RecordedTestSanitizer
     {
+        public ConfigurationRecordedTestSanitizer()
+            base()
+        {
+            JsonPathSanitizers.Add("$..secret");
+        }
+
         public override void SanitizeConnectionString(ConnectionString connectionString)
         {
             const string secretKey = "secret";
@@ -209,6 +216,8 @@ For example:
     }
 ```
 
+**Note:** `JsonPathSanitizers` takes [Json Path](https://www.newtonsoft.com/json/help/html/QueryJsonSelectToken.htm) format strings that will be validated against the body. If a match exists, the value will be sanitized.
+
 ## Matching
 
 When tests are ran in replay mode HTTP method, uri and headers are used to match request to response. Some headers change on every request and are not controlled by the client code and should be ignored during the matching. Common headers like `Date`, `x-ms-date`, `x-ms-client-request-id`, `User-Agent`, `Request-Id` are ignored by default but if more headers need to be ignored use `Recording.Matcher` extensions point.

eng/ApiCompat/ApiCompat.csproj

@@ -1,40 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <!--This project is used to enforce API compatibility between the GA'ed libraries and the most recent version available on Nuget. The most recent
+  <!--
+  This project is used to enforce API compatibility between the GA'ed libraries and the most recent version available on Nuget. The most recent
   version is restored from Nuget via the package references below. The ApiCompatVerification target, specified below, is referenced in the
-  eng/Directory.Build.Data.targets file which causes this target to be executed for each csproj that has the EnableApiCompat parameter set to true.
-  The EnableApiCompat parameter defaults to the value of the IsShippingClientLibrary parameter, which is defined in the eng/Directory.Build.Data.props file.-->
+  eng/Directory.Build.Data.targets file which causes this target to be executed for each csproj that has an ApiCompatVersion set.
+  -->
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <RunApiCompatForSrc>true</RunApiCompatForSrc>
-    <IntermediateOutputPath>$(IntermediateOutputPath)/$(TargetPackageName)</IntermediateOutputPath>    
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.ApiCompat" />
+    <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19552.1" />
+    <PackageReference Include="$(TargetPackageName)" Version="$(TargetPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Azure.Core" />
-    <PackageReference Include="Azure.Data.AppConfiguration" />
-    <PackageReference Include="Azure.Messaging.EventHubs" />
-    <PackageReference Include="Azure.Messaging.EventHubs.Processor" />
-    <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Azure.Security.KeyVault.Certificates" />
-    <PackageReference Include="Azure.Security.KeyVault.Keys" />
-    <PackageReference Include="Azure.Security.KeyVault.Secrets" />
-    <PackageReference Include="Azure.Storage.Blobs" />
-    <PackageReference Include="Azure.Storage.Blobs.Batch" />
-    <PackageReference Include="Azure.Storage.Common" />
-    <PackageReference Include="Azure.Storage.Files.Shares" />
-    <PackageReference Include="Azure.Storage.Queues" />
-    <PackageReference Include="Microsoft.Extensions.Azure" />
-  </ItemGroup>
-
-  <Import Project="..\Packages.Data.props" />
-
-  <Target Name="ApiCompatVerification" DependsOnTargets="_ResolveResolvedMatchingContract;$(TargetsTriggeredByCompilation)">
+  <Target Name="_VerifyTargetPackageInfo">
+    <Error Condition="'$(TargetPackageName)' == ''" Text="TargetPackageName is not set!" />
+    <Error Condition="'$(TargetPackageVersion)' == ''" Text="TargetPackageVersion is not set!" />
+    <Error Condition="'$(TargetOutputPath)' == ''" Text="TargetOutputPath is not set!" />
   </Target>
 
+  <Target Name="ApiCompatVerification"
+          DependsOnTargets="_VerifyTargetPackageInfo;
+                            Restore;
+                            _ResolveResolvedMatchingContract;
+                            $(TargetsTriggeredByCompilation)" />
+
   <Target Name="_ResolveResolvedMatchingContract" DependsOnTargets="ResolveReferences">
     <PropertyGroup>
       <TargetPackageDll Condition="'%(ResolvedCompileFileDefinitions.NuGetPackageId)' == '$(TargetPackageName)'" >%(ResolvedCompileFileDefinitions.Identity)</TargetPackageDll>
@@ -45,8 +36,6 @@
       <_DependencyDirectories Include="$(TargetOutputPath)" />
       <ReferencePath Remove="$(TargetPackageDll)" />
     </ItemGroup>
-    <Error Condition="'@(ResolvedMatchingContract)' == ''"
-             Text="Unable to find dll for $(TargetPackageName). Make sure it is included in list of Package References if the ApiCompatVerification target (defined in eng/ApiCompat/ApiCompat.csproj) is intended to run for this package. If ApiCompatVerification should not be run, set the EnableApiCompat parameter to false in the csproj file." />
     <Message Text="Running ApiCompatVerification against $(TargetPackageDll) using assemblies from $(TargetOutputPath)" Importance="High" />
   </Target>
 </Project>

eng/Azure.Management.Test.targets

@@ -0,0 +1,45 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ManagementTestSharedSources>$(MSBuildThisFileDirectory)/../common/ManagementTestShared</ManagementTestSharedSources>
+    <RbacSharedSources>$(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Graph.Rbac/src</RbacSharedSources>
+    <Resources201705SharedSources>$(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Management.Resources.2017_05/src</Resources201705SharedSources>
+    <Compute201912SharedSources>$(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Management.Compute.2019_12/src</Compute201912SharedSources>
+    <Network202004SharedSources>$(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Management.Network.2020_04/src</Network202004SharedSources>
+    <Storage201906SharedSources>$(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Management.Storage.2019_06/src</Storage201906SharedSources>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(TestHelperProjects)' != ''">
+    <Compile Include="$(ManagementTestSharedSources)/**/*.cs"
+             Link="TestShared/%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TestHelperProjects.Contains('Rbac1.6'))">
+    <Compile Include="$(RbacSharedSources)/**/*.cs"
+             Link="Rbac/%(RecursiveDir)%(Filename)%(Extension)"
+             Exclude="$(RbacSharedSources)/Properties/AssemblyInfo.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TestHelperProjects.Contains('Resources201705'))">
+    <Compile Include="$(Resources201705SharedSources)/**/*.cs"
+             Link="Resources201705/%(RecursiveDir)%(Filename)%(Extension)"
+             Exclude="$(Resources201705SharedSources)/Properties/AssemblyInfo.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TestHelperProjects.Contains('Compute201912'))">
+    <Compile Include="$(Compute201912SharedSources)/**/*.cs"
+             Link="Compute201912/%(RecursiveDir)%(Filename)%(Extension)"
+             Exclude="$(Compute201912SharedSources)/Properties/AssemblyInfo.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TestHelperProjects.Contains('Network202004'))">
+    <Compile Include="$(Network202004SharedSources)/**/*.cs"
+             Link="Network202004/%(RecursiveDir)%(Filename)%(Extension)"
+             Exclude="$(Network202004SharedSources)/Properties/AssemblyInfo.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TestHelperProjects.Contains('Storage201906'))">
+    <Compile Include="$(Storage201906SharedSources)/**/*.cs"
+             Link="Storage201906/%(RecursiveDir)%(Filename)%(Extension)"
+             Exclude="$(Storage201906SharedSources)/Properties/AssemblyInfo.cs" />
+  </ItemGroup>
+</Project>

eng/CodeGeneration.targets

@@ -1,9 +1,9 @@
 <Project>
 
   <PropertyGroup>
-    <_AutoRestVersion>https://github.com/Azure/autorest/releases/download/autorest-3.0.6222/autorest-3.0.6222.tgz</_AutoRestVersion>
-    <_AutoRestCoreVersion>3.0.6282</_AutoRestCoreVersion>
-    <_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200527.1/autorest-csharp-v3-3.0.0-dev.20200527.1.tgz</_AutoRestCSharpVersion>
+    <_AutoRestVersion>https://github.com/Azure/autorest/releases/download/autorest-3.0.6223/autorest-3.0.6223.tgz</_AutoRestVersion>
+    <_AutoRestCoreVersion>3.0.6283</_AutoRestCoreVersion>
+    <_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200612.2/autorest-csharp-v3-3.0.0-dev.20200612.2.tgz</_AutoRestCSharpVersion>
     <_SupportsCodeGeneration Condition="'$(IsClientLibrary)' == 'true'">true</_SupportsCodeGeneration>
     <_DefaultInputName Condition="Exists('$(MSBuildProjectDirectory)/autorest.md')">$(MSBuildProjectDirectory)/autorest.md</_DefaultInputName>
     <AutoRestInput Condition="'$(AutoRestInput)' == ''">$(_DefaultInputName)</AutoRestInput>
@@ -48,3 +48,7 @@
 
 
 
+
+
+
+