Merge master changes back in

Author: Redth

build.cake

@@ -21,7 +21,7 @@
 #addin nuget:?package=Cake.Yaml&version=2.0.0
 #addin nuget:?package=Cake.Xamarin&version=2.0.1
 #addin nuget:?package=Cake.XCode&version=3.0.0
-#addin nuget:?package=Cake.Xamarin.Build&version=3.0.3
+#addin nuget:?package=Cake.Xamarin.Build&version=3.0.6
 #addin nuget:?package=Cake.Compression&version=0.1.4
 #addin nuget:?package=Cake.Android.SdkManager&version=2.0.1
 #addin nuget:?package=Cake.Android.Adb&version=2.0.4
@@ -71,7 +71,7 @@ var REFERENCE_DOCS_URL = "https://developer.android.com/reference/";
 var REFERENCE_DOCS_PACKAGELIST_URL = REFERENCE_DOCS_URL + "android/support/package-list";
 
 // We grab the previous release's api-info.xml to use as a comparison for this build's generated info to make an api-diff
-var BASE_API_INFO_URL = "https://github.com/xamarin/AndroidSupportComponents/releases/download/26.1.0/api-info.xml";
+var BASE_API_INFO_URL = EnvironmentVariable("MONO_API_INFO_XML_URL") ?? "https://github.com/xamarin/AndroidSupportComponents/releases/download/26.1.0/api-info.xml";
 
 var CPU_COUNT = 1;
 var USE_MSBUILD_ON_MAC = true;
@@ -324,7 +324,9 @@ Task ("diff")
 		"./output/AndroidSupport.api-diff.html");
 });
 
-Task ("merge").IsDependentOn ("libs").Does (() =>
+Task ("merge")
+	.IsDependentOn ("libs")
+	.Does (() =>
 {
 	if (FileExists ("./output/AndroidSupport.Merged.dll"))
 		DeleteFile ("./output/AndroidSupport.Merged.dll");
@@ -342,29 +344,10 @@ Task ("merge").IsDependentOn ("libs").Does (() =>
 	});
 });
 
-
-Task ("component-setup").Does (() =>
-{
-	var yamls = GetFiles ("./**/component/component.template.yaml");
-
-	foreach (var yaml in yamls) {
-		var manifestTxt = FileReadText (yaml)
-			.Replace ("$nuget-version$", NUGET_VERSION)
-			.Replace ("$version$", COMPONENT_VERSION);
-
-		var newYaml = yaml.GetDirectory ().CombineWithFilePath ("component.yaml");
-
-		FileWriteText (newYaml, manifestTxt);
-	}
-});
-
-
 Task ("nuget-setup")
-	.IsDependentOn ("externals")
 	.IsDependentOn ("buildtasks")
 	.Does (() => 
 {
-
 	Action<FilePath, FilePath> mergeTargetsFiles = (FilePath fromFile, FilePath intoFile) =>
 	{
 		// Load the doc to append to, and the doc to append
@@ -420,7 +403,6 @@ Task ("nuget-setup")
 			mergeTargetsFiles (mergeFile, targetsFile);
 		}
 
-		
 		// Transform all template.nuspec files
 		var nuspecText = FileReadText(art.PathPrefix + art.ArtifactId + "/nuget/template.nuspec");
 		//nuspecText = nuspecText.Replace ("$xbdversion$", XBD_VERSION);
@@ -446,34 +428,18 @@ Task ("nuget-setup")
 	}
 });
 
-Task ("nuget")
-	.IsDependentOn ("libs")
-	.IsDependentOn ("nuget-setup")
-	.IsDependentOn ("nuget-base");
-
-Task ("ci")
-	.IsDependentOn ("ci-setup")
-	.IsDependentOn ("diff")
-	.IsDependentOn ("component");
-
-Task ("component")
-	.IsDependentOn ("libs")
-	.IsDependentOn ("component-docs")
-	.IsDependentOn ("component-setup")
-	.IsDependentOn ("component-base");
-
 Task ("clean")
 	.IsDependentOn ("clean-base")
 	.Does (() =>
 {
-	if (FileExists ("./generated.targets"))
-		DeleteFile ("./generated.targets");
+	var yamls = GetFiles ("./**/component/component.template.yaml");
 
-	if (DirectoryExists ("./externals"))
-		DeleteDirectory ("./externals", true);
+	foreach (var yaml in yamls) {
+		var manifestTxt = FileReadText (yaml)
+			.Replace ("$nuget-version$", NUGET_VERSION)
+			.Replace ("$version$", COMPONENT_VERSION);
 
-	CleanDirectories ("./**/packages");
-});
+		var newYaml = yaml.GetDirectory ().CombineWithFilePath ("component.yaml");
 
 Task ("ci-setup")
 	.WithCriteria (!BuildSystem.IsLocalBuild)
@@ -569,11 +535,6 @@ Task ("component-docs")
 	}
 });
 
-Task ("libs")
-	.IsDependentOn ("buildtasks")
-	.IsDependentOn ("genapi")
-	.IsDependentOn ("libs-base");
-
 Task ("genapi")
 	.IsDependentOn ("externals")
 	.IsDependentOn ("libs-base")
@@ -661,6 +622,61 @@ Task ("droiddocs")
 	}
 });
 
+Task ("ci-setup")
+	.WithCriteria (!BuildSystem.IsLocalBuild)
+	.Does (() => 
+{
+	var buildCommit = "DEV";
+	var buildNumber = "DEBUG";
+	var buildTimestamp = DateTime.UtcNow.ToString ();
+
+	if (BuildSystem.IsRunningOnJenkins) {
+		buildNumber = BuildSystem.Jenkins.Environment.Build.BuildTag;
+		buildCommit = EnvironmentVariable("GIT_COMMIT") ?? buildCommit;
+	} else if (BuildSystem.IsRunningOnVSTS) {
+		buildNumber = BuildSystem.TFBuild.Environment.Build.Number;
+		buildCommit = BuildSystem.TFBuild.Environment.Repository.SourceVersion;
+	}
+
+	ReplaceTextInFiles("./**/source/**/AssemblyInfo.cs", "{BUILD_COMMIT}", buildCommit);
+	ReplaceTextInFiles("./**/source/**/AssemblyInfo.cs", "{BUILD_NUMBER}", buildNumber);
+	ReplaceTextInFiles("./**/source/**/AssemblyInfo.cs", "{BUILD_TIMESTAMP}", buildTimestamp);
+});
+
+Task ("clean")
+	.IsDependentOn ("clean-base")
+	.Does (() =>
+{
+	if (FileExists ("./generated.targets"))
+		DeleteFile ("./generated.targets");
+
+	if (DirectoryExists ("./externals"))
+		DeleteDirectory ("./externals", true);
+
+	CleanDirectories ("./**/packages");
+});
+
+Task ("nuget")
+	.IsDependentOn ("libs")
+	.IsDependentOn ("nuget-setup")
+	.IsDependentOn ("nuget-base");
+
+Task ("component")
+	.IsDependentOn ("nuget")
+	.IsDependentOn ("component-docs")
+	.IsDependentOn ("component-base");
+	
+Task ("libs")
+	.IsDependentOn ("externals")
+	.IsDependentOn ("nuget-setup")
+	.IsDependentOn ("libs-base")
+	.IsDependentOn ("genapi");
+
+Task ("ci")
+	.IsDependentOn ("ci-setup")
+	.IsDependentOn ("diff")
+	.IsDependentOn ("component");
+
 SetupXamarinBuildTasks (buildSpec, Tasks, Task);
 
 RunTarget (TARGET);