Skip to content

Commit

Permalink
[xharness] Improve restoring NuGets for Xamarin.Mac projects in the m…
Browse files Browse the repository at this point in the history
…akefile by depending on the csproj files in addition to the packages.conf files. (#9242)

Packages are listed in the csproj when we're using package references.

Also only list files in git, otherwise we pick up all the generated project files as well.
  • Loading branch information
rolfbjarne authored and mandel-macaque committed Oct 5, 2020
1 parent 670267b commit 767f6c3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/xharness/MakefileGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public static void CreateMacMakefile (IHarness harness, IEnumerable<MacTarget> t
writer.WriteLine ("\t$(Q) touch $@");
writer.WriteLine ();
var nuget_restore_dependency = ".stamp-nuget-restore-mac";
writer.WriteLine ("PACKAGES_CONFIG:=$(shell find . -name packages.config)");
writer.WriteLine ("PACKAGES_CONFIG:=$(shell git ls-files -- '*.csproj' '*/packages.config' | sed 's/ /\\\\ /g')");
writer.WriteLine ($"{nuget_restore_dependency}: tests-mac.sln $(PACKAGES_CONFIG)");
writer.WriteLine ("\t$(Q_XBUILD) $(SYSTEM_XIBUILD) -t -- /Library/Frameworks/Mono.framework/Versions/Current/lib/mono/nuget/NuGet.exe restore tests-mac.sln");
writer.WriteLine ("\t$(Q) touch $@");
Expand Down

0 comments on commit 767f6c3

Please sign in to comment.