Add support for stable build parameters

Adds support for PB_IsSTable and PB_VersionStamp which will allow
for stable builds to be produced without commits to the repo.

Commit migrated from https://github.com/dotnet/core-setup/commit/6843e0f48434a3a003b0e1d5bda59004859eb562

diff --git a/src/installer/BranchInfo.props b/src/installer/BranchInfo.props
index 0dd23e2..ebf9842 100644 (file)
--- a/src/installer/BranchInfo.props
+++ b/src/installer/BranchInfo.props
@@ -4,7 +4,8 @@
     <MinorVersion>1</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
-    <PreReleaseLabel>preview2</PreReleaseLabel>
+    <PreReleaseLabel Condition="'$(PackageVersionStamp)' != ''">$(PackageVersionStamp)</PreReleaseLabel>
+    <PreReleaseLabel Condition="'$(PreReleaseLabel)' == ''">preview2</PreReleaseLabel>
     <ReleaseSuffix>$(PreReleaseLabel)</ReleaseSuffix>
     <ReleaseBrandSuffix>Preview 2</ReleaseBrandSuffix>
     <Channel>master</Channel>

diff --git a/src/installer/buildpipeline/pipeline.json b/src/installer/buildpipeline/pipeline.json
index 6a88c55..5de1e65 100644 (file)
--- a/src/installer/buildpipeline/pipeline.json
+++ b/src/installer/buildpipeline/pipeline.json
@@ -20,7 +20,7 @@
           "Parameters": {
             "PB_DockerTag": "centos-7-d485f41-20173404063424",
             "PB_AdditionalBuildArguments":"-PortableBuild=true -strip-symbols -SkipTests=$(PB_SkipTests)",
-            "PB_AdditionalMSBuildArguments":"/p:DotNetRestoreSources=$(PB_RestoreSource)",
+            "PB_AdditionalMSBuildArguments":"/p:DotNetRestoreSources=$(PB_RestoreSource) /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
             "PB_PortableBuild": "true"
           },
           "ReportingParameters": {
@@ -36,7 +36,7 @@
             "PB_DockerTag": "centos-6-376e1a3-20174311014331",
             "PB_TargetArchitecture": "x64",
             "PB_AdditionalBuildArguments":"-TargetArchitecture=x64 -PortableBuild=false -strip-symbols -SkipTests=$(PB_SkipTests)",
-            "PB_AdditionalMSBuildArguments":"/p:OutputRid=rhel.6-x64 /p:DotNetRestoreSources=$(PB_RestoreSource)",
+            "PB_AdditionalMSBuildArguments":"/p:OutputRid=rhel.6-x64 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
             "PB_PortableBuild": "false"
           },
           "ReportingParameters": {
@@ -51,7 +51,7 @@
             "PB_DockerTag": "alpine-3.6-3148f11-20171119021156",
             "PB_TargetArchitecture": "x64",
             "PB_AdditionalBuildArguments":"-TargetArchitecture=x64 -PortableBuild=false -strip-symbols -SkipTests=$(PB_SkipTests)",
-            "PB_AdditionalMSBuildArguments":"/p:OutputRid=alpine.3.6-x64 /p:DotNetRestoreSources=$(PB_RestoreSource)",
+            "PB_AdditionalMSBuildArguments":"/p:OutputRid=alpine.3.6-x64 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
             "PB_PortableBuild": "false"
           },
           "ReportingParameters": {
@@ -66,7 +66,7 @@
             "PB_DockerTag": "ubuntu-14.04-cross-0cd4667-20170319080304",
             "PB_TargetArchitecture": "arm",
             "PB_AdditionalBuildArguments":"-TargetArchitecture=arm -DisableCrossgen=true -PortableBuild=true -SkipTests=true -CrossBuild=true -strip-symbols",
-            "PB_AdditionalMSBuildArguments": "/p:DotNetRestoreSources=$(PB_RestoreSource)",
+            "PB_AdditionalMSBuildArguments": "/p:DotNetRestoreSources=$(PB_RestoreSource) /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
             "PB_CrossBuildArgs": "-e ROOTFS_DIR ",
             "PB_PortableBuild": "true"
           },
@@ -81,7 +81,7 @@
           "Name": "Core-Setup-OSX-BT",
           "Parameters": {
             "PB_AdditionalBuildArguments": "-PortableBuild=true -strip-symbols -SkipTests=$(PB_SkipTests)",
-            "PB_AdditionalMSBuildArguments": "/p:DotNetRestoreSources=$(PB_RestoreSource)",
+            "PB_AdditionalMSBuildArguments": "/p:DotNetRestoreSources=$(PB_RestoreSource) /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
             "PB_PortableBuild": "true"
           },
           "ReportingParameters": {
@@ -94,7 +94,7 @@
         {
           "Name": "Core-Setup-Windows-Arm-BT",
           "Parameters": {
-            "PB_AdditionalMSBuildArguments": "/p:SkipTests=true /p:DotNetRestoreSources=$(PB_RestoreSource)",
+            "PB_AdditionalMSBuildArguments": "/p:SkipTests=true /p:DotNetRestoreSources=$(PB_RestoreSource) /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
             "PB_TargetArchitecture": "arm",
             "PB_PortableBuild": "true"
           },
@@ -108,7 +108,7 @@
         {
           "Name": "Core-Setup-Windows-Arm-BT",
           "Parameters": {
-            "PB_AdditionalMSBuildArguments": "/p:SkipTests=true /p:NativeToolSetDir=C:\\tools\\clr /p:DotNetRestoreSources=$(PB_RestoreSource)",
+            "PB_AdditionalMSBuildArguments": "/p:SkipTests=true /p:NativeToolSetDir=C:\\tools\\clr /p:DotNetRestoreSources=$(PB_RestoreSource) /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
             "PB_TargetArchitecture": "arm64",
             "PB_PortableBuild": "true"
           },
@@ -124,7 +124,7 @@
           "Parameters": {
             "PB_TargetArchitecture": "x64",
             "PB_PortableBuild": "true",
-            "PB_AdditionalMSBuildArguments": "/p:SkipTests=$(PB_SkipTests) /p:DotNetRestoreSources=$(PB_RestoreSource)",
+            "PB_AdditionalMSBuildArguments": "/p:SkipTests=$(PB_SkipTests) /p:DotNetRestoreSources=$(PB_RestoreSource) /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
             "PB_PublishRidAgnosticPackages": "true",
             "PB_BuildFullPlatformManifest": "true"
           },
@@ -140,7 +140,7 @@
           "Parameters": {
             "PB_TargetArchitecture": "x86",
             "PB_PortableBuild": "true",
-            "PB_AdditionalMSBuildArguments": "/p:SkipTests=$(PB_SkipTests) /p:DotNetRestoreSources=$(PB_RestoreSource)"
+            "PB_AdditionalMSBuildArguments": "/p:SkipTests=$(PB_SkipTests) /p:DotNetRestoreSources=$(PB_RestoreSource) /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)"
           },
           "ReportingParameters": {
             "OperatingSystem": "Windows",