summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaurav Khanna <gkhanna@microsoft.com>2016-03-15 13:51:57 -0700
committerGaurav Khanna <gkhanna@microsoft.com>2016-03-15 13:51:57 -0700
commiteb98ab1e77b76834c10a0589bf3d0c3e99750c62 (patch)
tree27a83dadc8636f5c1a25ddef56311b5b9d515fe8
parentfd05aabce3f1191b485dbc00dd388219a1d400d2 (diff)
downloadcoreclr-eb98ab1e77b76834c10a0589bf3d0c3e99750c62.tar.gz
coreclr-eb98ab1e77b76834c10a0589bf3d0c3e99750c62.tar.bz2
coreclr-eb98ab1e77b76834c10a0589bf3d0c3e99750c62.zip
Fix runtime.json to include all platforms in the redirection package. Also update the CLI build version (taken from CoreFX).
-rw-r--r--DotnetCLIVersion.txt2
-rw-r--r--dir.props2
2 files changed, 2 insertions, 2 deletions
diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
index c916191a1e..23d09af1af 100644
--- a/DotnetCLIVersion.txt
+++ b/DotnetCLIVersion.txt
@@ -1 +1 @@
-1.0.0.001504 \ No newline at end of file
+1.0.0.001718 \ No newline at end of file
diff --git a/dir.props b/dir.props
index c0d9f6fe6b..110eabff47 100644
--- a/dir.props
+++ b/dir.props
@@ -161,7 +161,7 @@
<PackagingTaskDir Condition="'$(TargetsWindows)' == 'true'">$(ToolsDir)net45/</PackagingTaskDir>
<BuildNumberMajor Condition="'$(BuildNumberMajor)' == ''">00001</BuildNumberMajor>
<!-- defined in buildtools packaging.targets, but we need this before targets are imported -->
- <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(BuildArch)</PackagePlatform>
+ <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform>
<PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform>
<PackageOutputPath>$(PackagesBinDir)/pkg/</PackageOutputPath>
</PropertyGroup>