DesignTimeBuild no longer needed in verify targets

Author: Redth

source/buildtasks/support-annotations-tests/Tests.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Runtime.Serialization.Json;
 using System.Threading.Tasks;
-using System.Web.Script.Serialization;
 using Xunit;
 
 namespace Xamarin.Android.Support.BuildTasks.Tests
@@ -47,13 +45,14 @@ public void Test_Should_Detect_Multiple_Versions_Project_Assets()
 		}
 
 		[Theory]
-		[InlineData(23, "23.x")]
-		[InlineData(24, "24.x")]
-		[InlineData(25, "25.4.0.2")]
-		[InlineData(26, "26.1.0.1")]
+		[InlineData(23, "23.*")]
+		[InlineData(24, "24.*")]
+		[InlineData(25, "25.*")]
+		[InlineData(26, "26.*")]
+        [InlineData(29, "28.*")]
 		public void Test_Recommended_NuGet_Version(int apiLevel, string expectedVersion)
 		{
-			var v = NugetPackages.GetRecommendedSupportPackageVersion(apiLevel, false);
+			var v = NugetPackages.GetRecommendedSupportPackageVersion(apiLevel);
 
 			Assert.Equal(expectedVersion, v);
 		}

source/buildtasks/support-annotations/NugetPackages.cs

@@ -127,7 +127,13 @@ public static string GetSupportVersion(string packageIdPrefix, Dictionary<string
 			return supportVersion;
 		}
 
-		public static string GetRecommendedSupportPackageVersion(int apiLevel, bool skipNugetQuery)
-			=> apiLevel.ToString() + ".*";
+		public static string GetRecommendedSupportPackageVersion(int apiLevel)
+        {
+            if (NugetPackages.AndroidApiLevelsAndVersions.ContainsKey(apiLevel))
+                return apiLevel.ToString() + ".*";
+
+            return "28.*"; // There will never be a newer major android support version
+        }
+			
 	}
 }

source/buildtasks/support-annotations/VerifyVersionsTask.cs

@@ -39,8 +39,6 @@ public class VerifyVersionsTask : Task
 		[Required]
 		public ITaskItem AndroidSdkBuildToolsVersion { get; set; }
 
-		public bool DesignTimeBuild { get;set;}
-
 		readonly Dictionary<string, string> packageVersions = new Dictionary<string, string>();
 
 		public override bool Execute()
@@ -85,7 +83,7 @@ public override bool Execute()
 				sb.AppendLine("The following Xamarin.Android.Support.* packages and versions were detected:");
 				sb.AppendLine();
 
-				var recommendedSupportVersion = NugetPackages.GetRecommendedSupportPackageVersion(apiLevel, DesignTimeBuild);
+                var recommendedSupportVersion = NugetPackages.GetRecommendedSupportPackageVersion(apiLevel);
 
 				foreach (var pkg in packageVersions.OrderBy(p => p.Value + "-" + p.Key))
 					sb.AppendLine($"    {pkg.Key} ({pkg.Value})");

source/com.android.support/support-annotations/merge.targets

@@ -27,7 +27,6 @@
         AndroidSdkBuildToolsVersion="$(AndroidSdkBuildToolsVersion)"
         ProjectExtensionsPath="$(MSBuildProjectExtensionsPath)"
         ProjectPath="$(MSBuildProjectDirectory)"
-        DesignTimeBuild="$(DesignTimeBuild)"
         >
     </VerifyVersionsTask>