From ff8cdb9da77ec9eb1891292d497e8f776600c3b5 Mon Sep 17 00:00:00 2001
From: Alex Ghiondea <AlexGhiondea@users.noreply.github.com>
Date: Wed, 13 Mar 2019 15:20:58 -0700
Subject: [PATCH] Create a props file used to include Azure.Base in the
 project. (#5342)

* Create a props file used to include Azure.Base in the project
---
 .../Azure.Configuration.Tests.csproj              | 15 ++++-----------
 .../Azure.Configuration.csproj                    | 11 ++---------
 .../data-plane/Azure.Base/Azure.Base.props        | 11 +++++++++++
 3 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 src/SDKs/Azure.Base/data-plane/Azure.Base/Azure.Base.props

diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.ApplicationModel.Configuration.Tests/Azure.Configuration.Tests.csproj b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.ApplicationModel.Configuration.Tests/Azure.Configuration.Tests.csproj
index 3828495442956..ee97fd141f2c6 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.ApplicationModel.Configuration.Tests/Azure.Configuration.Tests.csproj
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.ApplicationModel.Configuration.Tests/Azure.Configuration.Tests.csproj
@@ -9,20 +9,13 @@
     <PackageReference Include="System.Memory" Version="4.5.1" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Azure.ApplicationModel.Configuration\Azure.Configuration.csproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\Azure.ApplicationModel.Configuration\Azure.Configuration.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\..\Azure.Base\data-plane\Azure.Base.Tests\Testing\TestPool.cs" Link="TestPool.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)..\..\..\Azure.Base\data-plane\Azure.Base.Tests\Testing\TestPool.cs" Link="TestPool.cs" />
   </ItemGroup>
 
-  <!-- Project references -->
-  <ItemGroup Condition="'$(UseProjectReferenceToAzureBase)'=='true'">
-    <ProjectReference Include="..\..\..\Azure.Base\data-plane\Azure.Base\Azure.Base.csproj" />
-  </ItemGroup>
-  
-  <!-- Package references -->
-  <ItemGroup Condition="'$(UseProjectReferenceToAzureBase)'==''">
-    <PackageReference Include="Azure.Base" Version="1.0.0-preview.3" />
-  </ItemGroup>
+  <!-- Import the Azure.Base project -->  
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\Azure.Base\data-plane\Azure.Base\Azure.Base.props" />
 </Project>
\ No newline at end of file
diff --git a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.ApplicationModel.Configuration/Azure.Configuration.csproj b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.ApplicationModel.Configuration/Azure.Configuration.csproj
index 8c1be7b0ccbe0..09f107020c69b 100644
--- a/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.ApplicationModel.Configuration/Azure.Configuration.csproj
+++ b/src/SDKs/Azure.ApplicationModel.Configuration/data-plane/Azure.ApplicationModel.Configuration/Azure.Configuration.csproj
@@ -26,13 +26,6 @@
     </PackageReference>
   </ItemGroup>
 
-  <!-- Project references -->
-  <ItemGroup Condition="'$(UseProjectReferenceToAzureBase)'=='true'">
-    <ProjectReference Include="..\..\..\Azure.Base\data-plane\Azure.Base\Azure.Base.csproj" />
-  </ItemGroup>
-
-  <!-- Package references -->
-  <ItemGroup Condition="'$(UseProjectReferenceToAzureBase)'!='true'">
-    <PackageReference Include="Azure.Base" Version="1.0.0-preview.3" />
-  </ItemGroup>
+  <!-- Import the Azure.Base project -->  
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\Azure.Base\data-plane\Azure.Base\Azure.Base.props" />
 </Project>
diff --git a/src/SDKs/Azure.Base/data-plane/Azure.Base/Azure.Base.props b/src/SDKs/Azure.Base/data-plane/Azure.Base/Azure.Base.props
new file mode 100644
index 0000000000000..1e0d5728b1b69
--- /dev/null
+++ b/src/SDKs/Azure.Base/data-plane/Azure.Base/Azure.Base.props
@@ -0,0 +1,11 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Project references -->
+  <ItemGroup Condition="'$(UseProjectReferenceToAzureBase)'=='true'">
+    <ProjectReference Include="$(MSBuildThisFileDirectory)Azure.Base.csproj" />
+  </ItemGroup>
+
+  <!-- Package references -->
+  <ItemGroup Condition="'$(UseProjectReferenceToAzureBase)'!='true'">
+    <PackageReference Include="Azure.Base" Version="1.0.0-preview.3" />
+  </ItemGroup>
+</Project>
\ No newline at end of file