diff options
| author | Elinor Fung <47805090+elinor-fung@users.noreply.github.com> | 2019-05-23 10:51:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-23 10:51:19 -0700 |
| commit | 3af71a7e68fb1d279b18d332db6cd3ee7a824295 (patch) | |
| tree | a34fdaba3a7cc59ce5ebfe0810c46ed0d829f087 /dir.common.props | |
| parent | 61a02edb7fb443b92f0682a00c42200def2bd33a (diff) | |
| download | coreclr-3af71a7e68fb1d279b18d332db6cd3ee7a824295.tar.gz coreclr-3af71a7e68fb1d279b18d332db6cd3ee7a824295.tar.bz2 coreclr-3af71a7e68fb1d279b18d332db6cd3ee7a824295.zip | |
Fix missing version numbers in packaged files and getting IBC merge version in official build (#24735)
* Fix missing version numbers in packaged files in official build
* Fix build script for getting IBC merge version
Diffstat (limited to 'dir.common.props')
| -rw-r--r-- | dir.common.props | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/dir.common.props b/dir.common.props index 106331e911..70382d60e5 100644 --- a/dir.common.props +++ b/dir.common.props @@ -16,15 +16,6 @@ <RestorePackagesPath>$(PackagesDir)</RestorePackagesPath> </PropertyGroup> - <!-- Version numbers for native binaries - [ARCADE REMOVE] These properties can be removed once native binaries use Arcade versioning - They are included in common for packaging, which is onboarded to Arcade, but uses the version - numbers for native binaries for some outputs. --> - <PropertyGroup> - <NativeMajorVersion>4</NativeMajorVersion> - <NativeMinorVersion>6</NativeMinorVersion> - </PropertyGroup> - <!-- Set default Configuration and Platform --> <PropertyGroup> <BuildArch>$(__BuildArch)</BuildArch> @@ -72,6 +63,18 @@ <PackagesBinDir Condition="'$(__PackagesBinDir)'==''">$(BinDir).nuget\</PackagesBinDir> </PropertyGroup> + <!-- Version numbers for native binaries and build version props file + [ARCADE REMOVE] These properties can be removed once native binaries use Arcade versioning + They are included in common for packaging, which is onboarded to Arcade, but uses the version + numbers for native binaries for some outputs. --> + <PropertyGroup> + <NativeMajorVersion>4</NativeMajorVersion> + <NativeMinorVersion>6</NativeMinorVersion> + + <!-- Explicitly set BuildVersionFile. This is used by BuildVersion.targets in BuildTools. --> + <BuildVersionFile Condition="'$(OfficialBuildId)' != ''">$(RootBinDir)obj\BuildVersion-$(OfficialBuildId).props</BuildVersionFile> + </PropertyGroup> + <PropertyGroup> <!-- Central place to set the versions of all nuget packages produced in the repo --> <PackageVersion Condition="'$(PackageVersion)' == ''">3.0.0</PackageVersion> |