Add a property to allow for preview packages (#173)

Author: mattleibow

azure-pipelines.yml

@@ -3,6 +3,7 @@ variables:
   MONO_VERSION: 5_16_0
   XCODE_VERSION: 10.1
   VERBOSITY: minimal
+  BUILD_NUMBER: $[counter('$(Build.SourceBranchName)_counter', 1)]
 
 resources:
   repositories:
@@ -50,15 +51,12 @@ jobs:
       # Run some internal auditing
       - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
         - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-          condition: not(startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
           displayName: Component Detection - Log
           inputs:
             scanType: LogOnly
         - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-          condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
           displayName: Component Detection - Report
         - task: securedevelopmentteam.vss-secure-development-tools.build-task-policheck.PoliCheck@1
-          condition: eq(variables['System.TeamProject'], 'devdiv')
           displayName: 'PoliCheck'
           inputs:
             targetType: F
@@ -72,7 +70,7 @@ jobs:
         name: VSEng-XamarinCustom
         demands:
           - corpnet
-      condition: and(succeeded(), startsWith(variables['Build.SourceBranch'],'refs/tags/'))
+      condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/AndroidX')))
       steps:
         # don't checkout code and sign the packages
         - checkout: none

build.cake

@@ -48,9 +48,15 @@ var MONODROID_PATH = MONODROID_BASE_PATH.Combine(ANDROID_SDK_VERSION);
 
 var ANDROIDX_MAPPER_EXE = MakeAbsolute ((FilePath)$"util/AndroidXMapper/AndroidXMapper/bin/{BUILD_CONFIG}/net47/AndroidXMapper.exe");
 
+var BUILD_NUMBER = EnvironmentVariable("BUILD_NUMBER") ?? "";
+if (string.IsNullOrEmpty(BUILD_NUMBER)) {
+    BUILD_NUMBER = "0";
+}
+
 Information ("MONODROID_BASE_PATH: {0}", MONODROID_BASE_PATH);
 Information ("MONODROID_PATH:      {0}", MONODROID_PATH);
 Information ("ANDROIDX_MAPPER_EXE: {0}", ANDROIDX_MAPPER_EXE);
+Information ("BUILD_NUMBER:        {0}", BUILD_NUMBER);
 
 // You shouldn't have to configure anything below here
 // ######################################################
@@ -110,6 +116,19 @@ Task("nuget")
 	.IsDependentOn("libs")
 	.Does(() =>
 {
+	// package the stable release
+	MSBuild ("./generated/AndroidX.sln", c => {
+		c.Configuration = BUILD_CONFIG;
+		c.MaxCpuCount = 0;
+		c.Verbosity = VERBOSITY;
+		c.Targets.Clear();
+		c.Targets.Add("Pack");
+		c.Properties.Add("PackageOutputPath", new [] { MakeAbsolute(new FilePath("./output")).FullPath });
+		c.Properties.Add("PackageRequireLicenseAcceptance", new [] { "true" });
+		c.Properties.Add("DesignTimeBuild", new [] { "false" });
+		c.Properties.Add("AndroidSdkBuildToolsVersion", new [] { "28.0.3" });
+	});
+	// package the preview release
 	MSBuild ("./generated/AndroidX.sln", c => {
 		c.Configuration = BUILD_CONFIG;
 		c.MaxCpuCount = 0;
@@ -120,6 +139,7 @@ Task("nuget")
 		c.Properties.Add("PackageRequireLicenseAcceptance", new [] { "true" });
 		c.Properties.Add("DesignTimeBuild", new [] { "false" });
 		c.Properties.Add("AndroidSdkBuildToolsVersion", new [] { "28.0.3" });
+		c.Properties.Add("PackageVersionSuffix", new [] { "-preview-" + BUILD_NUMBER });
 	});
 
 	var xmlns = (XNamespace)"http://schemas.microsoft.com/developer/msbuild/2003";

source/AndroidXProject.cshtml

@@ -30,7 +30,7 @@
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=865352</PackageProjectUrl>
     <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=865381</PackageLicenseUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/@(Model.Name)_128x128.png</PackageIconUrl>
-    <PackageVersion>@(Model.NuGetVersion)</PackageVersion>
+    <PackageVersion>@(Model.NuGetVersion)$(PackageVersionSuffix)</PackageVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
   </PropertyGroup>