From 7fcfba3df584b1c5a0308b309b601c7177868f72 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Tue, 6 Mar 2018 11:40:56 +0000
Subject: [PATCH 1/4] [Xamarin.Android.Build.Tasks] Add Properties for the
 Debug Key

---
 .../Xamarin.Android.Common.targets                           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 4b633b48140..a4462dbc77e 100755
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -240,6 +240,9 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 	<AndroidSdkToolsVersion Condition="'$(AndroidSdkToolsVersion)' == ''">26.1.1</AndroidSdkToolsVersion>
 	<AndroidNdkVersion Condition="'$(AndroidNdkVersion)' == ''">16.1</AndroidNdkVersion>
 
+	<AndroidDebugKeyAlgorithm>RSA</AndroidDebugKeyAlgorithm>
+	<AndroidDebugKeyValidity>10950</AndroidDebugKeyValidity>
+
 	<!-- Obsolete -->
 	<AndroidGdbDebugServer>None</AndroidGdbDebugServer>
 
@@ -2515,6 +2518,8 @@ because xbuild doesn't support framework reference assemblies.
 		KeyAlias="androiddebugkey"
 		KeyPass="android"
 		StorePass="android"
+		KeyAlgorithm="$(AndroidDebugKeyAlgorithm)"
+		Validity="$(AndroidDebugKeyValidity)"
 		ToolPath="$(KeytoolToolPath)"
 		ToolExe="$(KeytoolToolExe)"
 		Command="-genkeypair"

From 98dea1924d8b6dff07c8199614e718a215b2c833 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Tue, 6 Mar 2018 13:09:00 +0000
Subject: [PATCH 2/4] Added Docs

---
 Documentation/guides/BuildProcess.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Documentation/guides/BuildProcess.md b/Documentation/guides/BuildProcess.md
index eb996898895..6aab6cbb4b8 100644
--- a/Documentation/guides/BuildProcess.md
+++ b/Documentation/guides/BuildProcess.md
@@ -783,6 +783,13 @@ To use the keystore generated above, use the property group:
         <AndroidSigningKeyPass>keystore.alias password</AndroidSigningKeyPass>
     </PropertyGroup>
 
+-   **AndroidDebugKeyAlgorithm** &ndash; Specifies the default
+    algorithm to use for the `debug.keystore`. It defaults to
+    `RSA`.
+
+-   **AndroidDebugKeyValidity** &ndash; Specifies the default
+    validity to use for the `debug.keystore`. It defaults to
+    `10950` or `30 * 365` or `30 years`.
 
 <a name="Build_Actions" class="injected"></a>
 

From 81c214a188bf793e338b85a5bc37b31a776c10ca Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Wed, 7 Mar 2018 11:08:20 +0000
Subject: [PATCH 3/4] Added Conditionals so users can override defaults

---
 .../Xamarin.Android.Common.targets                            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index a4462dbc77e..99f1d771a05 100755
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -240,8 +240,8 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 	<AndroidSdkToolsVersion Condition="'$(AndroidSdkToolsVersion)' == ''">26.1.1</AndroidSdkToolsVersion>
 	<AndroidNdkVersion Condition="'$(AndroidNdkVersion)' == ''">16.1</AndroidNdkVersion>
 
-	<AndroidDebugKeyAlgorithm>RSA</AndroidDebugKeyAlgorithm>
-	<AndroidDebugKeyValidity>10950</AndroidDebugKeyValidity>
+	<AndroidDebugKeyAlgorithm Condition=" '$(AndroidDebugKeyAlgorithm)' == '' ">RSA</AndroidDebugKeyAlgorithm>
+	<AndroidDebugKeyValidity Condition=" $(AndroidDebugKeyValidity)'' == '' ">10950</AndroidDebugKeyValidity>
 
 	<!-- Obsolete -->
 	<AndroidGdbDebugServer>None</AndroidGdbDebugServer>

From 3b6553fa6e93db845e8923c86eae3129425df1db Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Wed, 7 Mar 2018 15:39:12 +0000
Subject: [PATCH 4/4] Fix typo

---
 src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index 99f1d771a05..a9561bdd5d3 100755
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -241,7 +241,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
 	<AndroidNdkVersion Condition="'$(AndroidNdkVersion)' == ''">16.1</AndroidNdkVersion>
 
 	<AndroidDebugKeyAlgorithm Condition=" '$(AndroidDebugKeyAlgorithm)' == '' ">RSA</AndroidDebugKeyAlgorithm>
-	<AndroidDebugKeyValidity Condition=" $(AndroidDebugKeyValidity)'' == '' ">10950</AndroidDebugKeyValidity>
+	<AndroidDebugKeyValidity Condition=" '$(AndroidDebugKeyValidity)' == '' ">10950</AndroidDebugKeyValidity>
 
 	<!-- Obsolete -->
 	<AndroidGdbDebugServer>None</AndroidGdbDebugServer>