Fix versions for Libs subset's native artifacts (#52799)
authorAdeel Mujahid <3840695+am11@users.noreply.github.com>
Tue, 18 May 2021 12:47:48 +0000 (15:47 +0300)
committerGitHub <noreply@github.com>
Tue, 18 May 2021 12:47:48 +0000 (14:47 +0200)
During the repo consolidation, we missed passing `OfficialBuildId`
argument to common script from all subsets, which resulted in default
version emitted in the binaries produced by Libs subset in the official
builds.

src/installer/corehost.proj
src/libraries/Native/build-native.proj

index 09d6bc7ebb6bf291b314ab946d98659592861e37..afc3fd7f43b8a4b4143f0bf11e2c9e2430d89be2 100644 (file)
@@ -30,7 +30,7 @@
       <BuildArgs Condition="'$(CMakeArgs)' != ''">$(BuildArgs) $(CMakeArgs)</BuildArgs>
       <BuildArgs>$(BuildArgs) -coreclrartifacts $(CoreCLRArtifactsPath)</BuildArgs>
       <BuildArgs Condition="'$(Ninja)' == 'true'">$(BuildArgs) -ninja</BuildArgs>
-      <BuildArgs>$(BuildArgs) -runtimeflavor $(RuntimeFlavor)</BuildArgs>
+      <BuildArgs>$(BuildArgs) -runtimeflavor $(RuntimeFlavor) /p:OfficialBuildId=$(OfficialBuildId)</BuildArgs>
     </PropertyGroup>
 
     <!--
index edba5f1fbddb75ecd3064d26753eb0725cdf0fd1..8aa31fe43ecfaef9a87790b81d89ddee0c1276ca 100644 (file)
@@ -5,7 +5,7 @@
     <NativeVersionFile Condition="'$(TargetOS)' != 'windows'">$(ArtifactsObjDir)_version.c</NativeVersionFile>
     <TargetFramework>$(BuildTargetFramework)</TargetFramework>
     <TargetFramework Condition="'$(TargetFramework)' == ''">$(NetCoreAppCurrent)</TargetFramework>
-    <_BuildNativeArgs>$(TargetArchitecture) $(Configuration) outconfig $(TargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) -os $(TargetOS)</_BuildNativeArgs>
+    <_BuildNativeArgs>$(TargetArchitecture) $(Configuration) outconfig $(TargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) -os $(TargetOS) /p:OfficialBuildId=$(OfficialBuildId)</_BuildNativeArgs>
   </PropertyGroup>
 
   <ItemGroup>