leonardbf · leonardbf · Mar 28, 2019 · Dec 17, 2018 · Dec 17, 2018 · Dec 17, 2018
diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml
@@ -1,65 +1,68 @@
 trigger:
 - psSdkJson6
 
-#Variables: 
-#  'source.scope' list of projects to build (Ex: SDKs\KeyVault\dataPlane)
-#  'build.useLatest' indicates whether or not to use build bootstrap files from the LTSBuildTools branch
+# variables:
+# ProjectFile - The project to build and test. This variable is defined in pipeline web ui because we want to be able to provide it at queue time and that isn't supported in yaml yet.
 
 jobs:
-  - job: 'Build_and_Test'
-  
+  - job: 'Build_Packages'
+
     pool:
       vmImage: 'vs2017-win2016'
 
     steps:
-      - script: |
-         set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
-         for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -prerelease -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
-         echo "%_VSCOMNTOOLS%\VsDevCmd.bat"
-         call "%_VSCOMNTOOLS%\VsDevCmd.bat"
-
-         sn -Vr *,31bf3856ad364e35
-        displayName: 'Allow unsigned build tool'
+      - task: DotNetCoreInstaller@0
+        displayName: 'Use .NET Core sdk 2.1.503'
+        inputs:
+          version: 2.1.503
 
-      - task: MSBuild@1
-        displayName: 'Init Build'
+      - task: DotNetCoreCLI@2
+        displayName: 'Build and Package'
         inputs:
-          solution: build.proj
-          msbuildArguments: '/t:Init /flp:LogFile=msbuild.Initlog;Verbosity=normal /p:UseLatest=$(build.useLatest)'
+          command: pack
+          packagesToPack: '$(ProjectFile)'
 
-      - task: MSBuild@1
-        displayName: 'Build assemblies and run tests'
+      - task: PublishBuildArtifacts@1
+        displayName: 'Publish Artifacts'
         inputs:
-          solution: build.proj
-          msbuildArguments: '/t:RunTests /p:Scope=$(source.scope) /p:Configuration=Release /clp:ShowTimestamp /flp:Summary;Verbosity=minimal;LogFile=FullBuild.sum /flp1:warningsonly;logfile=FullBuild.wrn /flp2:errorsonly;logfile=FullBuild.err /p:DebugTrace=$(system.debug) /p:CodeSign=false /p:AuthenticodeSign=false /p:RunGlobalReadinessTools=false /p:EnablePreBuildTarget=false /p:EnablePostBuildTarget=false'
+          ArtifactName: packages
 
-      - task: MSBuild@1
-        displayName: 'Build NuGet Packages'
+  - job: 'Test_Windows'
+
+    pool:
+      vmImage: 'vs2017-win2016'
+
+    steps:
+      - task: DotNetCoreInstaller@0
+        displayName: 'Use .NET Core sdk 2.1.503'
         inputs:
-          solution: build.proj
-          msbuildArguments: '/t:PackageNoBuild /p:Scope=$(source.scope) /p:Configuration=Release /flp:v=diag /flp:Summary;Verbosity=minimal;LogFile=PkgBuild.sum /flp1:warningsonly;logfile=PkgBuild.wrn /flp2:errorsonly;logfile=PkgBuild.err /p:DebugOutput=true /p:DebugTrace=$(system.debug)'
+          version: 2.1.503
 
-      - script: |
-         set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
-         for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -prerelease -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
-         echo "%_VSCOMNTOOLS%\VsDevCmd.bat"
-         call "%_VSCOMNTOOLS%\VsDevCmd.bat"
-
-         sn -Vl
-         sn -Vu *,31bf3856ad364e35
-        displayName: 'Clean up unsigned build tool allowance'
-        condition: always()
+      - task: DotNetCoreCLI@2
+        displayName: 'Build & Test'
+        inputs:
+          command: test
+          projects: '$(ProjectFile)'
 
       - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
         displayName: 'Component Detection'
-        # ComponentGovernance is currently unable to run on pull requests of public projects.  Running on 
+        # ComponentGovernance is currently unable to run on pull requests of public projects.  Running on
         # scheduled builds should be good enough.
         condition: and(succeeded(), eq(variables['Build.Reason'], 'Schedule'))
 
-      - task: PublishBuildArtifacts@1
-        displayName: 'Publish Artifacts'
-        inputs:
-          PathtoPublish: 'binaries\packages'
-          ArtifactName: packages
+  - job: 'Test_Linux'
 
+    pool:
+      vmImage: 'ubuntu-16.04'
 
+    steps:
+      - task: DotNetCoreInstaller@0
+        displayName: 'Use .NET Core sdk 2.1.503'
+        inputs:
+          version: 2.1.503
+
+      - task: DotNetCoreCLI@2
+        displayName: 'Build & Test'
+        inputs:
+          command: test
+          projects: '$(ProjectFile)'
diff --git a/AzSdk.props b/AzSdk.props
@@ -1,9 +1,3 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<!--
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>true</DelaySign>
-    <AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  -->
+<Import Project="$(NetSdkBuildTargetsDir)\core\_AzSdk.props" Condition=" Exists('$(NetSdkBuildTargetsDir)\core\_AzSdk.props') "/>
 </Project>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,28 +1,11 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LibraryRoot>$(MSBuildThisFileDirectory)</LibraryRoot>
-    <LibraryToolsFolder>$(LibraryRoot)tools</LibraryToolsFolder>
-    <BuildAssetsDir>$(LibraryToolsFolder)\BuildAssets</BuildAssetsDir>
-    <SdkBuildToolsDir>$(LibraryToolsFolder)\SdkBuildTools</SdkBuildToolsDir>
+    <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
+    <RepoEngPath>$(MSBuildThisFileDirectory)eng</RepoEngPath>
+    <RepoSrcPath>$(RepoRoot)src/SDKs</RepoSrcPath>
+    <IsDataPlaneProject Condition="$(MSBuildProjectDirectory.Contains('data-plane'))">true</IsDataPlaneProject>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <NetSdkBuildTargetsDir Condition=" Exists('$(BuildAssetsDir)') ">$(BuildAssetsDir)\targets</NetSdkBuildTargetsDir>
-    <NetSdkBuildTargetsDir Condition=" Exists('$(SdkBuildToolsDir)') AND '$(NetSdkBuildTargetsDir)' == '' ">$(SdkBuildToolsDir)\targets</NetSdkBuildTargetsDir>
-    <NetSdkBuildToolsDir Condition=" Exists('$(BuildAssetsDir)') ">$(BuildAssetsDir)</NetSdkBuildToolsDir>
-    <NetSdkBuildToolsDir Condition=" Exists('$(SdkBuildToolsDir)') AND '$(NetSdkBuildToolsDir)' == '' ">$(SdkBuildToolsDir)</NetSdkBuildToolsDir>
-  </PropertyGroup>
-
-  <!-- If Scope is specified then don't ignore any tests by default otherwise when building all ignore the projects with issues -->
-  <PropertyGroup Condition="'$(Scope)' == '' or '$(Scope)' == 'All'">
-    <DefaultPathTokenToIgnore>$(DefaultPathTokenToIgnore) Microsoft.Rest.ClientRuntime.Tracing.Tests</DefaultPathTokenToIgnore>
-    <DefaultPathTokenToIgnore>$(DefaultPathTokenToIgnore) Microsoft.Azure.Services.AppAuthentication.IntegrationTests</DefaultPathTokenToIgnore>
-    <DefaultPathTokenToIgnore>$(DefaultPathTokenToIgnore) Batch\DataPlane</DefaultPathTokenToIgnore>
-    <DefaultPathTokenToIgnore>$(DefaultPathTokenToIgnore) Batch\Support</DefaultPathTokenToIgnore>
-    <DefaultPathTokenToIgnore>$(DefaultPathTokenToIgnore) KeyVault\dataPlane\Microsoft.Azure.KeyVault.Tests</DefaultPathTokenToIgnore>
-    <DefaultPathTokenToIgnore>$(DefaultPathTokenToIgnore) KeyVault\dataPlane\Microsoft.Azure.KeyVault.Extensions.Tests</DefaultPathTokenToIgnore>
-    <DefaultPathTokenToIgnore>$(DefaultPathTokenToIgnore) LocationBasedServices</DefaultPathTokenToIgnore>
-  </PropertyGroup>
-
-  <Import Project="$(NetSdkBuildTargetsDir)\core\_Directory.Build.props" Condition=" Exists('$(NetSdkBuildTargetsDir)\core\_Directory.Build.props') "/>
+  <Import Project="$(RepoEngPath)\Directory.Build.Mgmt.props" Condition="'$(IsDataPlaneProject)' != 'true'" />
+  <Import Project="$(RepoEngPath)\Directory.Build.Data.props" Condition="'$(IsDataPlaneProject)' == 'true'" />
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,4 +1,4 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(NetSdkBuildTargetsDir)\core\_Directory.Build.targets" Condition=" Exists('$(NetSdkBuildTargetsDir)\core\_Directory.Build.targets') "/>
-	<Import Project="tools\bootstrapTools\bootstrap.targets" />
+  <Import Project="$(RepoEngPath)\Directory.Build.Mgmt.targets" Condition="'$(IsDataPlaneProject)' != 'true'" />
+  <Import Project="$(RepoEngPath)\Directory.Build.Data.targets" Condition="'$(IsDataPlaneProject)' == 'true'" />
 </Project>
diff --git a/Documentation/Using-Azure-TestFramework.md b/Documentation/Using-Azure-TestFramework.md
@@ -109,15 +109,21 @@ Ensure that the `HttpRecorderMode` in the `TEST_CSM_ORGID_AUTHENTICATION` enviro
 	* RawToken
 	* RawGraphToken
 	* HttpRecorderMode={Record | Playback}
-	* AADTokenAudienceUri
+	* AADAuthEndpoint
+
+	* GraphTokenAudienceUri
 	* BaseUri
-	* GraphUri
+	* AADAuthUri
 	* GalleryUri
-	* IbizaProtalUri
+	* GraphUri
+	* IbizaPortalUri
+	* RdfePortalUri
+	* ResourceManagementUri
+	* ServiceManagementUri
+	* AADTokenAudienceUri
+	* GraphTokenAudienceUri
 	* DataLakeStoreServiceUri
 	* DataLakeAnalyticsJobAndCatalogServiceUri
-	* AADAuthEndpoint
-	* GraphTokenAudienceUri
 
 ## 8. Supported Environment in Test framework (Azure environments)
 
@@ -140,44 +146,44 @@ Ensure that the `HttpRecorderMode` in the `TEST_CSM_ORGID_AUTHENTICATION` enviro
 ##### Environment = Dogfood
 
 	AADAuthUri = "https://login.windows-ppe.net";
-    GalleryUri = "https://df.gallery.azure-test.net/";
-    GraphUri = "https://graph.ppe.windows.net/";
-    IbizaPortalUri = "http://df.onecloud.azure-test.net";
-    RdfePortalUri = "https://windows.azure-test.net";
-    ResourceManagementUri = "https://api-dogfood.resources.windows-int.net/";
-    ServiceManagementUri = "https://management-preview.core.windows-int.net";
-    AADTokenAudienceUri = "https://management.core.windows.net";
-    GraphTokenAudienceUri = "https://graph.ppe.windows.net/";
-    DataLakeStoreServiceUri = "https://caboaccountdogfood.net";
-    DataLakeAnalyticsJobAndCatalogServiceUri = "https://konaaccountdogfood.net";
+	GalleryUri = "https://df.gallery.azure-test.net/";
+	GraphUri = "https://graph.ppe.windows.net/";
+	IbizaPortalUri = "http://df.onecloud.azure-test.net";
+	RdfePortalUri = "https://windows.azure-test.net";
+	ResourceManagementUri = "https://api-dogfood.resources.windows-int.net/";
+	ServiceManagementUri = "https://management-preview.core.windows-int.net";
+	AADTokenAudienceUri = "https://management.core.windows.net";
+	GraphTokenAudienceUri = "https://graph.ppe.windows.net/";
+	DataLakeStoreServiceUri = "https://caboaccountdogfood.net";
+	DataLakeAnalyticsJobAndCatalogServiceUri = "https://konaaccountdogfood.net";
 
 ##### Environment = Next
 
 	AADAuthUri = "https://login.windows-ppe.net"
-    GalleryUri = "https://next.gallery.azure-test.net/"
-    GraphUri = "https://graph.ppe.windows.net/"
-    IbizaPortalUri = "http://next.onecloud.azure-test.net"
-    RdfePortalUri = "https://auxnext.windows.azure-test.net"
-    ResourceManagementUri = "https://api-next.resources.windows-int.net/"
-    ServiceManagementUri = "https://managementnext.rdfetest.dnsdemo4.com"
-    AADTokenAudienceUri = "https://management.core.windows.net"
-    GraphTokenAudienceUri = "https://graph.ppe.windows.net/"
-    DataLakeStoreServiceUri = "https://caboaccountdogfood.net"
-    DataLakeAnalyticsJobAndCatalogServiceUri = "https://konaaccountdogfood.net"
+	GalleryUri = "https://next.gallery.azure-test.net/"
+	GraphUri = "https://graph.ppe.windows.net/"
+	IbizaPortalUri = "http://next.onecloud.azure-test.net"
+	RdfePortalUri = "https://auxnext.windows.azure-test.net"
+	ResourceManagementUri = "https://api-next.resources.windows-int.net/"
+	ServiceManagementUri = "https://managementnext.rdfetest.dnsdemo4.com"
+	AADTokenAudienceUri = "https://management.core.windows.net"
+	GraphTokenAudienceUri = "https://graph.ppe.windows.net/"
+	DataLakeStoreServiceUri = "https://caboaccountdogfood.net"
+	DataLakeAnalyticsJobAndCatalogServiceUri = "https://konaaccountdogfood.net"
 
 ##### Environment = Current
 
 	AADAuthUri = "https://login.windows-ppe.net"
-    GalleryUri = "https://df.gallery.azure-test.net/"
-    GraphUri = "https://graph.ppe.windows.net/"
-    IbizaPortalUri = "http://df.onecloud.azure-test.net"
-    RdfePortalUri = "https://windows.azure-test.net"
-    ResourceManagementUri = "https://api-dogfood.resources.windows-int.net/"
-    ServiceManagementUri = "https://management-preview.core.windows-int.net"
-    AADTokenAudienceUri = "https://management.core.windows.net"
-    GraphTokenAudienceUri = "https://graph.ppe.windows.net/"
-    DataLakeStoreServiceUri = "https://caboaccountdogfood.net"
-    DataLakeAnalyticsJoAbndCatalogServiceUri = "https://konaaccountdogfood.net"
+	GalleryUri = "https://df.gallery.azure-test.net/"
+	GraphUri = "https://graph.ppe.windows.net/"
+	IbizaPortalUri = "http://df.onecloud.azure-test.net"
+	RdfePortalUri = "https://windows.azure-test.net"
+	ResourceManagementUri = "https://api-dogfood.resources.windows-int.net/"
+	ServiceManagementUri = "https://management-preview.core.windows-int.net"
+	AADTokenAudienceUri = "https://management.core.windows.net"
+	GraphTokenAudienceUri = "https://graph.ppe.windows.net/"
+	DataLakeStoreServiceUri = "https://caboaccountdogfood.net"
+	DataLakeAnalyticsJoAbndCatalogServiceUri = "https://konaaccountdogfood.net"
 
 ##### Environment = Custom
 When specified, test framework expect all Uri's to be provided by the user as part of the connection string.

diff --git a/NuGet.Config b/NuGet.Config
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="NugetOfficialV3" value="https://api.nuget.org/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="Local" value="tools/LocalNugetFeed" />
+    <add key="roslyn" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
   </packageSources>
-</configuration>
+</configuration>
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 
 
-# Microsoft Azure SDK for .NET
+## All PRs should be opened against master branch. This branch is being retired and will be deleted.
+
+### Microsoft Azure SDK for .NET
  ----------
 The Microsoft Azure SDK for .NET allows you to build applications
 that take advantage of scalable cloud computing resources.

diff --git a/eng/AzSdk.reference.targets b/eng/AzSdk.reference.targets
@@ -0,0 +1,17 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.18, 4.0.0)" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.18, 3.0.0)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IsTargetingNetStandard)' == 'true'">
+    <PackageReference Include="System.Net.Http" Version="4.3.0"/>
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IsTargetingNetFx)' == 'true'">
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+    <PackageReference Include="Newtonsoft.Json" Version="6.0.8" />
+  </ItemGroup>
+</Project>
diff --git a/eng/AzSdk.test.reference.targets b/eng/AzSdk.test.reference.targets
@@ -0,0 +1,14 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+
+    <PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.13.1, 2.0.0)" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.7.5, 2.0.0)" />
+    <PackageReference Include="Microsoft.Azure.ResourceManager" Version="[1.1.0-preview]" />
+
+    <!-- This is needed for discovering tests in test explorer -->
+    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
+  </ItemGroup>
+</Project>
diff --git a/eng/Directory.Build.Data.props b/eng/Directory.Build.Data.props
@@ -0,0 +1,51 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Setup default project properties -->
+  <PropertyGroup>
+    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
+    <PlatformName Condition="'$(PlatformName)' == ''">$(Platform)</PlatformName>
+    <SignAssembly>true</SignAssembly>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+
+  <!-- TargetFramework default properties -->
+  <PropertyGroup>
+    <RequiredTargetFrameworks>net452;netstandard1.4</RequiredTargetFrameworks>
+
+    <IsTargetingNetFx Condition="$(TargetFramework.StartsWith('net4'))">true</IsTargetingNetFx>
+    <IsTargetingNetStandard Condition="$(TargetFramework.StartsWith('netstandard'))">true</IsTargetingNetStandard>
+    <IsTargetingNetCoreApp Condition="$(TargetFramework.StartsWith('netcoreapp'))">true</IsTargetingNetCoreApp>
+
+    <DefineConstants Condition="'$(IsTargetingNetFx)' == 'true'">$(DefineConstants);FullNetFx</DefineConstants>
+  </PropertyGroup>
+
+  <!-- Setup common output paths -->
+  <PropertyGroup>
+    <ArtifactsDir Condition="'$(ArtifactsDir)' == ''">$(RepoRoot)artifacts\</ArtifactsDir>
+    <ArtifactsObjDir>$(ArtifactsDir)obj\</ArtifactsObjDir>
+    <ArtifactsBinDir>$(ArtifactsDir)bin\</ArtifactsBinDir>
+    <ArtifactsPackagesDir>$(ArtifactsDir)packages\$(Configuration)\</ArtifactsPackagesDir>
+
+    <OutDirName Condition="'$(OutDirName)' == ''">$(MSBuildProjectName)</OutDirName>
+
+    <BaseOutputPath Condition="'$(BaseOutputPath)' == ''">$([System.IO.Path]::GetFullPath('$(ArtifactsBinDir)$(OutDirName)\'))</BaseOutputPath>
+    <OutputPath Condition="'$(PlatformName)' == 'AnyCPU'">$(BaseOutputPath)$(Configuration)\</OutputPath>
+    <OutputPath Condition="'$(PlatformName)' != 'AnyCPU'">$(BaseOutputPath)$(PlatformName)\$(Configuration)\</OutputPath>
+
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$([System.IO.Path]::GetFullPath('$(ArtifactsObjDir)$(OutDirName)\'))</BaseIntermediateOutputPath>
+    <IntermediateOutputPath Condition="'$(PlatformName)' == 'AnyCPU'">$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU'">$(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\</IntermediateOutputPath>
+
+    <PackageOutputPath>$(ArtifactsPackagesDir)</PackageOutputPath>
+  </PropertyGroup>
+
+  <!-- Common library and package properties -->
+  <PropertyGroup>
+    <Company>Microsoft Corporation</Company>
+    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    <Authors>Microsoft</Authors>
+    <Product>Azure .NET SDK</Product>
+    <NeutralLanguage>en-US</NeutralLanguage>
+  </PropertyGroup>
+</Project>