summaryrefslogtreecommitdiff
path: root/eng
diff options
context:
space:
mode:
authorElinor Fung <47805090+elinor-fung@users.noreply.github.com>2019-05-28 18:46:08 -0700
committerGitHub <noreply@github.com>2019-05-28 18:46:08 -0700
commit34805dc3852ba218fcfd695bc0b9eb996860e025 (patch)
treeba9fc69cc66a238cd37ba899dd5d6e15367e69ab /eng
parent420884ff6f4244f0e6ca8c5cfc2f59a708d89379 (diff)
downloadcoreclr-34805dc3852ba218fcfd695bc0b9eb996860e025.tar.gz
coreclr-34805dc3852ba218fcfd695bc0b9eb996860e025.tar.bz2
coreclr-34805dc3852ba218fcfd695bc0b9eb996860e025.zip
Use Arcade for native versioning (#24785)
Diffstat (limited to 'eng')
-rw-r--r--eng/Versions.props3
-rw-r--r--eng/build-job.yml4
2 files changed, 5 insertions, 2 deletions
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