From: Elinor Fung <47805090+elinor-fung@users.noreply.github.com>
Date: Thu, 23 May 2019 17:51:19 +0000 (-0700)
Subject: Fix missing version numbers in packaged files and getting IBC merge version in offici...
X-Git-Tag: accepted/tizen/unified/20190813.215958~42^2~104
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3af71a7e68fb1d279b18d332db6cd3ee7a824295;p=platform%2Fupstream%2Fcoreclr.git
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
---
diff --git a/build.cmd b/build.cmd
index 3b1ff66..b06c369 100644
--- a/build.cmd
+++ b/build.cmd
@@ -646,7 +646,7 @@ if %__BuildCoreLib% EQU 1 (
if %__IbcOptimize% EQU 1 (
echo %__MsgPrefix%Commencing IBCMerge of System.Private.CoreLib for %__BuildOS%.%__BuildArch%.%__BuildType%
set IbcMergeProjectFilePath=%__ProjectDir%\src\.nuget\optdata\ibcmerge.csproj
- for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "!IbcMergeProjectFilePath!" /t:DumpIbcMergePackageVersion /p:ArcadeBuild=true /nologo') do @(
+ for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "!IbcMergeProjectFilePath!" /t:DumpIbcMergePackageVersion /p:ArcadeBuild^=true /nologo') do @(
set __IbcMergeVersion=%%s
)
diff --git a/dir.common.props b/dir.common.props
index 106331e..70382d6 100644
--- a/dir.common.props
+++ b/dir.common.props
@@ -16,15 +16,6 @@
$(PackagesDir)
-
-
- 4
- 6
-
-
$(__BuildArch)
@@ -72,6 +63,18 @@
$(BinDir).nuget\
+
+
+ 4
+ 6
+
+
+ $(RootBinDir)obj\BuildVersion-$(OfficialBuildId).props
+
+
3.0.0
diff --git a/dir.props b/dir.props
index ad0cb76..e93c9f5 100644
--- a/dir.props
+++ b/dir.props
@@ -69,11 +69,6 @@
$(BinDir)
-
-
- $(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props
-
-