[tests] NO dropbox, fix locking in Xamarin.ProjectTools

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

@@ -111,7 +111,7 @@ public void BuildLibraryZipBindigLibraryWithAarOfJar (string classParser)
 			proj.AndroidClassParser = classParser;
 			proj.Packages.Add (KnownPackages.AndroidSupportV4_22_1_1_1);
 			proj.Jars.Add (new AndroidItem.LibraryProjectZip ("Jars\\aFileChooserBinaries.zip") {
-				WebContent = "https://www.dropbox.com/s/hl98jrvlw4d9vjy/aFileChooserBinaries.zip?dl=1"
+				WebContentFileNameFromAzure = "aFileChooserBinaries.zip"
 			});
 			proj.MetadataXml = @"
 				<metadata>
@@ -167,7 +167,7 @@ public void BindByteArrayInMethodParameter ()
 				AndroidClassParser = "class-parse",
 			};
 			proj.Jars.Add (new AndroidItem.EmbeddedJar ("Jars\\svg-android.jar") {
-				WebContent = "https://www.dropbox.com/s/5ovudccigydohys/javaBindingIssue.jar?dl=1"
+				WebContentFileNameFromAzure = "javaBindingIssue.jar"
 			});
 			using (var b = CreateDllBuilder ("temp/BindByteArrayInMethodParameter")) {
 				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
@@ -182,7 +182,7 @@ public void MergeAndroidManifest ()
 			};
 			binding.AndroidClassParser = "class-parse";
 			binding.Jars.Add (new AndroidItem.LibraryProjectZip ("Jars\\adal-1.0.7.aar") {
-				WebContent = "https://www.dropbox.com/s/bubopadhd9d1l4b/adal-1.0.7.aar?dl=1"
+				WebContentFileNameFromAzure = "adal-1.0.7.aar"
 			});
 			binding.MetadataXml = @"
 <metadata>
@@ -213,7 +213,7 @@ public void AnnotationSupport ()
 			};
 			binding.AndroidClassParser = "class-parse";
 			binding.Jars.Add (new AndroidItem.LibraryProjectZip ("Jars\\mylibrary.aar") {
-				WebContent = "https://www.dropbox.com/s/53679881kg9rdiq/mylibrary-debug.aar?dl=1"
+				WebContentFileNameFromAzure = "mylibrary-debug.aar"
 			});
 			var bindingBuilder = CreateDllBuilder ("temp/AnnotationSupport");
 			Assert.IsTrue (bindingBuilder.Build (binding), "binding build failed");
@@ -251,7 +251,7 @@ public void BindngFilterUnsupportedNativeAbiLibraries ()
 			};
 			binding.AndroidClassParser = "class-parse";
 			binding.Jars.Add (new AndroidItem.LibraryProjectZip ("Jars\\mylibrary.aar") {
-				WebContent = "https://www.dropbox.com/s/apphdrh9cjqvtye/card.io-5.3.0.aar?dl=1"
+				WebContentFileNameFromAzure = "card.io-5.3.0.aar"
 			});
 			using (var bindingBuilder = CreateDllBuilder (Path.Combine ("temp", "BindngFilterUnsupportedNativeAbiLibraries", "Binding"))) {
 				Assert.IsTrue (bindingBuilder.Build (binding), "binding build should have succeeded");
@@ -272,10 +272,10 @@ public void BindingCheckHiddenFiles ([Values (true, false)] bool useShortFileNam
 			};
 			binding.AndroidClassParser = "class-parse";
 			binding.Jars.Add (new AndroidItem.LibraryProjectZip ("Jars\\mylibrary.aar") {
-				WebContent = "https://www.dropbox.com/s/astiqp8jo97x91h/mylibrary.aar?dl=1"
+				WebContentFileNameFromAzure = "mylibrary.aar"
 			});
 			binding.Jars.Add (new AndroidItem.EmbeddedJar ("Jars\\svg-android.jar") {
-				WebContent = "https://www.dropbox.com/s/5ovudccigydohys/javaBindingIssue.jar?dl=1"
+				WebContentFileNameFromAzure = "javaBindingIssue.jar"
 			});
 			var path = Path.Combine ("temp", TestContext.CurrentContext.Test.Name);
 			binding.SetProperty (binding.ActiveConfigurationProperties, "UseShortFileNames", useShortFileNames);
@@ -321,7 +321,7 @@ public void BindingDoNotPackage ()
 				IsRelease = true,
 				Jars = {
 					new AndroidItem.EmbeddedJar ("Jars\\svg-android.jar") {
-						WebContent = "https://www.dropbox.com/s/5ovudccigydohys/javaBindingIssue.jar?dl=1"
+						WebContentFileNameFromAzure = "javaBindingIssue.jar"
 					}
 				},
 				AssemblyInfo = @"

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

@@ -1035,19 +1035,19 @@ public void BuildBasicApplicationCheckMdbAndPortablePdb ()
 			using (var b = CreateApkBuilder ("temp/BuildBasicApplicationCheckMdbAndPortablePdb")) {
 				b.Verbosity = LoggerVerbosity.Diagnostic;
 				var reference = new BuildItem.Reference ("PdbTestLibrary.dll") {
-					WebContent = "https://www.dropbox.com/s/s4br29kvuy8ygz1/PdbTestLibrary.dll?dl=1"
+					WebContentFileNameFromAzure = "PdbTestLibrary.dll"
 				};
 				proj.References.Add (reference);
 				var pdb = new BuildItem.NoActionResource ("PdbTestLibrary.pdb") {
-					WebContent = "https://www.dropbox.com/s/033jif54ma0e01m/PdbTestLibrary.pdb?dl=1"
+					WebContentFileNameFromAzure = "PdbTestLibrary.pdb"
 				};
 				proj.References.Add (pdb);
 				var netStandardRef = new BuildItem.Reference ("NetStandard16.dll") {
-					WebContent = "https://www.dropbox.com/s/g7v0d4irzvaw5pl/NetStandard16.dll?dl=1"
+					WebContentFileNameFromAzure = "NetStandard16.dll"
 				};
 				proj.References.Add (netStandardRef);
 				var netStandardpdb = new BuildItem.NoActionResource ("NetStandard16.pdb") {
-					WebContent = "https://www.dropbox.com/s/m898ix2m2il631y/NetStandard16.pdb?dl=1"
+					WebContentFileNameFromAzure = "NetStandard16.pdb"
 				};
 				proj.References.Add (netStandardpdb);
 				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
@@ -2436,19 +2436,19 @@ public void BuildBasicApplicationCheckPdb ()
 			using (var b = CreateApkBuilder ("temp/BuildBasicApplicationCheckPdb", false, false)) {
 				b.Verbosity = LoggerVerbosity.Diagnostic;
 				var reference = new BuildItem.Reference ("PdbTestLibrary.dll") {
-					WebContent = "https://dl.dropboxusercontent.com/u/18881050/Xamarin/PdbTestLibrary.dll"
+					WebContentFileNameFromAzure = "PdbTestLibrary.dll"
 				};
 				proj.References.Add (reference);
 				var pdb = new BuildItem.NoActionResource ("PdbTestLibrary.pdb") {
-					WebContent = "https://dl.dropboxusercontent.com/u/18881050/Xamarin/PdbTestLibrary.pdb"
+					WebContentFileNameFromAzure = "PdbTestLibrary.pdb"
 				};
 				proj.References.Add (pdb);
 				var netStandardRef = new BuildItem.Reference ("NetStandard16.dll") {
-					WebContent = "https://dl.dropboxusercontent.com/u/18881050/Xamarin/NetStandard16.dll"
+					WebContentFileNameFromAzure = "NetStandard16.dll"
 				};
 				proj.References.Add (netStandardRef);
 				var netStandardpdb = new BuildItem.NoActionResource ("NetStandard16.pdb") {
-					WebContent = "https://dl.dropboxusercontent.com/u/18881050/Xamarin/NetStandard16.pdb"
+					WebContentFileNameFromAzure = "NetStandard16.pdb"
 				};
 				proj.References.Add (netStandardpdb);
 				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/BuildItem.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -123,20 +122,24 @@ public BuildItem (string buildAction, Func<string> include = null)
 		public bool Deleted { get; set; }
 		public FileAttributes Attributes { get; set;}
 
-		static readonly ConcurrentDictionary<string, object> locks = new ConcurrentDictionary<string, object> ();
-
 		public string WebContent {
 			get { throw new NotSupportedException (); }
 			set {
 				BinaryContent = () => {
-					lock (locks.GetOrAdd (value, _ => new object ())) {
-						var file = new DownloadedCache ().GetAsFile (value);
-						return File.ReadAllBytes (file);
-					}
+					var file = new DownloadedCache ().GetAsFile (value);
+					return File.ReadAllBytes (file);
 				};
 			}
 		}
 
+		/// <summary>
+		/// NOTE: downloads a file from our https://xamjenkinsartifact.azureedge.net/ Azure Storage Account
+		/// </summary>
+		public string WebContentFileNameFromAzure {
+			get { throw new NotSupportedException (); }
+			set { WebContent = $"https://xamjenkinsartifact.azureedge.net/mono-jenkins/xamarin-android-test/{value}"; }
+		}
+
 		public string MetadataValues {
 			get { return string.Join (";", Metadata.Select (p => p.Key + '=' + p.Value)); }
 			set {

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DownloadedCache.cs

@@ -1,13 +1,14 @@
 using System;
+using System.Collections.Concurrent;
 using System.IO;
-using System.Security.Cryptography;
-using System.Xml;
 using System.Linq;
+using System.Security.Cryptography;
 
 namespace Xamarin.ProjectTools
 {
 	public class DownloadedCache
 	{
+		static readonly ConcurrentDictionary<string, object> locks = new ConcurrentDictionary<string, object> ();
 
 		public DownloadedCache ()
 			: this (Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.LocalApplicationData), "Xamarin.ProjectTools"))
@@ -25,16 +26,18 @@ public DownloadedCache (string cacheDirectory)
 
 		public string GetAsFile (string url, string md5 = null)
 		{
-			if (!Directory.Exists (CacheDirectory))
-				Directory.CreateDirectory (CacheDirectory);
+			Directory.CreateDirectory (CacheDirectory);
+
 			var filename = Path.Combine (CacheDirectory, Path.GetFileName (new Uri (url).LocalPath));
-			if (File.Exists (filename) && (md5 == null || GetMd5 (filename) == md5))
+			lock (locks.GetOrAdd (filename, _ => new object ())) {
+				if (File.Exists (filename) && (md5 == null || GetMd5 (filename) == md5))
+					return filename;
+				// FIXME: should be clever enough to resolve name conflicts.
+				new System.Net.WebClient ().DownloadFile (url, filename);
+				if (md5 != null && GetMd5 (filename) != md5)
+					throw new InvalidOperationException (string.Format ("The given md5sum doesn't match the actual web resource. '{0}' for '{1}'", md5, url));
 				return filename;
-			// FIXME: should be clever enough to resolve name conflicts.
-			new System.Net.WebClient ().DownloadFile (url, filename);
-			if (md5 != null && GetMd5 (filename) != md5)
-				throw new InvalidOperationException (string.Format ("The given md5sum doesn't match the actual web resource. '{0}' for '{1}'", md5, url));
-			return filename;
+			}
 		}
 
 		string GetMd5 (string filename)