Fix runtime.json to include all platforms in the redirection package. Also update...

diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
index c916191a1e2a89de7886b5b48957aa7b3d05df7c..23d09af1afc1e634ed6b0070587677c28f5fd8d1 100644 (file)
--- 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 c0d9f6fe6b5f0e8b0b0188ddb97455089997bd43..110eabff47f1097c1d47e54b7d2ee69c311c17ff 100644 (file)
--- 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>