From ac50c8a94949759f4d073a7861bbe4b4a814d3b7 Mon Sep 17 00:00:00 2001
From: erich-wang <eriwan@microsoft.com>
Date: Mon, 22 Jun 2020 17:13:03 +0800
Subject: [PATCH] make track2 mgmt sdks preview 1 depends on Azure.Core 2.2
 (#12910)

* make track2 mgmt sdks preview 1 depends on Azure.Core 2.2

* fix project reference check error

* remove duplicate import for storage

* fix core ci error for test common projects
---
 eng/Directory.Build.Data.targets                               | 3 +--
 .../Directory.Build.props                                      | 1 +
 .../Azure.ResourceManager.Compute/Directory.Build.props        | 1 +
 .../Azure.ResourceManager.EventHubs/Directory.Build.props      | 1 +
 .../Azure.ResourceManager.KeyVault/Directory.Build.props       | 1 +
 .../Azure.ResourceManager.Network/Directory.Build.props        | 1 +
 .../Azure.ResourceManager.Resources/Directory.Build.props      | 1 +
 .../tests/Azure.ResourceManager.Storage.Tests.csproj           | 1 -
 sdk/testcommon/Azure.Graph.Rbac/Directory.Build.props          | 1 +
 .../Azure.Management.Compute.2019_12/Directory.Build.props     | 1 +
 .../Azure.Management.Network.2020_04/Directory.Build.props     | 1 +
 .../Azure.Management.Resources.2017_05/Directory.Build.props   | 1 +
 .../Azure.Management.Storage.2019_06/Directory.Build.props     | 1 +
 13 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/eng/Directory.Build.Data.targets b/eng/Directory.Build.Data.targets
index eecd100f9bc5..d653fec9438f 100644
--- a/eng/Directory.Build.Data.targets
+++ b/eng/Directory.Build.Data.targets
@@ -135,8 +135,7 @@
   <!-- *********** Management Client Library Override section ************* -->
   <ItemGroup Condition="'$(IsMgmtClientLibrary)' == 'true' and '$(IsTestProject)' != 'true'">
     <PackageReference Include="System.Text.Json" />
-    <ProjectReference Include="$(RepoRoot)\sdk\core\Azure.Core\src\Azure.Core.csproj" />
-
+ 
     <!-- TODO: Review these file references-->
     <Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
     <Compile Include="$(AzureCoreSharedSources)ClientDiagnostics.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
diff --git a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/Directory.Build.props b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/Directory.Build.props
index 1a9611bd4924..6d3ca920ccad 100644
--- a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/Directory.Build.props
+++ b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/Directory.Build.props
@@ -3,4 +3,5 @@
     Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
   -->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+  <Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
 </Project>
diff --git a/sdk/compute/Azure.ResourceManager.Compute/Directory.Build.props b/sdk/compute/Azure.ResourceManager.Compute/Directory.Build.props
index 1a9611bd4924..6d3ca920ccad 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/Directory.Build.props
+++ b/sdk/compute/Azure.ResourceManager.Compute/Directory.Build.props
@@ -3,4 +3,5 @@
     Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
   -->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+  <Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
 </Project>
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/Directory.Build.props b/sdk/eventhub/Azure.ResourceManager.EventHubs/Directory.Build.props
index 1a9611bd4924..6d3ca920ccad 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/Directory.Build.props
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/Directory.Build.props
@@ -3,4 +3,5 @@
     Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
   -->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+  <Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
 </Project>
diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/Directory.Build.props b/sdk/keyvault/Azure.ResourceManager.KeyVault/Directory.Build.props
index 1a9611bd4924..6d3ca920ccad 100644
--- a/sdk/keyvault/Azure.ResourceManager.KeyVault/Directory.Build.props
+++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/Directory.Build.props
@@ -3,4 +3,5 @@
     Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
   -->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+  <Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
 </Project>
diff --git a/sdk/network/Azure.ResourceManager.Network/Directory.Build.props b/sdk/network/Azure.ResourceManager.Network/Directory.Build.props
index 1a9611bd4924..6d3ca920ccad 100644
--- a/sdk/network/Azure.ResourceManager.Network/Directory.Build.props
+++ b/sdk/network/Azure.ResourceManager.Network/Directory.Build.props
@@ -3,4 +3,5 @@
     Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
   -->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+  <Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
 </Project>
diff --git a/sdk/resources/Azure.ResourceManager.Resources/Directory.Build.props b/sdk/resources/Azure.ResourceManager.Resources/Directory.Build.props
index 1a9611bd4924..6d3ca920ccad 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/Directory.Build.props
+++ b/sdk/resources/Azure.ResourceManager.Resources/Directory.Build.props
@@ -3,4 +3,5 @@
     Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
   -->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+  <Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
 </Project>
diff --git a/sdk/storage/Azure.ResourceManager.Storage/tests/Azure.ResourceManager.Storage.Tests.csproj b/sdk/storage/Azure.ResourceManager.Storage/tests/Azure.ResourceManager.Storage.Tests.csproj
index e9913c25b90b..b3a59e284c8a 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/tests/Azure.ResourceManager.Storage.Tests.csproj
+++ b/sdk/storage/Azure.ResourceManager.Storage/tests/Azure.ResourceManager.Storage.Tests.csproj
@@ -3,7 +3,6 @@
     <TestHelperProjects>Resources201705;</TestHelperProjects>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\core\Azure.Core\src\Azure.Core.csproj" />
     <ProjectReference Include="..\src\Azure.ResourceManager.Storage.csproj" />
   </ItemGroup>
 </Project>
diff --git a/sdk/testcommon/Azure.Graph.Rbac/Directory.Build.props b/sdk/testcommon/Azure.Graph.Rbac/Directory.Build.props
index 1a9611bd4924..b53edbbeda13 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/Directory.Build.props
+++ b/sdk/testcommon/Azure.Graph.Rbac/Directory.Build.props
@@ -3,4 +3,5 @@
     Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
   -->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+  <Import Condition="'$(IsClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
 </Project>
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/Directory.Build.props b/sdk/testcommon/Azure.Management.Compute.2019_12/Directory.Build.props
index 1a9611bd4924..6d3ca920ccad 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/Directory.Build.props
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/Directory.Build.props
@@ -3,4 +3,5 @@
     Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
   -->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+  <Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
 </Project>
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/Directory.Build.props b/sdk/testcommon/Azure.Management.Network.2020_04/Directory.Build.props
index 1a9611bd4924..6d3ca920ccad 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/Directory.Build.props
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/Directory.Build.props
@@ -3,4 +3,5 @@
     Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
   -->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+  <Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
 </Project>
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/Directory.Build.props b/sdk/testcommon/Azure.Management.Resources.2017_05/Directory.Build.props
index 1a9611bd4924..6d3ca920ccad 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/Directory.Build.props
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/Directory.Build.props
@@ -3,4 +3,5 @@
     Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
   -->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+  <Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
 </Project>
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/Directory.Build.props b/sdk/testcommon/Azure.Management.Storage.2019_06/Directory.Build.props
index 1a9611bd4924..6d3ca920ccad 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/Directory.Build.props
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/Directory.Build.props
@@ -3,4 +3,5 @@
     Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
   -->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+  <Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
 </Project>