From d2050f5a5b1fe942d8cd1e9fb188269309e98f4e Mon Sep 17 00:00:00 2001
From: moozzyk <pawelka@microsoft.com>
Date: Mon, 14 Dec 2015 13:45:31 -0800
Subject: [PATCH] Changing the folder of ARM version of libuv to win7-arm

Required to fix: https://github.com/aspnet/Home/issues/1111
---
 makefile.shade                     | 2 +-
 src/libuv/Config.Definitions.Props | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/makefile.shade b/makefile.shade
index 73bf2f4..637d26b 100644
--- a/makefile.shade
+++ b/makefile.shade
@@ -39,7 +39,7 @@ var FULL_VERSION = '${PRODUCT_VERSION + "-" + E("DNX_BUILD_VERSION")}'
 #nuget-pack target='package' if='CanBuildForWindows'
     copy sourceDir='${Path.Combine(ROOT, "src\\libuv\\bin\\Win32", Configuration2)}' outputDir='${Path.Combine(BUILD_DIR2, "package-src-win\\runtimes\\win7-x86\\native")}' include='*.dll' overwrite='${true}'
     copy sourceDir='${Path.Combine(ROOT, "src\\libuv\\bin\\x64", Configuration2)}' outputDir='${Path.Combine(BUILD_DIR2, "package-src-win\\runtimes\\win7-x64\\native")}' include='*.dll' overwrite='${true}'
-    copy sourceDir='${Path.Combine(ROOT, "src\\libuv\\bin\\ARM", Configuration2)}' outputDir='${Path.Combine(BUILD_DIR2, "package-src-win\\runtimes\\win10-arm\\native")}' include='*.dll' overwrite='${true}'
+    copy sourceDir='${Path.Combine(ROOT, "src\\libuv\\bin\\ARM", Configuration2)}' outputDir='${Path.Combine(BUILD_DIR2, "package-src-win\\runtimes\\win7-arm\\native")}' include='*.dll' overwrite='${true}'
     copy sourceDir='${Path.Combine(ROOT, "build")}' outputDir='${Path.Combine(BUILD_DIR2, "package-src-win")}' include='*' overwrite='${true}'
     nuget-pack packageVersion='${FULL_VERSION}' outputDir='${BUILD_DIR2}' extra='-NoPackageAnalysis -Properties TargetOS=Windows' nugetPath='.nuget/nuget.exe' nuspecFile='${Path.Combine(BUILD_DIR2, "package-src-win\\libuv.nuspec")}'
 
diff --git a/src/libuv/Config.Definitions.Props b/src/libuv/Config.Definitions.Props
index ebeddbb..c5dba35 100644
--- a/src/libuv/Config.Definitions.Props
+++ b/src/libuv/Config.Definitions.Props
@@ -28,6 +28,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Enables building using Win10 SDK (One Core, ARM) on non-Win10 OS'es -->
-    <WindowsTargetPlatformVersion Condition="'$(BuildForOneCore)' == 'True' Or '$(Platform)'=='ARM'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0', 'ProductVersion', null, RegistryView.Registry64, RegistryView.Registry32)).0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(BuildForOneCore)' == 'True' Or '$(Platform)'=='ARM'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0', 'ProductVersion', null, RegistryView.Registry64, RegistryView.Registry32))</WindowsTargetPlatformVersion>
+    <!-- The Win10 SDK versions before 10.0.10586.0 had only 3 parts (e.g. 10.0.10240) so `.0` needs to be appended  -->
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' != '' And '$(WindowsTargetPlatformVersion.Split(&quot;.&quot;).Length)' == '3'">$(WindowsTargetPlatformVersion).0</WindowsTargetPlatformVersion>
   </PropertyGroup>
 </Project>