Merge from Azure/master

.github/CODEOWNERS

@@ -1 +1,45 @@
-# See for instructions on this file https://help.github.com/articles/about-codeowners/
+# Instructions for CODEOWNERS file format and automatic build failure notifications:
+# https://github.com/Azure/azure-sdk/blob/master/docs/engineering-system/codeowners.md
+
+###########
+# SDK
+###########
+
+# Catch all
+/sdk/ @AlexGhiondea
+
+# Core
+/sdk/core/ @pakrym
+
+# Service teams
+/sdk/appconfiguration/ @annelo-msft
+
+/sdk/batch/ @matthchr 
+
+/sdk/cognitiveservices/language.textanalytics/ @assafi 
+/sdk/cognitiveservices/vision.computervision/ @toothache
+/sdk/cognitiveservices/vision.face/ @TFR258 
+
+/sdk/eventgrid/ @kalyanaj 
+
+/sdk/eventhub/ @serkantkaraca 
+/sdk/eventhub/azure.messaging.eventhubs/ @jsquire @kinelski
+
+/sdk/identity/azure.identity/ @shaabs
+
+/sdk/keyvault/ @schaabs 
+/sdk/keyvault/azure.*/ @schaabs @shahabhijeet 
+
+/sdk/search/ @brjohnstmsft
+/sdk/servicebus/ @nemakam 
+/sdk/storage/ @kfarmer-msft @seanmcc-msft @tg-msft
+# Management Plane
+/**/*Management*/ @erich-wang
+
+###########
+# Eng Sys
+###########
+/eng/           @weshaggard @chidozieononiwu @mitchdenny @danieljurek
+/eng/mgmt/      @erich-wang
+/**/tests.yml   @danieljurek
+/**/ci.yml      @mitchdenny

Documentation/sdk-for-net-packages.md

@@ -48,6 +48,7 @@ Below are the packages maintained in this repository.
 | Monitor                       | `Microsoft.Azure.Management.Monitor`                        | [![Monitor](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.Monitor.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.Monitor) |
 | Network                       | `Microsoft.Azure.Management.Network`                        | [![Network](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.Network.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.Network) |
 | Notification Hubs             | `Microsoft.Azure.Management.NotificationHubs`               | [![Notification Hubs](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.NotificationHubs.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.NotificationHubs) |
+| Peering                       | `Microsoft.Azure.Management.Peering`                        | [![Peering](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.Peering.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.Peering) |
 | Policy Insights               | `Microsoft.Azure.Management.PolicyInsights`                 | [![Policy Insights](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.PolicyInsights.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.PolicyInsights) |
 | Operational Insights          | `Microsoft.Azure.Management.OperationalInsights`            | [![Operational Insights](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.OperationalInsights.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.OperationalInsights) |
 | Power BI Embedded             | `Microsoft.Azure.Management.PowerBIEmbedded`                | [![Power BI Embedded](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.PowerBIEmbedded.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.PowerBIEmbedded) |

NuGet.Config

@@ -5,6 +5,7 @@
     <add key="Local" value="tools/LocalNugetFeed" />
     <add key="roslyn" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
     <add key="azure-sdk-tools" value="https://azuresdkartifacts.blob.core.windows.net/azure-sdk-tools/index.json" />
+    <add key="azure-sdk-for-net" value="https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-net/index.json" />
   </packageSources>
   <config>
 		<add key="globalPackagesFolder" value="restoredPackages" />

eng/.docsettings.yml

@@ -6,6 +6,7 @@ omitted_paths:
   - Documentation/*
   - sdk/*mgmt*/*
   - sdk/*/*.Management.*/*
+  - samples/*
 language: net
 root_check_enabled: True
 required_readme_sections:

eng/Directory.Build.Data.props

@@ -30,6 +30,8 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <!-- Avoid implicitly added preview feeds -->
+    <AddDotnetfeedProjectSource>false</AddDotnetfeedProjectSource>
   </PropertyGroup>
 
   <!-- CentralPackageVersions properties -->
@@ -39,9 +41,10 @@
 
   <PropertyGroup>
     <IsTestProject Condition="$(MSBuildProjectName.EndsWith('.Tests'))">true</IsTestProject>
+    <IsSamplesProject Condition="$(MSBuildProjectName.EndsWith('.Samples'))">true</IsSamplesProject>
     <IsTestSupportProject Condition="'$(IsTestProject)' != 'true' and ($(MSBuildProjectDirectory.Contains('/tests/')) or $(MSBuildProjectDirectory.Contains('\tests\')))">true</IsTestSupportProject>
-    <EnableClientSdkAnalyzers Condition="'$(IsClientLibrary)' == 'true' and '$(IsTestProject)' != 'true' and '$(IsTestSupportProject)' != 'true'">true</EnableClientSdkAnalyzers>
-    <EnableFxCopAnalyzers Condition="'$(IsClientLibrary)' == 'true' and '$(IsTestProject)' != 'true' and '$(IsTestSupportProject)' != 'true'">true</EnableFxCopAnalyzers>
+    <EnableClientSdkAnalyzers Condition="'$(IsClientLibrary)' == 'true' and '$(IsTestProject)' != 'true' and '$(IsTestSupportProject)' != 'true' and '$(IsSamplesProject)' != 'true'">true</EnableClientSdkAnalyzers>
+    <EnableFxCopAnalyzers Condition="'$(IsClientLibrary)' == 'true' and '$(IsTestProject)' != 'true' and '$(IsTestSupportProject)' != 'true' and '$(IsSamplesProject)' != 'true'">true</EnableFxCopAnalyzers>
   </PropertyGroup>
 
   <!-- TargetFramework default properties -->
@@ -51,7 +54,7 @@
     <SupportsNetStandard20 Condition="'$(SupportsNetStandard20)' == ''">false</SupportsNetStandard20>
 
     <RequiredTargetFrameworks>net452;netstandard1.4;net461;netstandard2.0</RequiredTargetFrameworks>
-    <RequiredTargetFrameworks Condition="'$(SupportsNetStandard20)' == 'true'">net461;netstandard2.0</RequiredTargetFrameworks>
+    <RequiredTargetFrameworks Condition="'$(SupportsNetStandard20)' == 'true'">netstandard2.0</RequiredTargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'">
@@ -110,7 +113,7 @@
     <DocumentationFile>$(IntermediateOutputPath)$(TargetFramework)\$(MSBuildProjectName).xml</DocumentationFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'">
+  <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsSamplesProject)' == 'true'">
     <!-- Always fully sign test assemblies since we have a full public/private key -->
     <PublicSign>false</PublicSign>
     <DelaySign>false</DelaySign>

eng/Packages.Data.props

@@ -9,7 +9,6 @@
   <ItemGroup>
     <PackageReference Update="ApprovalTests" Version="3.0.22" />
     <PackageReference Update="ApprovalUtilities" Version="3.0.22" />
-    <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20190503.1" />
     <PackageReference Update="Azure.Core" Version="1.0.0-preview.6" />
     <PackageReference Update="BenchmarkDotNet" Version="0.11.5" />
     <PackageReference Update="FsCheck.Xunit" Version="2.14.0" />
@@ -31,23 +30,19 @@
     <PackageReference Update="Microsoft.Azure.Services.AppAuthentication" Version="[1.0.3, 2.0.0)" />
     <PackageReference Update="Microsoft.Azure.Storage.Blob" Version="9.4.2" />
     <PackageReference Update="Microsoft.Azure.Test.HttpRecorder" Version="[1.13.1, 2.0.0)" />
-    <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0-preview6.19259.10" />
     <PackageReference Update="Microsoft.Bcl.Json.Sources" Version="4.6.0-preview3.19128.7" />
     <PackageReference Update="Microsoft.Build.Tasks.Core" Version="15.5.180" />
     <PackageReference Update="Microsoft.Build" Version="15.5.180" />
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.6.1" />
     <PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
     <PackageReference Update="Microsoft.CodeAnalysis" Version="2.3.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="2.2.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="2.1.0" />
     <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
     <PackageReference Update="Microsoft.Extensions.Configuration" Version="1.0.2" />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
-    <PackageReference Update="Microsoft.Extensions.Options" Version="2.2.0" />
     <PackageReference Update="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
     <PackageReference Update="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="4.5.1" />
+    <PackageReference Update="Microsoft.Identity.Client" Version="4.1.0" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.1.0" />
     <PackageReference Update="Microsoft.NETCore.Platforms" Version="2.2.1" />
     <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-alpha-004" />
@@ -81,7 +76,6 @@
     <PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="[5.4.0, 6.0.0)" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
     <PackageReference Update="System.Linq" Version="4.3.0" />
-    <PackageReference Update="System.Memory" Version="4.5.2" />
     <PackageReference Update="System.Net.Http" Version="4.3.4" />
     <PackageReference Update="System.Net.WebSockets.Client" Version="4.3.2" />
     <PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
@@ -95,12 +89,24 @@
     <PackageReference Update="System.Security.Cryptography.Cng" Version="4.3.0" />
     <PackageReference Update="System.Security.Cryptography.Primitives" Version="4.3.0" />
     <PackageReference Update="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
-    <PackageReference Update="System.Text.Json" Version="4.6.0-preview6.19259.10" />
     <PackageReference Update="System.Threading.Tasks.Extensions" Version="4.5.2" />
     <PackageReference Update="System.ValueTuple" Version="4.5.0" />
     <PackageReference Update="WindowsAzure.ServiceBus" Version="5.1.0" />
     <PackageReference Update="WindowsAzure.Storage" Version="9.3.3" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Update="xunit" Version="2.4.1" />
   </ItemGroup>
+  <!-- Track 2 specific versions -->
+  <ItemGroup Condition="'$(IsClientLibrary)' == 'true'">
+    <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20190716.1" />
+    <PackageReference Update="System.Memory" Version="4.5.3" />
+    <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0-preview7.19362.9" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
+    <PackageReference Update="Microsoft.Extensions.Options" Version="2.1.0" />
+    <PackageReference Update="System.Text.Json" Version="4.6.0-preview7.19362.9" />
+    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="4.6.0-preview7.19362.9" />
+    <PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview7.19362.9" />
+  </ItemGroup>
 </Project>

eng/mgmt/Directory.Build.Mgmt.props

@@ -1,11 +1,13 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<PkgVersion>0.10.0</PkgVersion>
+		<PkgVersion>0.12.0-dev.20190718.1</PkgVersion>
 		<PkgLocalDir>$(RepoRoot)\restoredPackages\microsoft.internal.netsdkbuild.mgmt.tools\$(PkgVersion)\Sdk</PkgLocalDir>
 	</PropertyGroup>
 
+	<!-- during execution of tasks tests, this conditional import will satisfy the import resolution. And you will have to manually execute a target to restore the package
+	Again this is strickly for build tools tests that will be run against this repo -->
 	<Import Condition="Exists($(PkgLocalDir))" Project="$(PkgLocalDir)\CI.Bootstrap.targets" />
-	<Import Condition="!Exists($(PkgLocalDir))" Project="CI.Bootstrap.targets" Sdk="Microsoft.Internal.NetSdkBuild.Mgmt.Tools" Version="0.10.0" />
+	<Import Condition="!Exists($(PkgLocalDir))" Project="CI.Bootstrap.targets" Sdk="Microsoft.Internal.NetSdkBuild.Mgmt.Tools" Version="0.12.0-dev.20190718.1" />
 	<Import Project="$(RepoRoot)\tools\bootstrapTools\bootstrap.targets" />
 	<PropertyGroup>
 		<SignAssembly>true</SignAssembly>

eng/mgmt/mgmtmetadata/attestation_resource-manager.txt

@@ -0,0 +1,14 @@
+Installing AutoRest version: latest
+AutoRest installed successfully.
+Commencing code generation
+Generating CSharp code
+Executing AutoRest command
+cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/attestation/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=C:\azure-sdk-for-net\sdk
+2019-07-18 06:23:11 UTC
+Azure-rest-api-specs repository information
+GitHub fork: Azure
+Branch:      master
+Commit:      76c353d92b8037fe1e02c36deeb06d78d284e5d7
+AutoRest information
+Requested version: latest
+Bootstrapper version:    [email protected]

eng/mgmt/mgmtmetadata/compute_resource-manager.txt

@@ -0,0 +1,14 @@
+Installing AutoRest version: latest
+AutoRest installed successfully.
+Commencing code generation
+Generating CSharp code
+Executing AutoRest command
+cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/compute/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=E:\hylee-sdk\july2\sdk
+2019-07-18 00:16:54 UTC
+Azure-rest-api-specs repository information
+GitHub fork: Azure
+Branch:      master
+Commit:      6b6a445819212313e466b2f77f8b3e6d4f9d18fb
+AutoRest information
+Requested version: latest
+Bootstrapper version:    [email protected]

eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt

@@ -0,0 +1,14 @@
+Installing AutoRest version: latest
+AutoRest installed successfully.
+Commencing code generation
+Generating CSharp code
+Executing AutoRest command
+cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Repos\azure-sdk-for-net\sdk
+2019-07-26 10:54:28 UTC
+Azure-rest-api-specs repository information
+GitHub fork: Azure
+Branch:      master
+Commit:      7936730ee4e746dd7af1a0a97b20ba4779a2a35c
+AutoRest information
+Requested version: latest
+Bootstrapper version:    [email protected]

eng/mgmt/mgmtmetadata/datamigration_resource-manager.txt

@@ -0,0 +1,14 @@
+Installing AutoRest version: latest
+AutoRest installed successfully.
+Commencing code generation
+Generating CSharp code
+Executing AutoRest command
+cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datamigration/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\
+2019-07-18 23:36:36 UTC
+Azure-rest-api-specs repository information
+GitHub fork: Azure
+Branch:      master
+Commit:      e55caaf6d92a0efdb2c1dc268f052d6266bde439
+AutoRest information
+Requested version: latest
+Bootstrapper version:    [email protected]

eng/mgmt/mgmtmetadata/search_data-plane_Microsoft.Azure.Search.Service.txt

@@ -0,0 +1,14 @@
+Installing AutoRest version: latest
+AutoRest installed successfully.
+Commencing code generation
+Generating CSharp code
+Executing AutoRest command
+cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/search/data-plane/Microsoft.Azure.Search.Service/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=C:\repos\azure-sdk-for-net\sdk
+2019-07-25 22:29:05 UTC
+Azure-rest-api-specs repository information
+GitHub fork: Azure
+Branch:      master
+Commit:      a28a3fca492d332b0e515f0017551cb692772b29
+AutoRest information
+Requested version: latest
+Bootstrapper version:    [email protected]

eng/mgmt/mgmtmetadata/sql_resource-manager.txt

@@ -4,11 +4,11 @@ Commencing code generation
 Generating CSharp code
 Executing AutoRest command
 cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/sql/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=.
-2019-07-11 15:27:39 UTC
+2019-07-16 21:28:54 UTC
 Azure-rest-api-specs repository information
 GitHub fork: Azure
 Branch:      master
-Commit:      808cfe2da58aa6f1d93bed748004dfb97268e6e3
+Commit:      737110f8edd3689144c45d6fd34e7c6143171ab8
 AutoRest information
 Requested version: latest
 Bootstrapper version:    [email protected]

eng/pipelines/.prettierrc.yml

@@ -0,0 +1 @@
+singleQuote: false

eng/pipelines/client.yml

@@ -14,4 +14,4 @@ jobs:
 - template: templates/jobs/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: $(ServiceDirectory)
-    VersioningProperties: /p:OfficialBuildId=$(OfficialBuildId) /p:PreRelaseVersionLabel=$(PreReleaseVersionLabel) /p:DotNetFinalVersionKind=$(DotNetFinalVersionKind)
+    VersioningProperties: /p:OfficialBuildId=$(OfficialBuildId) /p:PreRelaseVersionLabel=$(PreReleaseVersionLabel) /p:DotNetFinalVersionKind=$(DotNetFinalVersionKind)

eng/pipelines/docs.yml

@@ -7,8 +7,8 @@ jobs:
     pool:
       vmImage: vs2017-win2016
     steps:
-      - powershell: |
-          Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v2.43.2/docfx.zip" `
+      - pwsh: |
+          Invoke-WebRequest -MaximumRetryCount 10 -Uri "https://github.com/dotnet/docfx/releases/download/v2.43.2/docfx.zip" `
           -OutFile "docfx.zip" | Wait-Process; Expand-Archive -Path "docfx.zip" -DestinationPath "./docfx/"
         workingDirectory: $(Build.BinariesDirectory)
         displayName: Download and Extract DocFX
@@ -18,9 +18,9 @@ jobs:
           script: $(Build.BinariesDirectory)/docfx/docfx.exe init -q
           workingDirectory: $(Build.SourcesDirectory)
           failOnStderr: true
-      - powershell: ls
+      - pwsh: ls
         workingDirectory: $(Build.SourcesDirectory)/docfx_project/
-      - powershell: |
+      - pwsh: |
           Copy-Item "$(Build.SourcesDirectory)/eng/docgeneration/docfx.json" -Destination "$(Build.SourcesDirectory)/docfx_project/" -Force
         displayName: Copy over docfx.json
       - task: CmdLine@2
@@ -40,7 +40,7 @@ jobs:
         inputs:
           scriptPath: "$(Build.SourcesDirectory)/eng/docgeneration/script/CreateTocYml.py"
           arguments: $(Build.SourcesDirectory)
-      - powershell: |
+      - pwsh: |
           Copy-Item "$(Build.SourcesDirectory)/eng/docgeneration/api/*" -Destination "$(Build.SourcesDirectory)/docfx_project/api/" -Force
           Copy-Item "$(Build.SourcesDirectory)/eng/docgeneration/api/index.md" -Destination "$(Build.SourcesDirectory)/docfx_project/articles/intro.md" -Force
           Copy-Item "$(Build.SourcesDirectory)/Documentation/*" -Destination "$(Build.SourcesDirectory)/docfx_project/articles/"
@@ -61,15 +61,15 @@ jobs:
           scriptPath: "$(Build.SourcesDirectory)/eng/docgeneration/script/CreateTocYmlForArticles.py"
           arguments: $(Build.SourcesDirectory)
           failOnStderr: true
-      - powershell: ls
+      - pwsh: ls
         workingDirectory: $(Build.SourcesDirectory)/docfx_project/articles
       - task: CmdLine@2
         displayName: Build Doc Content
         inputs:
           script: $(Build.BinariesDirectory)/docfx/docfx.exe build
           workingDirectory: $(Build.SourcesDirectory)/docfx_project/
           failOnStderr: true
-      - powershell: |
+      - pwsh: |
           Copy-Item "$(Build.SourcesDirectory)/eng/docgeneration/assets/*" -Destination "$(Build.SourcesDirectory)/docfx_project/_site/" -Force
         displayName: Replace site assets
       - task: CopyFiles@2
@@ -83,4 +83,4 @@ jobs:
         condition: succeeded()
         inputs:
           artifactName: docfx_project
-          targetPath: $(Build.ArtifactStagingDirectory)/docfx_project/_site
+          targetPath: $(Build.ArtifactStagingDirectory)/docfx_project/_site