[One .NET] fix build ordering & BuildItem.Deleted (#4933)

The `AndroidUpdateResourcesTest.CheckFilesAreRemoved` test was failing
with:

    Resources\values\Theme.xml error XA2001: Source file 'Resources\values\Theme.xml' could not be found.

When looking through logs, I noticed lots of differences in build
ordering from legacy projects.

1. `$(BuildDependsOn)` ordering - In legacy projects
   `ImplicitlyExpandDesignTimeFacades` is listed last, while it was in
   the middle for .NET 5+ projects.

This was caused by the ordering of `<Import/>`.
`Microsoft.Android.Sdk.BuildOrder.targets` needs to be imported before
`Xamarin.Android.Common.targets`.

2. `$(BuildDependsOn)` also listed these targets in legacy projects:

    _CheckTargetFramework;
    _RemoveLegacyDesigner;

`_CheckTargetFramework` is not needed, but it needs to be moved to
`Xamarin.Android.Legacy.targets`.

`_RemoveLegacyDesigner` should be listed in `$(BuildDependsOn)`.

3. `_UpdateAndroidResources` had different values for `DependsOnTargets`.

In c87ef95, I removed `$(CoreResolveReferencesDependsOn)` to just
simplify things. It turns out `_UpdateAndroidResources` uses this
property. I put things back the way they were.

After fixing the build ordering, the test still failed.

Then I noticed the *actual* cause to the failing test... There were
additional `@(AndroidResource)` items in the `.csproj` file.
`BuildItem.Deleted` wasn't being checked when short-form `.csproj`
files are generated. We should omit build items with this flag set.

After doing this, we can run a couple additional tests under `dotnet`
context.

Author: jonathanpeppers

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BuildOrder.targets

@@ -77,6 +77,7 @@ projects, these properties are set in Xamarin.Android.Legacy.targets.
       _CreateNativeLibraryArchive;
       _AddAndroidEnvironmentToCompile;
       _CheckForContent;
+      _RemoveLegacyDesigner;
       _ValidateAndroidPackageProperties;
       $(BuildDependsOn);
     </BuildDependsOn>
@@ -87,10 +88,13 @@ projects, these properties are set in Xamarin.Android.Legacy.targets.
 
   <!-- Targets that run unless we are running _ComputeFilesToPublishForRuntimeIdentifiers -->
   <PropertyGroup Condition=" '$(_ComputeFilesToPublishForRuntimeIdentifiers)' != 'true' ">
-    <ResolveReferencesDependsOn>
+    <CoreResolveReferencesDependsOn>
       _SeparateAppExtensionReferences;
       $(ResolveReferencesDependsOn);
       _AddAndroidCustomMetaData;
+    </CoreResolveReferencesDependsOn>
+    <ResolveReferencesDependsOn>
+      $(CoreResolveReferencesDependsOn);
       UpdateAndroidInterfaceProxies;
       UpdateAndroidResources;
       AddBindingsToCompile;

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.targets

@@ -22,12 +22,13 @@
 
   <!-- Default item includes (globs and implicit references) -->
   <Import Project="Microsoft.Android.Sdk.DefaultItems.targets" />
+  <!-- Build ordering, should be imported before Xamarin.Android.Common.targets -->
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.BuildOrder.targets" />
 
   <Import Project="$(MSBuildThisFileDirectory)..\tools\Xamarin.Android.Common.targets" />
   <Import Project="$(MSBuildThisFileDirectory)..\tools\Xamarin.Android.Bindings.Core.targets" />
   <Import Project="$(MSBuildThisFileDirectory)..\tools\Xamarin.Android.Bindings.ClassParse.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.AssemblyResolution.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.BuildOrder.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.Linker.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.NuGet.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.Publish.targets" />

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

@@ -17,7 +17,19 @@ namespace Xamarin.Android.Build.Tests
 	[Parallelizable (ParallelScope.Children)]
 	public class AndroidUpdateResourcesTest : BaseTest
 	{
+		string GetResourceDesignerPath (ProjectBuilder builder, XamarinAndroidProject project)
+		{
+			string path;
+			if (Builder.UseDotNet) {
+				path = Path.Combine (Root, builder.ProjectDirectory, project.IntermediateOutputPath);
+			} else {
+				path = Path.Combine (Root, builder.ProjectDirectory, "Resources");
+			}
+			return Path.Combine (path, "Resource.designer" + project.Language.DefaultDesignerExtension);
+		}
+
 		[Test]
+		[Category ("dotnet")]
 		public void CheckMultipleLibraryProjectReferenceAlias ([Values (true, false)] bool withGlobal)
 		{
 			var path = Path.Combine (Root, "temp", TestName);
@@ -47,7 +59,8 @@ public void CheckMultipleLibraryProjectReferenceAlias ([Values (true, false)] bo
 					using (var b = CreateApkBuilder (Path.Combine (path, proj.ProjectName), cleanupAfterSuccessfulBuild: false, cleanupOnDispose: false)) {
 						b.ThrowOnBuildFailure = false;
 						Assert.IsTrue (b.Build (proj), "Project should have built.");
-						string[] text = File.ReadAllLines (Path.Combine (Root, path, proj.ProjectName, "Resources", "Resource.designer.cs"));
+						string resource_designer_cs = GetResourceDesignerPath (b, proj);
+						string [] text = File.ReadAllLines (resource_designer_cs);
 						Assert.IsTrue (text.Count (x => x.Contains ("Library1.Resource.String.library_name")) == 2, "library_name resource should be present exactly once for each library");
 						Assert.IsTrue (text.Count (x => x == "extern alias Lib1A;" || x == "extern alias Lib1B;") <= 1, "No more than one extern alias should be present for each library.");
 					}
@@ -799,6 +812,7 @@ public void CheckAaptErrorRaisedForDuplicateResourceinApp ()
 		}
 
 		[Test]
+		[Category ("dotnet")]
 		public void CheckFilesAreRemoved () {
 
 			var proj = new XamarinAndroidApplicationProject () {
@@ -818,9 +832,9 @@ public void CheckFilesAreRemoved () {
 					KnownPackages.AndroidSupportV4_27_0_2_1,
 				},
 			};
-			proj.SetProperty (KnownProperties.TargetFrameworkVersion, "v5.1");
-			using (var builder = CreateApkBuilder ("temp/CheckFilesAreRemoved", false, false)) {
-				builder.Verbosity = LoggerVerbosity.Diagnostic;
+			if (!Builder.UseDotNet)
+				proj.SetProperty (KnownProperties.TargetFrameworkVersion, "v5.1");
+			using (var builder = CreateApkBuilder ()) {
 				Assert.IsTrue (builder.Build (proj), "Build should have succeeded");
 
 				var theme = proj.AndroidResources.First (x => x.Include () == "Resources\\values\\Theme.xml");
@@ -834,9 +848,10 @@ public void CheckFilesAreRemoved () {
 		}
 
 		[Test]
+		[Category ("dotnet")]
 		public void CheckDontUpdateResourceIfNotNeeded ()
 		{
-			var path = Path.Combine ("temp", "CheckDontUpdateResourceIfNotNeeded");
+			var path = Path.Combine ("temp", TestName);
 			var foo = new BuildItem.Source ("Foo.cs") {
 				TextContent = () => @"using System;
 namespace Lib1 {
@@ -879,10 +894,8 @@ public string GetFoo () {
 				},
 			};
 			using (var libBuilder = CreateDllBuilder (Path.Combine (path, libProj.ProjectName), false, false)) {
-				libBuilder.Verbosity = LoggerVerbosity.Diagnostic;
 				Assert.IsTrue (libBuilder.Build (libProj), "Library project should have built");
 				using (var appBuilder = CreateApkBuilder (Path.Combine (path, appProj.ProjectName), false, false)) {
-					appBuilder.Verbosity = LoggerVerbosity.Diagnostic;
 					Assert.IsTrue (appBuilder.Build (appProj), "Application Build should have succeeded.");
 					Assert.IsFalse (appBuilder.Output.IsTargetSkipped ("_UpdateAndroidResgen"), "_UpdateAndroidResgen target not should be skipped.");
 					foo.Timestamp = DateTimeOffset.UtcNow;
@@ -912,8 +925,9 @@ public string GetFoo () {
 					Assert.IsFalse (libBuilder.Output.IsTargetSkipped ("_CreateManagedLibraryResourceArchive"), "_CreateManagedLibraryResourceArchive should not be skipped.");
 					appBuilder.BuildLogFile = "build2.log";
 					Assert.IsTrue (appBuilder.Build (appProj, doNotCleanupOnUpdate: true, saveProject: false), "Application Build should have succeeded.");
-					string text = File.ReadAllText (Path.Combine (Root, path, appProj.ProjectName, "Resources", "Resource.designer.cs"));
-					Assert.IsTrue (text.Contains ("theme_devicedefault_background2"), "Resource.designer.cs was not updated.");
+					string resource_designer_cs = GetResourceDesignerPath (appBuilder, appProj);
+					string text = File.ReadAllText (resource_designer_cs);
+					StringAssert.Contains ("theme_devicedefault_background2", text, "Resource.designer.cs was not updated.");
 					Assert.IsFalse (appBuilder.Output.IsTargetSkipped ("_UpdateAndroidResgen"), "_UpdateAndroidResgen target should NOT be skipped.");
 					Assert.IsFalse (appBuilder.Output.IsTargetSkipped ("_CreateBaseApk"), "_CreateBaseApk target should NOT be skipped.");
 					Assert.IsFalse (appBuilder.Output.IsTargetSkipped ("_BuildApkEmbed"), "_BuildApkEmbed target should NOT be skipped.");
@@ -926,7 +940,7 @@ public string GetFoo () {
 					rawToDelete.Timestamp = DateTimeOffset.UtcNow;
 					theme.Deleted = true;
 					theme.Timestamp = DateTimeOffset.UtcNow;
-					Assert.IsTrue (libBuilder.Build (libProj, saveProject: true), "Library project should have built");
+					Assert.IsTrue (libBuilder.Build (libProj, doNotCleanupOnUpdate: true, saveProject: true), "Library project should have built");
 					var themeFile = Path.Combine (Root, path, libProj.ProjectName, libProj.IntermediateOutputPath, "res", "values", "theme.xml");
 					Assert.IsTrue (!File.Exists (themeFile), $"{themeFile} should have been deleted.");
 					var archive = Path.Combine (Root, path, libProj.ProjectName, libProj.IntermediateOutputPath, "__AndroidLibraryProjects__.zip");

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Utilities/XmlUtils.cs

@@ -59,6 +59,8 @@ public static string ToXml (IShortFormProject project)
 
 		static void AppendBuildItem (StringBuilder sb, BuildItem bi)
 		{
+			if (bi.Deleted)
+				return;
 			sb.Append ($"\t\t<{bi.BuildAction} ");
 			if (bi.Include != null) sb.Append ($"Include=\"{bi.Include ()}\" ");
 			if (bi.Update != null) sb.Append ($"Update=\"{bi.Update ()}\" ");

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

@@ -754,10 +754,6 @@ because xbuild doesn't support framework reference assemblies.
       EmbeddedNativeLibraries="@(EmbeddedNativeLibrary)" />
 </Target>
 
-<Target Name="_CheckTargetFramework">
-	<Warning Code="XA0109" Text="Unsupported or invalid %24(TargetFrameworkVersion) value of 'v4.5'. Please update your Project Options." Condition=" '$(TargetFrameworkVersion)' == 'v4.5' "/> 
-</Target>
-
 <Target Name="_CheckForContent">
 	<LogWarningsForFiles
 		Files="@(Content)"

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Legacy.targets

@@ -198,6 +198,10 @@ projects. .NET 5 projects will not import this file.
   <UsingTask TaskName="Xamarin.Android.Tasks.Legacy.ResolveAndroidTooling" AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
   <UsingTask TaskName="Xamarin.Android.Tasks.LinkAssemblies"               AssemblyFile="Xamarin.Android.Build.Tasks.dll" />
 
+  <Target Name="_CheckTargetFramework">
+    <Warning Code="XA0109" Text="Unsupported or invalid %24(TargetFrameworkVersion) value of 'v4.5'. Please update your Project Options." Condition=" '$(TargetFrameworkVersion)' == 'v4.5' "/> 
+  </Target>
+
   <Target Name="_GetReferenceAssemblyPaths">
     <GetReferenceAssemblyPaths
         TargetFrameworkMoniker="$(TargetFrameworkIdentifier),Version=v1.0"