From 72b9abe32c35242c67606386cbb48595e6e24406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Laval?= <jeremie.laval@gmail.com>
Date: Wed, 11 Mar 2020 11:20:32 -0400
Subject: [PATCH 1/2] Add project capabilities

Visual Studio uses CPS to load SDK-style projects. In CPS, most things are keyed-off so-called capabilities[0] which replace other methods that were used previously like project type GUIDs.

While capabilities can be defined in the IDE, they make most sense to be directly expressed in the targets themselves where CPS will pick them up automatically.

[0]  https://github.com/microsoft/VSProjectSystem/blob/master/doc/overview/about_project_capabilities.md
---
 .../targets/Xamarin.Android.Sdk.Common.targets              | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Xamarin.Android.Sdk/targets/Xamarin.Android.Sdk.Common.targets b/src/Xamarin.Android.Sdk/targets/Xamarin.Android.Sdk.Common.targets
index e27e4ecda13..ccc5cdca547 100644
--- a/src/Xamarin.Android.Sdk/targets/Xamarin.Android.Sdk.Common.targets
+++ b/src/Xamarin.Android.Sdk/targets/Xamarin.Android.Sdk.Common.targets
@@ -384,6 +384,12 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 	</AllowedReferenceRelatedFileExtensions>
 </PropertyGroup>
 
+<!-- Automatically supply project capabilities for IDE use -->
+<ItemGroup>
+  <ProjectCapability Include="Android" />
+  <ProjectCapability Include="AndroidApplication" Condition="$(AndroidApplication)" />
+</ItemGroup>
+
 <!--
 *******************************************
           Imports

From 3a0754a637fc01566e5217c40f26fd3782964495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Laval?= <jeremie.laval@gmail.com>
Date: Thu, 12 Mar 2020 13:28:44 -0400
Subject: [PATCH 2/2] Also include generic "Mobile" capability

After discussing with @kzu, simply using `Android` could be confusing with native C++ Android project that export the same capability. By combining `Managed + Mobile + Android` we can make a clear distinction that we are dealing with a Xamarin.Android project
---
 .../targets/Xamarin.Android.Sdk.Common.targets                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Xamarin.Android.Sdk/targets/Xamarin.Android.Sdk.Common.targets b/src/Xamarin.Android.Sdk/targets/Xamarin.Android.Sdk.Common.targets
index ccc5cdca547..b0564fa329c 100644
--- a/src/Xamarin.Android.Sdk/targets/Xamarin.Android.Sdk.Common.targets
+++ b/src/Xamarin.Android.Sdk/targets/Xamarin.Android.Sdk.Common.targets
@@ -386,6 +386,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 
 <!-- Automatically supply project capabilities for IDE use -->
 <ItemGroup>
+  <ProjectCapability Include="Mobile" />
   <ProjectCapability Include="Android" />
   <ProjectCapability Include="AndroidApplication" Condition="$(AndroidApplication)" />
 </ItemGroup>