[build] create xamarin-android-tools.override.props

If you installed the `android` workload via:

    dotnet workload install android --skip-sign-check \
        --from-rollback-file https://maui.blob.core.windows.net/metadata/rollbacks/net8.0.json \
        --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json \
        --source https://api.nuget.org/v3/index.json

`dotnet new android` & `dotnet build` succeeds.

But `MSBuild.exe` fails with:

    D:\src\dotnet-sdk-8.0.100-preview.6.23318.1-win-x64\packs\Microsoft.Android.Sdk.Windows\34.0.0-preview.6.323\tools\Xamarin.Android.EmbeddedResource.targets(39,5): error XARLP7028: System.IO.FileNotFoundException: Could not load file or assembly 'libZipSharp, Version=2.1.0.0, Culture=neutral, PublicKeyToken=276db85bc4e20efc' or one of its dependencies. The system cannot find the file specified.
    File name: 'libZipSharp, Version=2.1.0.0, Culture=neutral, PublicKeyToken=276db85bc4e20efc'
    at Xamarin.Android.Tasks.ResolveLibraryProjectImports.Extract(IDictionary`2 jars, ICollection`1 resolvedResourceDirectories, ICollection`1 resolvedAssetDirectories, ICollection`1 resolvedEnvironments, ICollection`1 proguardConfigFiles)
    at Xamarin.Android.Tasks.ResolveLibraryProjectImports.RunTask()
    at Microsoft.Android.Build.Tasks.AndroidTask.Execute() in /Users/runner/work/1/s/xamarin-android/external/xamarin-android-tools/src/Microsoft.Android.Build.BaseTasks/AndroidTask.cs:line 25
    WRN: Assembly binding logging is turned OFF.
    To enable assembly bind failure logging, set the registry value [HKLM\Software\Microsoft\Fusion!EnableLog] (DWORD) to 1.
    Note: There is some performance penalty associated with assembly bind failure logging.
    To turn this feature off, remove the registry value [HKLM\Software\Microsoft\Fusion!EnableLog].

It turns out that for references to `libZipSharp.dll`:

* `Microsoft.Android.Build.BaseTasks.dll` references 2.1.0.0
* `Xamarin.Android.Build.Tasks.dll` references 3.0.0.0

However, this appears to already be solved in the 34.0.0-preview.6.355
version of the `android` workload. It is broken in
`34.0.0-preview.6.323`.

In that time window, we updated `$(LibZipSharpVersion)` in
xamarin/xamarin-android, but not yet bumped to the latest
xamarin/xamarin-android-tools:

f1d5918

To solve this issue, we can use the extension points we added to:

dotnet/android-tools@34e98e2

And import xamarin-android's `Directory.Build.props` from
`xamarin-android-tools.override.props`. With this change in place, I can
set the value of `$(LibZipSharpVersion)` to any value and the value from
xamarin-android overrides it.

This probably slipped through because we dropped the "classic"
Xamarin.Android test suite that used .NET framework MSBuild on Windows.
All tests now use `dotnet build`.

I added a test that builds an Android project in Debug & Release with
`MSBuild.exe`, and updated Xamarin.ProjectTools to support doing this.

Author: jonathanpeppers

external/xamarin-android-tools.override.props

@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+</Project>

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

@@ -2577,5 +2577,27 @@ public void SimilarAndroidXAssemblyNames ([Values(true, false)] bool publishTrim
 			using var builder = CreateApkBuilder ();
 			Assert.IsTrue (builder.Build (proj), "Build should have succeeded.");
 		}
+
+		/// <summary>
+		/// Build with MSBuild.exe on .NET framework, instead of 'dotnet build'
+		/// </summary>
+		[Test]
+		public void BuildWithMSBuild ([Values (true, false)] bool isRelease)
+		{
+			if (!IsWindows)
+				Assert.Ignore ("Test is only valid on Windows platforms");
+
+			var proj = new XamarinAndroidApplicationProject {
+				IsRelease = isRelease,
+			};
+			using var builder = CreateApkBuilder ();
+
+			// Use MSBuild.exe, setting %PATH% to our local 'dotnet' directory
+			builder.BuildTool = TestEnvironment.GetVisualStudioInstance ().MSBuildPath;
+			var environment = new Dictionary<string, string> ();
+			environment ["PATH"] = $"{TestEnvironment.DotNetPreviewDirectory};{Environment.GetEnvironmentVariable ("PATH")}";
+
+			Assert.IsTrue (builder.Build (proj, environmentVariables: environment), "Build should have succeeded.");
+		}
 	}
 }

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/MSBuildSdkExtrasProject.cs

@@ -20,11 +20,6 @@ public MSBuildSdkExtrasProject ()
 
 		public string StringsXml { get; set; }
 
-		/// <summary>
-		/// /t:Restore or /restore is always required
-		/// </summary>
-		public override bool ShouldRestorePackageReferences => true;
-
 		public string TargetFrameworks {
 			get => GetProperty (nameof (TargetFrameworks));
 			set => SetProperty (nameof (TargetFrameworks), value);

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs

@@ -53,16 +53,22 @@ public IEnumerable<string> LastBuildOutput {
 		/// </summary>
 		public bool AutomaticNuGetRestore { get; set; } = true;
 
+		string _buildTool;
+
 		public string BuildTool {
-			get {
-				if (UseDotNet)
-					return Path.Combine (TestEnvironment.DotNetPreviewDirectory, "dotnet");
+			get => _buildTool ??= FindBuildTool ();
+			set => _buildTool = value;
+		}
 
-				string xabuild = IsUnix ? XABuildPaths.XABuildScript : XABuildPaths.XABuildExe;
-				if (File.Exists (xabuild) && TestEnvironment.UseLocalBuildOutput)
-					return xabuild;
-				return IsUnix ? "msbuild" : TestEnvironment.GetVisualStudioInstance ().MSBuildPath;
-			}
+		string FindBuildTool ()
+		{
+			if (UseDotNet)
+				return Path.Combine (TestEnvironment.DotNetPreviewDirectory, "dotnet");
+
+			string xabuild = IsUnix ? XABuildPaths.XABuildScript : XABuildPaths.XABuildExe;
+			if (File.Exists (xabuild) && TestEnvironment.UseLocalBuildOutput)
+				return xabuild;
+			return IsUnix ? "msbuild" : TestEnvironment.GetVisualStudioInstance ().MSBuildPath;
 		}
 
 		public bool CrossCompilerAvailable (string supportedAbis)
@@ -186,7 +192,7 @@ protected virtual void Dispose (bool disposing)
 			RegexOptions.Multiline | RegexOptions.Compiled
 		);
 
-		protected bool BuildInternal (string projectOrSolution, string target, string [] parameters = null, Dictionary<string, string> environmentVariables = null, bool restore = true, string binlogName = "msbuild")
+		protected bool BuildInternal (string projectOrSolution, string target, string [] parameters = null, Dictionary<string, string> environmentVariables = null, string binlogName = "msbuild")
 		{
 			buildLogFullPath = (!string.IsNullOrEmpty (BuildLogFile))
 				? Path.GetFullPath (Path.Combine (XABuildPaths.TestOutputDirectory, Path.GetDirectoryName (projectOrSolution), BuildLogFile))
@@ -204,20 +210,23 @@ protected bool BuildInternal (string projectOrSolution, string target, string []
 			var args  = new StringBuilder ();
 			var psi   = new ProcessStartInfo (BuildTool);
 			var responseFile = Path.Combine (XABuildPaths.TestOutputDirectory, Path.GetDirectoryName (projectOrSolution), "project.rsp");
+			var isMSBuild = string.Equals (Path.GetFileNameWithoutExtension (psi.FileName), "MSBuild", StringComparison.OrdinalIgnoreCase);
 			if (UseDotNet) {
-				args.Append ("build ");
+				if (!isMSBuild) {
+					args.Append ("build ");
+				}
 				if (TestEnvironment.UseLocalBuildOutput) {
 					psi.SetEnvironmentVariable ("DOTNETSDK_WORKLOAD_MANIFEST_ROOTS", TestEnvironment.WorkloadManifestOverridePath);
 					psi.SetEnvironmentVariable ("DOTNETSDK_WORKLOAD_PACK_ROOTS", TestEnvironment.WorkloadPackOverridePath);
 				}
 			}
 			args.AppendFormat ("{0} /t:{1} {2}",
 					QuoteFileName (Path.Combine (XABuildPaths.TestOutputDirectory, projectOrSolution)), target, logger);
-			if (UseDotNet) {
+			if (UseDotNet && !isMSBuild) {
 				if (!AutomaticNuGetRestore) {
 					args.Append (" --no-restore");
 				}
-			} else if (AutomaticNuGetRestore && restore) {
+			} else if (AutomaticNuGetRestore) {
 				args.Append (" /restore");
 			}
 

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetStandard.cs

@@ -23,9 +23,6 @@ public DotNetStandard ()
 			Language = XamarinAndroidProjectLanguage.CSharp;
 		}
 
-		// NetStandard projects always need to restore
-		public override bool ShouldRestorePackageReferences => true;
-
 		public string PackageTargetFallback {
 			get { return GetProperty ("PackageTargetFallback"); }
 			set { SetProperty ("PackageTargetFallback", value); }

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/ProjectBuilder.cs

@@ -70,7 +70,7 @@ public bool Build (XamarinProject project, bool doNotCleanupOnUpdate = false, st
 				project.NuGetRestore (Path.Combine (XABuildPaths.TestOutputDirectory, ProjectDirectory), PackagesDirectory);
 			}
 
-			bool result = BuildInternal (Path.Combine (ProjectDirectory, project.ProjectFilePath), Target, parameters, environmentVariables, restore: project.ShouldRestorePackageReferences, binlogName: Path.GetFileNameWithoutExtension (BuildLogFile));
+			bool result = BuildInternal (Path.Combine (ProjectDirectory, project.ProjectFilePath), Target, parameters, environmentVariables, binlogName: Path.GetFileNameWithoutExtension (BuildLogFile));
 			built_before = true;
 
 			if (CleanupAfterSuccessfulBuild)

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/SolutionBuilder.cs

@@ -67,7 +67,7 @@ public void Save ()
 
 		public bool BuildProject(XamarinProject project, string target = "Build")
 		{
-			BuildSucceeded = BuildInternal(Path.Combine (SolutionPath, project.ProjectName, project.ProjectFilePath), target, restore: project.ShouldRestorePackageReferences);
+			BuildSucceeded = BuildInternal(Path.Combine (SolutionPath, project.ProjectName, project.ProjectFilePath), target);
 			return BuildSucceeded;
 		}
 

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs

@@ -33,7 +33,6 @@ public abstract class XamarinProject
 		public string GlobalPackagesFolder { get; set; } = FileSystemUtils.FindNugetGlobalPackageFolder ();
 		public IList<string> ExtraNuGetConfigSources { get; set; } = new List<string> ();
 
-		public virtual bool ShouldRestorePackageReferences => PackageReferences?.Count > 0;
 		/// <summary>
 		/// If true, the ProjectDirectory will be deleted and populated on the first build
 		/// </summary>