Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Xamarin.Android.Build.Tasks] Fix a Hang in Visual Studio DesignTime Build. #985

Merged
merged 2 commits into from
Oct 26, 2017
Merged

[Xamarin.Android.Build.Tasks] Fix a Hang in Visual Studio DesignTime Build. #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
518ffcd
[Xamarin.Android.Build.Tasks] Fix a Hang in Visual Studio DesignTime …
dellis1972 Oct 26, 2017
6939bd5
Added updated test.
dellis1972 Oct 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...marin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidUpdateResourcesTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void DesignTimeBuild ([Values(false, true)] bool isRelease, [Values (fals
b.Target = "Compile";
Assert.IsTrue (b.Build (proj, doNotCleanupOnUpdate: true, parameters: new string [] { "DesignTimeBuild=true" }, environmentVariables: envVar),
"first build failed");
Assert.AreEqual (!useManagedParser, b.LastBuildOutput.Contains ("Skipping download of "),
Assert.AreEqual (!useManagedParser, b.LastBuildOutput.Contains ("Skipping GetAdditionalResourcesFromAssemblies"),
"failed to skip the downloading of files.");
var items = new List<string> ();
string first = null;
Expand Down
2 changes: 2 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,9 @@ Copyright (C) 2012 Xamarin Inc. All rights reserved.
CacheFile="$(IntermediateOutputPath)resourcepaths.cache"
YieldDuringToolExecution="$(YieldDuringToolExecution)"
DesignTimeBuild="$(DesignTimeBuild)"
Condition=" '$(DesignTimeBuild)' == '' Or '$(DesignTimeBuild)' == 'false' "
/>
<Message Text="Skipping GetAdditionalResourcesFromAssemblies in DesignTime build" Condition=" '$(DesignTimeBuild)' == 'true' " />
</Target>

<Target Name="_GetAdditionalResourcesFromAssemblies" DependsOnTargets="_BuildAdditionalResourcesCache">
Expand Down
2 changes: 2 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,9 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
YieldDuringToolExecution="$(YieldDuringToolExecution)"
DesignTimeBuild="$(DesignTimeBuild)"
ContinueOnError="$(DesignTimeBuild)"
Condition=" '$(DesignTimeBuild)' == '' Or '$(DesignTimeBuild)' == 'false' "
/>
<Message Text="Skipping GetAdditionalResourcesFromAssemblies in DesignTime build" Condition=" '$(DesignTimeBuild)' == 'true' " />
</Target>

<Target Name="_ValidateResourceCache">
Expand Down