Skip to content

Commit e824170

Browse files
dellis1972jonpryor
authored andcommitted
[Xamarin.Android.Build.Tasks] Fix VS DesignTime Build Hang (#985)
FixesL https://bugzilla.xamarin.com/show_bug.cgi?id=60080 In a previous attempt to fix an intellisense build (1cd582e) we caused this issue. The DesignTime build does NOT like our AsyncTask as it locks the IDE. This commit puts the old code back in place which skips the task if we are in DesignTime mode. But so we can easily test it, we emit an message that our test can pick up to ensure we are doing the correct thing. Without the message we have no way of knowing if the task is skipped.
1 parent d0b7b0d commit e824170

3 files changed

Lines changed: 5 additions & 1 deletion

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void DesignTimeBuild ([Values(false, true)] bool isRelease, [Values (fals
8787
b.Target = "Compile";
8888
Assert.IsTrue (b.Build (proj, doNotCleanupOnUpdate: true, parameters: new string [] { "DesignTimeBuild=true" }, environmentVariables: envVar),
8989
"first build failed");
90-
Assert.AreEqual (!useManagedParser, b.LastBuildOutput.Contains ("Skipping download of "),
90+
Assert.AreEqual (!useManagedParser, b.LastBuildOutput.Contains ("Skipping GetAdditionalResourcesFromAssemblies"),
9191
"failed to skip the downloading of files.");
9292
var items = new List<string> ();
9393
string first = null;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,9 @@ Copyright (C) 2012 Xamarin Inc. All rights reserved.
278278
CacheFile="$(IntermediateOutputPath)resourcepaths.cache"
279279
YieldDuringToolExecution="$(YieldDuringToolExecution)"
280280
DesignTimeBuild="$(DesignTimeBuild)"
281+
Condition=" '$(DesignTimeBuild)' == '' Or '$(DesignTimeBuild)' == 'false' "
281282
/>
283+
<Message Text="Skipping GetAdditionalResourcesFromAssemblies in DesignTime build" Condition=" '$(DesignTimeBuild)' == 'true' " />
282284
</Target>
283285

284286
<Target Name="_GetAdditionalResourcesFromAssemblies" DependsOnTargets="_BuildAdditionalResourcesCache">

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,9 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
412412
YieldDuringToolExecution="$(YieldDuringToolExecution)"
413413
DesignTimeBuild="$(DesignTimeBuild)"
414414
ContinueOnError="$(DesignTimeBuild)"
415+
Condition=" '$(DesignTimeBuild)' == '' Or '$(DesignTimeBuild)' == 'false' "
415416
/>
417+
<Message Text="Skipping GetAdditionalResourcesFromAssemblies in DesignTime build" Condition=" '$(DesignTimeBuild)' == 'true' " />
416418
</Target>
417419

418420
<Target Name="_ValidateResourceCache">

0 commit comments

Comments
 (0)