Upgrading repo to work with latest VS 2017 builds (#4547)

* Upgrading SDKs and AzureStack SDKs to work with VS 2017 Update 7 * upgrading sdkCommon projects. Updating travis ci install. Adding private copy of httpRecorder * updated dotnet core installation feed, updates to travis build script
Azure · Jul 16, 2018 · ddda7cb · ddda7cb
1 parent f89fd19
commit ddda7cb
Show file tree

Hide file tree

Showing 165 changed files with 415 additions and 14,126 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,8 +19,10 @@ install:
   - cat /etc/*release
   - sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
   - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
+  - wget -q https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb
+  - sudo dpkg -i packages-microsoft-prod.deb  
   - sudo apt-get update
-  - sudo apt-get install dotnet-dev-1.0.4
+  - sudo apt-get install dotnet-sdk-2.1.201
 script:
   - ./testSdkOnLinux.sh
 after_script:

diff --git a/src/AzSdk.test.reference.props b/src/AzSdk.test.reference.props
@@ -1,7 +1,8 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$([MSBuild]::GetPathOfFileAbove('test.props'))" />
+	<Import Project="$([MSBuild]::GetPathOfFileAbove('test.props'))" />	
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.8.1,2.0.0)" />
+    <PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.10.99-Private]" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.7.1,2.0.0)" />
     <PackageReference Include="Microsoft.Azure.ResourceManager" Version="[1.1.0-preview]" />
 

diff --git a/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/AzureBridge.Tests.csproj b/src/AzureStack/Admin/AzureBridgeAdmin/AzureBridge.Admin.Tests/AzureBridge.Tests.csproj
@@ -8,9 +8,9 @@
         <VersionPrefix>1.0.0</VersionPrefix>
     </PropertyGroup>
 
-    <PropertyGroup>
-        <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-    </PropertyGroup>
+    <!-- <PropertyGroup> -->
+        <!-- <TargetFrameworks>netcoreapp1.1</TargetFrameworks> -->
+    <!-- </PropertyGroup> -->
 
     <ItemGroup>
         <ProjectReference Include="..\AzureBridge.Admin\Microsoft.AzureStack.Management.AzureBridge.Admin.csproj" />

diff --git a/src/AzureStack/Admin/BackupAdmin/Backup.Admin.Tests/Backup.Tests.csproj b/src/AzureStack/Admin/BackupAdmin/Backup.Admin.Tests/Backup.Tests.csproj
@@ -6,9 +6,9 @@
     <AssemblyName>Backup.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  <!-- <PropertyGroup> -->
+    <!-- <TargetFrameworks>netcoreapp1.1</TargetFrameworks> -->
+  <!-- </PropertyGroup> -->
 
   <ItemGroup>
     <ProjectReference Include="..\Backup.Admin\Microsoft.AzureStack.Management.Backup.Admin.csproj" />

diff --git a/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/Commerce.Tests.csproj b/src/AzureStack/Admin/CommerceAdmin/Commerce.Admin.Tests/Commerce.Tests.csproj
@@ -6,9 +6,9 @@
     <AssemblyName>Commerce.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\Commerce.Admin\Microsoft.AzureStack.Management.Commerce.Admin.csproj" />

diff --git a/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/Compute.Tests.csproj b/src/AzureStack/Admin/ComputeAdmin/Compute.Admin.Tests/Compute.Tests.csproj
@@ -6,9 +6,9 @@
     <AssemblyName>Compute.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\Compute.Admin\Microsoft.AzureStack.Management.Compute.Admin.csproj" />

diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/Fabric.Tests.csproj b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/Fabric.Tests.csproj
@@ -8,9 +8,9 @@
     <VersionPrefix>1.0.0</VersionPrefix>
   </PropertyGroup>
 
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\Fabric.Admin\Microsoft.AzureStack.Management.Fabric.Admin.csproj" />

diff --git a/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/Gallery.Tests.csproj b/src/AzureStack/Admin/GalleryAdmin/Gallery.Admin.Tests/Gallery.Tests.csproj
@@ -6,9 +6,9 @@
     <AssemblyName>Gallery.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\Gallery.Admin\Microsoft.AzureStack.Management.Gallery.Admin.csproj" />

diff --git a/...ctureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsights.Tests.csproj b/...ctureInsightsAdmin/InfrastructureInsights.Admin.Tests/InfrastructureInsights.Tests.csproj
@@ -6,9 +6,9 @@
     <AssemblyName>InfrastructureInsights.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\InfrastructureInsights.Admin\Microsoft.AzureStack.Management.InfrastructureInsights.Admin.csproj" />

diff --git a/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/KeyVault.Tests.csproj b/src/AzureStack/Admin/KeyVaultAdmin/KeyVault.Admin.Tests/KeyVault.Tests.csproj
@@ -6,9 +6,9 @@
     <AssemblyName>KeyVault.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\KeyVault.Admin\Microsoft.AzureStack.Management.KeyVault.Admin.csproj" />

diff --git a/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/Network.Tests.csproj b/src/AzureStack/Admin/NetworkAdmin/Network.Admin.Tests/Network.Tests.csproj
@@ -6,9 +6,9 @@
     <AssemblyName>Network.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\Network.Admin\Microsoft.AzureStack.Management.Network.Admin.csproj" />

diff --git a/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/Storage.Admin.Tests.csproj b/src/AzureStack/Admin/StorageAdmin/Storage.Admin.Tests/Storage.Admin.Tests.csproj
@@ -6,9 +6,9 @@
     <AssemblyName>Storage.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\Storage.Admin\Microsoft.AzureStack.Management.Storage.Admin.csproj" />

diff --git a/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/Subscriptions.Tests.csproj b/src/AzureStack/Admin/SubscriptionsAdmin/Subscriptions.Admin.Tests/Subscriptions.Tests.csproj
@@ -6,9 +6,9 @@
     <AssemblyName>Subscriptions.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
   <ItemGroup>
     <None Remove="setEnvironment.cmd_1" />
   </ItemGroup>

diff --git a/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/Update.Tests.csproj b/src/AzureStack/Admin/UpdateAdmin/Update.Admin.Tests/Update.Tests.csproj
@@ -6,9 +6,9 @@
         <AssemblyName>Update.Admin.Tests</AssemblyName>
         <VersionPrefix>1.0.0</VersionPrefix>
     </PropertyGroup>
-    <PropertyGroup>
+    <!--<PropertyGroup>
         <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-    </PropertyGroup>
+    </PropertyGroup>-->
     <ItemGroup>
         <ProjectReference Include="..\Update.Admin\Microsoft.AzureStack.Management.Update.Admin.csproj" />
     </ItemGroup>

diff --git a/src/AzureStack/Management/Subscription/AzSdk.RP.props b/src/AzureStack/Management/Subscription/AzSdk.RP.props
@@ -1,7 +1,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
   <PropertyGroup>
-    <AzureApiTag>Subscriptions_2015-11-01;SubscriptionsManagementClient_2015-11-01;</AzureApiTag>
+    <AzureApiTag>SubscriptionClient_2015-11-01;Subscriptions_2015-11-01;</AzureApiTag>
     <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
   </PropertyGroup>
 </Project>
diff --git a/src/AzureStack/Management/Subscription/Subscription.Tests/Subscription.Tests.csproj b/src/AzureStack/Management/Subscription/Subscription.Tests/Subscription.Tests.csproj
@@ -6,9 +6,9 @@
     <AssemblyName>Subscription.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
   <ItemGroup>
     <ProjectReference Include="..\Subscription\Microsoft.AzureStack.Management.Subscription.csproj" />
   </ItemGroup>

diff --git a/.../Management/Subscription/Subscription/Microsoft.AzureStack.Management.Subscription.csproj b/.../Management/Subscription/Subscription/Microsoft.AzureStack.Management.Subscription.csproj
@@ -1,6 +1,8 @@
-
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.reference.props'))" />
+<Project Sdk="Microsoft.NET.Sdk">
+    <!-- Please do not move/edit code below this line -->
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.reference.props'))" />
+    <!-- Please do not move/edit code below this line -->
+
   <PropertyGroup>
     <PackageId>Microsoft.AzureStack.Management.Subscription</PackageId>
     <Description>Provides developers with libraries to manage subscriptions under AzureStack</Description>
@@ -16,4 +18,8 @@
   <PropertyGroup>
     <TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
   </PropertyGroup>
+
+  <!-- Please do not move/edit code below this line -->
+    <Import Condition=" Exists('$([MSBuild]::GetPathOfFileAbove(AzSdk.RP.props))') " Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.RP.props'))" />
+  <!-- Please do not move/edit code above this line -->
 </Project>
diff --git a/src/SDKs/AnalysisServices/AnalysisServices.Tests/AnalysisServices.Tests.csproj b/src/SDKs/AnalysisServices/AnalysisServices.Tests/AnalysisServices.Tests.csproj
@@ -5,9 +5,9 @@
     <AssemblyName>AnalysisServices.Tests</AssemblyName>
     <PackageId>AnalysisServices.Tests</PackageId>
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\Management.Analysis\Microsoft.Azure.Management.Analysis.csproj" />

diff --git a/src/SDKs/ApiManagement/ApiManagement.Tests/ApiManagement.Tests.csproj b/src/SDKs/ApiManagement/ApiManagement.Tests/ApiManagement.Tests.csproj
@@ -8,9 +8,9 @@
     <AssemblyName>ApiManagementManagement.Tests</AssemblyName>    
   </PropertyGroup>
 
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <!--<PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="2.1.0-ForTest" />-->

diff --git a/...onInsights/DataPlane/Data.ApplicationInsights.Tests/Data.ApplicationInsights.Tests.csproj b/...onInsights/DataPlane/Data.ApplicationInsights.Tests/Data.ApplicationInsights.Tests.csproj
@@ -5,8 +5,9 @@
     <Description>Data.ApplicationInsights.Tests Class library</Description>
     <PackageId>Data.ApplicationInsights.Tests</PackageId>
     <VersionPrefix>1.0.0-preview</VersionPrefix>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
+    <!--<TargetFrameworks>netcoreapp1.1</TargetFrameworks>-->
   </PropertyGroup>
+
   <ItemGroup>
     <None Update="SessionRecords\**\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/...ApplicationInsights/Management/ApplicationInsights.Tests/ApplicationInsights.Tests.csproj b/...ApplicationInsights/Management/ApplicationInsights.Tests/ApplicationInsights.Tests.csproj
@@ -5,7 +5,7 @@
     <Description>ApplicationInsights.Tests Class library</Description>
     <PackageId>ApplicationInsights.Tests</PackageId>
     <VersionPrefix>1.0.0-preview</VersionPrefix>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
+    <!--<TargetFrameworks>netcoreapp1.1</TargetFrameworks>-->
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="[1.6.0-preview, 2.0.0)" />

diff --git a/src/SDKs/Authorization/Authorization.Tests/Authorization.Tests.csproj b/src/SDKs/Authorization/Authorization.Tests/Authorization.Tests.csproj
@@ -5,9 +5,9 @@
     <AssemblyName>Authorization.Tests</AssemblyName>
     <PackageId>Authorization.Tests</PackageId>
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />

diff --git a/src/SDKs/Automation/Automation.Tests/Automation.Tests.csproj b/src/SDKs/Automation/Automation.Tests/Automation.Tests.csproj
@@ -7,10 +7,9 @@
     <Description>Test Project for Automation tests</Description>
   </PropertyGroup>
 
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-    <TestProjectType>true</TestProjectType>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="[14.0.0-preview,16.0)" />

diff --git a/src/SDKs/Batch/Management/Management.Batch.Tests/Management.Batch.Tests.csproj b/src/SDKs/Batch/Management/Management.Batch.Tests/Management.Batch.Tests.csproj
@@ -8,7 +8,7 @@
       <!--<TreatWarningsAsErrors>true</TreatWarningsAsErrors>-->
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
+    <!--<TargetFrameworks>netcoreapp1.1</TargetFrameworks>-->
     <Version>1.0.0.0</Version>
     <Company>MSIT</Company>
     <Copyright>Copyright © MSIT 2013</Copyright>

diff --git a/src/SDKs/BatchAI/BatchAI.Tests/BatchAI.Tests.csproj b/src/SDKs/BatchAI/BatchAI.Tests/BatchAI.Tests.csproj
@@ -6,9 +6,9 @@
     <AssemblyName>BatchAI.Tests</AssemblyName>
     <Description>BatchAI.Tests Class Library</Description>
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="[14.0.0-preview,16.0)" />

diff --git a/src/SDKs/Billing/Billing.Tests/Billing.Tests.csproj b/src/SDKs/Billing/Billing.Tests/Billing.Tests.csproj
@@ -8,9 +8,9 @@
     <VersionPrefix>2.0.0</VersionPrefix>    
   </PropertyGroup>
 
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\Management.Billing\Microsoft.Azure.Management.Billing.csproj" />

diff --git a/src/SDKs/BotService/AzSdk.RP.props b/src/SDKs/BotService/AzSdk.RP.props
@@ -1,7 +1,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
   <PropertyGroup>
-    <AzureApiTag>2017-12-01</AzureApiTag>
+    <AzureApiTag>BotService_2017-12-01;</AzureApiTag>
     <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
   </PropertyGroup>
 </Project>
diff --git a/src/SDKs/BotService/BotService.Tests/BotService.Tests.csproj b/src/SDKs/BotService/BotService.Tests/BotService.Tests.csproj
@@ -7,9 +7,9 @@
     <AssemblyName>BotService.Tests</AssemblyName>
     <VersionPrefix>1.0.0-preview</VersionPrefix>
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\Management.BotService\Microsoft.Azure.Management.BotService.csproj" />

diff --git a/src/SDKs/Cdn/Cdn.Tests/Cdn.Tests.csproj b/src/SDKs/Cdn/Cdn.Tests/Cdn.Tests.csproj
@@ -6,9 +6,9 @@
     <AssemblyName>Cdn.Tests</AssemblyName>
     <VersionPrefix>2.0.0</VersionPrefix>    
   </PropertyGroup>
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\Management.Cdn\Microsoft.Azure.Management.Cdn.csproj" />

diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingAutoSuggest/AzSdk.RP.props b/src/SDKs/CognitiveServices/dataPlane/Search/BingAutoSuggest/AzSdk.RP.props
@@ -0,0 +1,7 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
+  <PropertyGroup>
+    <AzureApiTag />
+    <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
+  </PropertyGroup>
+</Project>
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomImageSearch/AzSdk.RP.props b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomImageSearch/AzSdk.RP.props
@@ -0,0 +1,7 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
+  <PropertyGroup>
+    <AzureApiTag />
+    <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
+  </PropertyGroup>
+</Project>
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/AzSdk.RP.props b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/AzSdk.RP.props
@@ -0,0 +1,7 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
+  <PropertyGroup>
+    <AzureApiTag />
+    <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
+  </PropertyGroup>
+</Project>
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/AzSdk.RP.props b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/AzSdk.RP.props
@@ -0,0 +1,7 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
+  <PropertyGroup>
+    <AzureApiTag />
+    <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
+  </PropertyGroup>
+</Project>
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/AzSdk.RP.props b/src/SDKs/CognitiveServices/dataPlane/Search/BingImageSearch/AzSdk.RP.props
@@ -0,0 +1,7 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
+  <PropertyGroup>
+    <AzureApiTag />
+    <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
+  </PropertyGroup>
+</Project>