From 34805dc3852ba218fcfd695bc0b9eb996860e025 Mon Sep 17 00:00:00 2001
From: Elinor Fung <47805090+elinor-fung@users.noreply.github.com>
Date: Tue, 28 May 2019 18:46:08 -0700
Subject: Use Arcade for native versioning (#24785)

---
 eng/Versions.props | 3 +++
 eng/build-job.yml  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'eng')

diff --git a/eng/Versions.props b/eng/Versions.props
index 8a0c8e26ad..4409284f04 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,6 +3,9 @@
   <PropertyGroup>
     <!-- The .NET Core product branding version -->
     <ProductVersion>3.0.0</ProductVersion>
+    <!-- File version numbers -->
+    <MajorVersion>4</MajorVersion>
+    <MinorVersion>7</MinorVersion>
     <!-- Always use shipping version instead of dummy versions -->
     <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
     <PreReleaseVersionLabel>preview6</PreReleaseVersionLabel>
diff --git a/eng/build-job.yml b/eng/build-job.yml
index ca2b0a011a..9084ae9f7d 100644
--- a/eng/build-job.yml
+++ b/eng/build-job.yml
@@ -159,10 +159,10 @@ jobs:
 
     # Build packages
     - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
-      - script: ./build-packages.sh -BuildArch=$(archType) -BuildType=$(buildConfigUpper) $(crossPackagesArg) -OfficialBuildId=$(Build.BuildNumber) $(portableBuildArg) -ci
+      - script: ./build-packages.sh -BuildArch=$(archType) -BuildType=$(buildConfigUpper) $(crossPackagesArg) $(officialBuildIdArg) $(portableBuildArg) -ci
         displayName: Build packages
     - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
-      - script: build-packages.cmd -BuildArch=$(archType) -BuildType=$(buildConfigUpper) -OfficialBuildId=$(Build.BuildNumber) -ci
+      - script: build-packages.cmd -BuildArch=$(archType) -BuildType=$(buildConfigUpper) $(officialBuildIdArg) -ci
         displayName: Build packages
 
     # Publish official build
-- 
cgit v1.2.3