Fix CustomDesignerTargetSetupDependenciesForDesigner Test

Author: dellis1972

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

@@ -90,10 +90,11 @@ public CustomTextView(Context context, IAttributeSet attributes) : base(context,
 			using (var libb = CreateDllBuilder (Path.Combine (path, lib.ProjectName), false, false))
 			using (var appb = CreateApkBuilder (Path.Combine (path, proj.ProjectName), false, false)) {
 				// Save the library project, but don't build it yet
-				libb.Save (lib);
+				libb.Save (lib, saveProject: true);
+				FileAssert.Exists (Path.Combine(Root, path, lib.ProjectName, lib.ProjectFilePath));
 				appb.BuildLogFile = "build1.log";
 				appb.Target = target;
-				Assert.IsTrue (appb.DesignTimeBuild (proj), $"build should have succeeded for target `{target}`");
+				Assert.IsTrue (appb.Build (proj, parameters: DesignerParameters), $"build should have succeeded for target `{target}`");
 				Assert.IsTrue (appb.Output.AreTargetsAllBuilt ("_UpdateAndroidResgen"), "_UpdateAndroidResgen should have run completely.");
 				Assert.IsTrue (appb.Output.AreTargetsAllBuilt ("_Foo"), "_Foo should have run completely");
 				var customViewPath = Path.Combine (Root, appb.ProjectDirectory, proj.IntermediateOutputPath, "res", "layout", "custom_text.xml");
@@ -104,10 +105,10 @@ public CustomTextView(Context context, IAttributeSet attributes) : base(context,
 				Assert.IsNotNull (doc.Element ("LinearLayout").Element ("unnamedproject.CustomTextView"),
 					"unnamedproject.CustomTextView should have not been replaced with a $(Hash).CustomTextView");
 				// Build the library project now
-				Assert.IsTrue (libb.Build (lib, doNotCleanupOnUpdate: true), "library build should have succeeded.");
+				Assert.IsTrue (libb.Build (lib, doNotCleanupOnUpdate: true, saveProject: true), "library build should have succeeded.");
 				appb.Target = "Build";
 				appb.BuildLogFile = "build2.log";
-				Assert.IsTrue (appb.Build (proj, doNotCleanupOnUpdate: true, saveProject:false), "app build should have succeeded.");
+				Assert.IsTrue (appb.Build (proj, doNotCleanupOnUpdate: true, saveProject: false), "app build should have succeeded.");
 				Assert.IsTrue (appb.Output.AreTargetsAllBuilt ("_UpdateAndroidResgen"), "_UpdateAndroidResgen should have run completely.");
 				Assert.IsTrue (appb.Output.AreTargetsAllBuilt ("_Foo"), "_Foo should have run completely");
 				doc = XDocument.Load (customViewPath);
@@ -117,7 +118,16 @@ public CustomTextView(Context context, IAttributeSet attributes) : base(context,
 					"unnamedproject.CustomTextView should have been replaced with a $(Hash).CustomTextView");
 				appb.Target = target;
 				appb.BuildLogFile = "build3.log";
-				Assert.IsTrue (appb.DesignTimeBuild (proj, doNotCleanupOnUpdate: true), $"build should have succeeded for target `{target}`");
+				Assert.IsTrue (appb.DesignTimeBuild (proj, parameters: DesignerParameters, doNotCleanupOnUpdate: true), $"build should have succeeded for target `{target}`");
+				Assert.IsFalse (appb.Output.AreTargetsAllSkipped ("_UpdateAndroidResgen"), "_UpdateAndroidResgen should not have been skipped.");
+				Assert.IsTrue (appb.Output.AreTargetsAllBuilt ("_Foo"), "_Foo should have run completely");
+				doc = XDocument.Load (customViewPath);
+				Assert.IsNull (doc.Element ("LinearLayout").Element ("UnnamedProject.CustomTextView"),
+					"UnnamedProject.CustomTextView should have been replaced with a $(Hash).CustomTextView");
+				Assert.IsNull (doc.Element ("LinearLayout").Element ("unnamedproject.CustomTextView"),
+					"unnamedproject.CustomTextView should have been replaced with a $(Hash).CustomTextView");
+				appb.BuildLogFile = "build4.log";
+				Assert.IsTrue (appb.DesignTimeBuild (proj, parameters: DesignerParameters, doNotCleanupOnUpdate: true), $"build should have succeeded for target `{target}`");
 				Assert.IsTrue (appb.Output.AreTargetsAllSkipped ("_UpdateAndroidResgen"), "_UpdateAndroidResgen should have been skipped.");
 				Assert.IsTrue (appb.Output.AreTargetsAllBuilt ("_Foo"), "_Foo should have run completely");
 				doc = XDocument.Load (customViewPath);

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

@@ -47,6 +47,7 @@ This file is used by all project types, including binding projects.
       <_AndroidLibraryProjectImportsCache Condition=" '$(DesignTimeBuild)' == 'true' And !Exists ('$(_AndroidLibraryProjectImportsCache)') ">$(_AndroidLibraryProjectImportsDesignTimeCache)</_AndroidLibraryProjectImportsCache>
       <_AndroidBuildPropertiesCache Condition=" '$(DesignTimeBuild)' == 'true' ">$(_AndroidDesignTimeBuildPropertiesCache)</_AndroidBuildPropertiesCache>
       <_GeneratorStampFile Condition=" '$(DesignTimeBuild)' == 'true' ">$(_AndroidIntermediateDesignTimeStampDirectory)generator.stamp</_GeneratorStampFile>
+      <_AndroidResgenFlagFile Condition=" '$(DesignTimeBuild)' == 'true' ">$(_AndroidIntermediateDesignTimeBuildDirectory)R.cs.flag</_AndroidResgenFlagFile>
     </PropertyGroup>
     <MakeDir
         Condition=" '$(_AndroidIsBindingProject)' != 'true' And !Exists ('$(_AndroidIntermediateDesignTimeBuildDirectory)') "