diff --git a/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets b/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets
index 9e7aefb79fa..eb5eca55ccf 100644
--- a/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets
+++ b/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets
@@ -85,7 +85,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   <PropertyGroup>
     <TargetPlatformIdentifier Condition="'$(TargetPlatformIdentifier)' == ''">Windows</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == ''">7.0</TargetPlatformVersion>
-    <TargetPlatformSdkPath Condition=" '$(TargetPlatformIdentifier)' == 'Windows'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v$(TargetPlatformVersion)', InstallationFolder, null, RegistryView.Registry32, RegistryView.Default))</TargetPlatformSdkPath>
+    <TargetPlatformSdkPath Condition=" '$(TargetPlatformIdentifier)' == 'Windows' and '$(OS)' == 'Windows_NT'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v$(TargetPlatformVersion)', InstallationFolder, null, RegistryView.Registry32, RegistryView.Default))</TargetPlatformSdkPath>
     <TargetPlatformSdkPath Condition=" '$(TargetPlatformSdkPath)' == ''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformSDKLocation($(TargetPlatformIdentifier), $(TargetPlatformVersion)))</TargetPlatformSdkPath>
     <TargetPlatformSdkMetadataLocation Condition="'$(TargetPlatformSdkMetadataLocation)' == '' and Exists('$(TargetPlatformSdkPath)')">$(TargetPlatformSdkPath)Windows Metadata</TargetPlatformSdkMetadataLocation>
     <TargetPlatformSdkMetadataLocation Condition="Exists('$(TargetPlatformSdkPath)') and ('$(TargetPlatformSdkMetadataLocation)' == '' or !Exists('$(TargetPlatformSdkMetadataLocation)'))">$(TargetPlatformSdkPath)References\CommonConfiguration\Neutral</TargetPlatformSdkMetadataLocation>
diff --git a/src/XMakeTasks/Microsoft.NETFramework.props b/src/XMakeTasks/Microsoft.NETFramework.props
index fd676d4d89c..d33d74e017b 100644
--- a/src/XMakeTasks/Microsoft.NETFramework.props
+++ b/src/XMakeTasks/Microsoft.NETFramework.props
@@ -31,12 +31,12 @@ Copyright (C) Microsoft Corporation. All rights reserved.
    <Choose>
       <When Condition="'$(MSBuildAssemblyVersion)' == ''">
          <PropertyGroup>
-            <NetFrameworkPropsPath>$(MSBuildFrameworkToolsPath)\Microsoft.NetFramework.props</NetFrameworkPropsPath>
+            <NetFrameworkPropsPath>$(MSBuildFrameworkToolsPath)\Microsoft.NETFramework.props</NetFrameworkPropsPath>
          </PropertyGroup>
       </When>
       <Otherwise>
          <PropertyGroup>
-            <NetFrameworkPropsPath>$(MSBuildToolsPath)\Microsoft.NetFramework.CurrentVersion.props</NetFrameworkPropsPath>
+            <NetFrameworkPropsPath>$(MSBuildToolsPath)\Microsoft.NETFramework.CurrentVersion.props</NetFrameworkPropsPath>
          </PropertyGroup>
       </Otherwise>
    </Choose>
diff --git a/src/XMakeTasks/Microsoft.NETFramework.targets b/src/XMakeTasks/Microsoft.NETFramework.targets
index 08104b7ed95..83a06860838 100644
--- a/src/XMakeTasks/Microsoft.NETFramework.targets
+++ b/src/XMakeTasks/Microsoft.NETFramework.targets
@@ -31,12 +31,12 @@ Copyright (C) Microsoft Corporation. All rights reserved.
    <Choose>
       <When Condition="'$(MSBuildAssemblyVersion)' == ''">
          <PropertyGroup>
-            <NetFrameworkTargetsPath>$(MSBuildFrameworkToolsPath)\Microsoft.NetFramework.targets</NetFrameworkTargetsPath>
+            <NetFrameworkTargetsPath>$(MSBuildFrameworkToolsPath)\Microsoft.NETFramework.targets</NetFrameworkTargetsPath>
          </PropertyGroup>
       </When>
       <Otherwise>
          <PropertyGroup>
-            <NetFrameworkTargetsPath>$(MSBuildToolsPath)\Microsoft.NetFramework.CurrentVersion.targets</NetFrameworkTargetsPath>
+            <NetFrameworkTargetsPath>$(MSBuildToolsPath)\Microsoft.NETFramework.CurrentVersion.targets</NetFrameworkTargetsPath>
          </PropertyGroup>
       </Otherwise>
    </Choose>