diff --git a/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Test.cs b/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Test.cs index 3fa2e8a66..b79ebbc1d 100644 --- a/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Test.cs +++ b/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Test.cs @@ -243,6 +243,34 @@ public void TestGMapsDownload () Assert.True (File.Exists (Path.Combine (unpackDir, "GMaps-1.11.1", "CHANGELOG"))); } + [Fact] + public void TestGoogleAppMeasurementDownload () + { + var engine = new ProjectCollection (); + var prel = ProjectRootElement.Create (Path.Combine (TempDir , "project.csproj") , engine); + + var unpackDir = GetTempPath ("unpacked"); + prel.SetProperty ("XamarinBuildDownloadDir" , unpackDir); + + prel.AddItem ( + "XamarinBuildDownload" , "GAppM-10.28.0" , new Dictionary { + { "Url", "https://dl.google.com/firebase/ios/analytics/4d5ec9a36b6d4fd4/GoogleAppMeasurement-10.28.0.tar.gz" }, + { "Kind", "Tgz" } + }); + + AddCoreTargets (prel); + + var project = new ProjectInstance (prel); + var log = new MSBuildTestLogger (); + + var success = BuildProject (engine , project , "_XamarinBuildDownload" , log); + + AssertNoMessagesOrWarnings (log , DEFAULT_IGNORE_PATTERNS); + Assert.True (success); + + Assert.True (File.Exists (Path.Combine (unpackDir , "GAppM-10.28.0" , "GoogleAppMeasurement-10.28.0" , "dummy.txt"))); + } + [Fact] public void TestCastAssemblyResources () { @@ -727,4 +755,4 @@ public void TestPathGreaterThan260Chars () Assert.True (File.Exists (Path.Combine (unpackDir, "GAppM-8.8.0", "GoogleAppMeasurement-8.8.0", "dummy.txt"))); } } -} \ No newline at end of file +} diff --git a/util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj b/util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj index 52cfab719..0bd6a69f7 100644 --- a/util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj +++ b/util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj @@ -9,7 +9,7 @@ Xamarin.Build.Download Xamarin Build-time Download Support - 0.11.4 + 0.12.0 Microsoft Microsoft https://go.microsoft.com/fwlink/?linkid=865061 diff --git a/util/Xamarin.Build.Download/source/Xamarin.Build.Download/XamarinDownloadArchives.cs b/util/Xamarin.Build.Download/source/Xamarin.Build.Download/XamarinDownloadArchives.cs index 9a00a0b51..6a3d108b0 100644 --- a/util/Xamarin.Build.Download/source/Xamarin.Build.Download/XamarinDownloadArchives.cs +++ b/util/Xamarin.Build.Download/source/Xamarin.Build.Download/XamarinDownloadArchives.cs @@ -319,6 +319,9 @@ static ProcessArgumentBuilder Build7ZipExtractionArgs (string file, string conte if (ignoreTarSymLinks) args.Add ("-snl-"); + // Add the "-y" parameter to automatically confirm all overwrite operations to avoid the iOS build task hanging forever. + args.Add ("-y"); + args.AddQuoted ("-o" + contentDir); args.AddQuoted (file); return args;