From 60e6bdea8151931acc2cfbab7a53fab325edf64d Mon Sep 17 00:00:00 2001
From: Bruce Johnston <bruce.johnston@microsoft.com>
Date: Mon, 22 Jul 2019 14:00:56 -0700
Subject: [PATCH] [Azure Search] Use Directory.Build.props for data plane
 versioning (#6988)

---
 sdk/search/Directory.Build.props                       | 10 ++++++++++
 .../src/Microsoft.Azure.Search.Common.csproj           |  1 -
 .../src/Microsoft.Azure.Search.Data.csproj             |  1 -
 .../src/Microsoft.Azure.Search.Service.csproj          |  1 -
 sdk/search/Microsoft.Azure.Search.Version.props        |  5 -----
 .../src/Microsoft.Azure.Search.csproj                  |  1 -
 6 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 sdk/search/Directory.Build.props
 delete mode 100644 sdk/search/Microsoft.Azure.Search.Version.props

diff --git a/sdk/search/Directory.Build.props b/sdk/search/Directory.Build.props
new file mode 100644
index 0000000000000..4e3183da180ac
--- /dev/null
+++ b/sdk/search/Directory.Build.props
@@ -0,0 +1,10 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <Choose>
+    <When Condition="'$(IsDataPlaneProject)' == 'true'">
+      <PropertyGroup>
+        <VersionPrefix>9.0.2</VersionPrefix>
+      </PropertyGroup>
+    </When>
+  </Choose>
+</Project>
diff --git a/sdk/search/Microsoft.Azure.Search.Common/src/Microsoft.Azure.Search.Common.csproj b/sdk/search/Microsoft.Azure.Search.Common/src/Microsoft.Azure.Search.Common.csproj
index 622c439edcd58..27265ff24c0ca 100644
--- a/sdk/search/Microsoft.Azure.Search.Common/src/Microsoft.Azure.Search.Common.csproj
+++ b/sdk/search/Microsoft.Azure.Search.Common/src/Microsoft.Azure.Search.Common.csproj
@@ -6,5 +6,4 @@
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
     <PackageReleaseNotes>See the Microsoft.Azure.Search package for detailed release notes on the entire Azure Search .NET SDK.</PackageReleaseNotes>
   </PropertyGroup>
-  <Import Project="..\..\Microsoft.Azure.Search.Version.props" />
 </Project>
\ No newline at end of file
diff --git a/sdk/search/Microsoft.Azure.Search.Data/src/Microsoft.Azure.Search.Data.csproj b/sdk/search/Microsoft.Azure.Search.Data/src/Microsoft.Azure.Search.Data.csproj
index 6e9e686f31332..6d99a0a128a19 100644
--- a/sdk/search/Microsoft.Azure.Search.Data/src/Microsoft.Azure.Search.Data.csproj
+++ b/sdk/search/Microsoft.Azure.Search.Data/src/Microsoft.Azure.Search.Data.csproj
@@ -6,7 +6,6 @@
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
     <PackageReleaseNotes>See the Microsoft.Azure.Search package for detailed release notes on the entire Azure Search .NET SDK.</PackageReleaseNotes>
   </PropertyGroup>
-  <Import Project="..\..\Microsoft.Azure.Search.Version.props" />
   <ItemGroup>
     <PackageReference Include="Microsoft.Spatial" />
   </ItemGroup>
diff --git a/sdk/search/Microsoft.Azure.Search.Service/src/Microsoft.Azure.Search.Service.csproj b/sdk/search/Microsoft.Azure.Search.Service/src/Microsoft.Azure.Search.Service.csproj
index f480d16b34b59..cfc00cb64bee7 100644
--- a/sdk/search/Microsoft.Azure.Search.Service/src/Microsoft.Azure.Search.Service.csproj
+++ b/sdk/search/Microsoft.Azure.Search.Service/src/Microsoft.Azure.Search.Service.csproj
@@ -6,7 +6,6 @@
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
     <PackageReleaseNotes>See the Microsoft.Azure.Search package for detailed release notes on the entire Azure Search .NET SDK.</PackageReleaseNotes>
   </PropertyGroup>
-  <Import Project="..\..\Microsoft.Azure.Search.Version.props" />
   <ItemGroup>
     <PackageReference Include="Microsoft.Spatial" />
   </ItemGroup>
diff --git a/sdk/search/Microsoft.Azure.Search.Version.props b/sdk/search/Microsoft.Azure.Search.Version.props
deleted file mode 100644
index dffb511ee6318..0000000000000
--- a/sdk/search/Microsoft.Azure.Search.Version.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VersionPrefix>9.0.2</VersionPrefix>
-  </PropertyGroup>
-</Project>
diff --git a/sdk/search/Microsoft.Azure.Search/src/Microsoft.Azure.Search.csproj b/sdk/search/Microsoft.Azure.Search/src/Microsoft.Azure.Search.csproj
index 65f513a3be134..d964a9a4e5a64 100644
--- a/sdk/search/Microsoft.Azure.Search/src/Microsoft.Azure.Search.csproj
+++ b/sdk/search/Microsoft.Azure.Search/src/Microsoft.Azure.Search.csproj
@@ -6,7 +6,6 @@
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
     <PackageReleaseNotes>This is the newest major version of the Azure Search .NET SDK, based on version 2019-05-06 of the Azure Search REST API. New in this GA version is support for Cognitive Search, complex types for richer data modeling, the Autocomplete API, and additional parsing modes for Blob indexers. See this article for help on migrating to the latest version: http://aka.ms/search-sdk-upgrade. The 9.0.1 release includes a fix for the deadlock issue (https://github.com/Azure/azure-sdk-for-net/issues/6254) in the Search API.</PackageReleaseNotes>
   </PropertyGroup>
-  <Import Project="..\..\Microsoft.Azure.Search.Version.props" />
   <ItemGroup>
     <ProjectReference Include="..\..\Microsoft.Azure.Search.Data\src\Microsoft.Azure.Search.Data.csproj" />
     <ProjectReference Include="..\..\Microsoft.Azure.Search.Service\src\Microsoft.Azure.Search.Service.csproj" />