Merge pull request #147 from Microsoft/master

Merge master into dxil-v1.0

README.md

@@ -1,4 +1,4 @@
-# DirectX Shader Compiler
+# DirectX Shader Compiler
 
 [![Build status](https://ci.appveyor.com/api/projects/status/2wsw8t8clpgt1kfm?svg=true)](https://ci.appveyor.com/project/dmpots/directxshadercompiler)
 
@@ -28,7 +28,7 @@ Before you build, you will need to have some additional software installed.
 
 * [Git](http://git-scm.com/downloads).
 * [Visual Studio 2015](https://www.visualstudio.com/downloads), Update 3. This will install the Windows Development Kit. In the install options, make sure the following options are checked:
-    * Windows 10 SDK (10.0.10240.0)
+    * Windows 10 SDK (version 14393)
     * Common Tools for Visual C++ 2015
 * [Windows 10 SDK](https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk). This is needed to build tests that reference the D3D12 runtime. You may get this as part of installing/updating Visual Studio.
 * [Windows Driver Kit](https://developer.microsoft.com/en-us/windows/hardware/windows-driver-kit). No need to download and install tests. This is used to build and run tests.

ThirdPartyNotices.txt

@@ -1,3 +1,15 @@
+Microsoft/DirectXShaderCompiler
+
+THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
+
+Do Not Translate or Localize
+
+This project incorporates components from the projects listed below. The
+original copyright notices and the licenses under which Microsoft received
+such components are set forth below. Microsoft reserves all rights not
+expressly granted herein, whether by implication, estoppel or otherwise.
+
+
 * LLVM
 
 ==============================================================================

utils/hct/hctstart.cmd

@@ -178,21 +178,20 @@ if not exist "%kit_root%" (
   echo Windows 10 SDK was installed but is not accessible.
   exit /b 1
 )
-rem SDK version 10586 and 14393 will also work properly, but we use 10240 as
-rem canonical for now.
-if exist "%kit_root%\include\10.0.10586.0\um\d3d12.h" (
-  goto :eof
-)
+rem 10.0.14393.0 will work properly. Reject 10586 and 10240 explicitly.
 if exist "%kit_root%\include\10.0.14393.0\um\d3d12.h" (
+  echo Found Windows SDK 10.0.14393.0
   goto :eof
 )
-if not exist  "%kit_root%\include\10.0.10240.0\um\d3d12.h" (
-  echo Unable to find include files for Windows 10 SDK 10.0.10240.0.
-  echo   file "%kit_root%\include\10.0.10240.0\um\d3d12.h" does not exist
-  echo Please see the README.md instructions in the project root.
-  exit /b 1
+if exist "%kit_root%\include\10.0.10586.0\um\d3d12.h" (
+  echo Found Windows SDK 10.0.10586.0 - no longer supported.
 )
-goto :eof
+if exist  "%kit_root%\include\10.0.10240.0\um\d3d12.h" (
+  echo Found Windows SDK 10.0.10240.0 - no longer supported.
+)
+echo Unable to find a suitable SDK version under %kit_root%\include
+echo Please see the README.md instructions in the project root.
+exit /b 1
 endlocal
 
 :checkcmake