Merge branch 'main' into dev/grendel/blobs-in-lib

* main:
  [Xamarin.Android.Build.Tasks] Add check for aapt2 invalid data path error (#8640)
  [Xamarin.Android.Build.Tasks] fix warning when missing `proguard-android.txt` (#8641)
  LEGO: Merge pull request 8642
  Fix ServerCertificateCustomValidator on API 21-23 (#8637)

Author: grendello

src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs

@@ -541,7 +541,8 @@ static string GetErrorCode (string message)
 			Tuple.Create ("APT2262", "unexpected element <activity> found in <manifest>"),
 			Tuple.Create ("APT2263", "found in <manifest>"),  // unexpected element <xxxxx> found in <manifest>
 			Tuple.Create ("APT2264", "The system cannot find the file specified. (2)"), // Windows Long Path error from aapt2
-			Tuple.Create ("APT2265", "The system cannot find the file specified. (2)") // Windows non-ASCII characters error from aapt2
+			Tuple.Create ("APT2265", "The system cannot find the file specified. (2)"), // Windows non-ASCII characters error from aapt2
+			Tuple.Create ("APT2266", "in <data> tag has value of") //  error: attribute ‘android:path’ in <data> tag has value of ‘code/fooauth://com.foo.foo, it must start with a leading slash ‘/’.
 		};
 	}
 }

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs

@@ -559,6 +559,32 @@ public void ApplicationVersionTests (string applicationVersion, bool seperateApk
 			}
 		}
 
+		[Test]
+		public void ManifestDataPathError ()
+		{
+			var proj = new XamarinAndroidApplicationProject () {
+				IsRelease = true,
+			};
+			var s = proj.AndroidManifest.Replace ("</application>", @"<activity android:name=""net.openid.appauth.RedirectUriReceiverActivity"" android:exported=""true"">
+			<intent-filter>
+				<action android:name=""android.intent.action.VIEW""/>
+				<category android:name=""android.intent.category.DEFAULT""/>
+				<category android:name=""android.intent.category.BROWSABLE""/>
+				<data android:path=""code/buildproauth://com.hyphensolutions.buildpro"" android:scheme=""msauth""/>
+				<data android:path=""callback"" android:scheme=""buildproauth""/>
+			</intent-filter>
+	</activity>
+</application>");
+			proj.AndroidManifest = s;
+			using (var builder = CreateApkBuilder (Path.Combine ("temp", TestContext.CurrentContext.Test.Name))) {
+				builder.ThrowOnBuildFailure = false;
+				Assert.IsFalse (builder.Build (proj), "Build should have failed.");
+				var messages = builder.LastBuildOutput.SkipWhile (x => !x.StartsWith ("Build FAILED.", StringComparison.Ordinal));
+				string error = messages.FirstOrDefault (x => x.Contains ("error APT2266:"));
+				Assert.IsNotNull (error, "Warning should be APT2266");
+			}
+		}
+
 		[Test]
 		public void ManifestPlaceholders ([Values ("legacy", "manifestmerger.jar")] string manifestMerger)
 		{