Unverified Commit 3b0f97e3 authored by Chuck Walbourn's avatar Chuck Walbourn Committed by GitHub
Browse files

Update UWP samples to the Windows 10 Fall Creators Update SDK (16299) (#7) 

* Updated for Windows 10 Fall Creators Update SDK (16299)
* Removed workaround in ``SimpleMSAA_UWP``
parent 65ea76d2

Kits/DirectXTK/DirectXTK_Windows10.vcxproj

+7 −7
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ 
    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>

    <AppContainerApplication>true</AppContainerApplication>

    <ApplicationType>Windows Store</ApplicationType>

    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>

    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>

  </PropertyGroup>
@@ -582,7 +582,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -601,7 +601,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -619,7 +619,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -637,7 +637,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -655,7 +655,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -673,7 +673,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>

Kits/DirectXTK/Readme.txt

+15 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 11 


Copyright (c) Microsoft Corporation. All rights reserved.



September 22, 2017

November 1, 2017



This package contains the "DirectX Tool Kit", a collection of helper classes for 

writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10,
@@ -15,7 +15,7 @@ Windows Vista Service Pack 2 Direct3D 11.0 applications. 
This code is designed to build with Visual Studio 2013 Update 5, Visual Studio 2015 Update 3,

or Visual Studio 2017. It is recommended that you make use of VS 2015 Update 3, Windows Tools

1.4.1, and the Windows 10 Anniversary Update SDK (14393) or VS 2017 with the Windows 10

Creators Update SDK (15063).

Fall Creators Update SDK (16299).



These components are designed to work without requiring any content from the DirectX SDK. For details,

see "Where is the DirectX SDK?" <http://msdn.microsoft.com/en-us/library/ee663275.aspx>.
@@ -78,10 +78,23 @@ Code of Conduct FAQ or contact opencode@microsoft.com with any additional questi 
https://opensource.microsoft.com/codeofconduct/





-------------

RELEASE NOTES

-------------



* The VS 2017 projects make use of /permissive- for improved C++ standard conformance. Use of a Windows 10 SDK prior to

  the Fall Creators Update (16299) or an Xbox One XDK prior to June 2017 QFE 4 may result in failures due to problems

  with the system headers. You can work around these by deleting /permissive- from the project files which is found

  in the <AdditionalOptions> element.





---------------

RELEASE HISTORY

---------------



November 1, 2017

    VS 2017 updated for Windows 10 Fall Creators Update SDK (16299)



September 22, 2017

    Updated for VS 2017 15.3 update /permissive- changes

    ScreenGrab updated to use non-sRGB metadata for PNG

Kits/DirectXTK12/DirectXTK_Windows10.vcxproj

+7 −7
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ 
    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>

    <AppContainerApplication>true</AppContainerApplication>

    <ApplicationType>Windows Store</ApplicationType>

    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>

    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>

  </PropertyGroup>
@@ -526,7 +526,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -545,7 +545,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -563,7 +563,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -581,7 +581,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -599,7 +599,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -617,7 +617,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>

Kits/DirectXTK12/Readme.txt

+16 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 12 


Copyright (c) Microsoft Corporation. All rights reserved.



September 22, 2017

November 1, 2017



This package contains the "DirectX Tool Kit", a collection of helper classes for 

writing Direct3D 12 C++ code for Universal Windows Platform (UWP) apps, Win32 desktop
@@ -13,7 +13,7 @@ applications for Windows 10, and Xbox One exclusive apps. 
This code is designed to build with Visual Studio 2015 Update 3 or Visual Studio 2017.

It is recommended that you make use of VS 2015 Update 3, Windows Tools 1.4.1, and the

Windows 10 Anniversary Update SDK (14393) or VS 2017 with the Windows 10

Creators Update SDK (15063).

Fall Creators Update SDK (16299).



Inc\

    Public Header Files (in the DirectX C++ namespace):
@@ -94,10 +94,24 @@ COMPARISONS TO DIRECTX 11 VERSION 
  to the DirectX 11 version





-------------

RELEASE NOTES

-------------



* The VS 2017 projects make use of /permissive- for improved C++ standard conformance. Use of a Windows 10 SDK prior to

  the Fall Creators Update (16299) or an Xbox One XDK prior to June 2017 QFE 4 may result in failures due to problems

  with the system headers. You can work around these by deleting /permissive- from the project files which is found

  in the <AdditionalOptions> element.





---------------

RELEASE HISTORY

---------------



November 1, 2017

    VS 2017 updated for Windows 10 Fall Creators Update SDK (16299)

    Updated D3DX12 internal copy to latest version



September 22, 2017

    Updated for VS 2017 15.3 update /permissive- changes

    ScreenGrab updated to use non-sRGB metadata for PNG

Kits/DirectXTex/ReadMe.txt

+13 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ DIRECTX TEXTURE LIBRARY (DirectXTex) 


Copyright (c) Microsoft Corporation. All rights reserved.



September 22, 2017

November 1, 2017



This package contains DirectXTex, a shared source library for reading and writing DDS

files, and performing various texture content processing operations including
@@ -13,8 +13,10 @@ use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and 
readers and writers since these image file formats are commonly used for texture content

processing pipelines, but are not currently supported by a built-in WIC codec.



The source is written for Visual Studio 2013 or 2015. It is recommended that you

make use of VS 2013 Update 5 or VS 2015 Update 3 and Windows 7 Service Pack 1 or later.

This code is designed to build with Visual Studio 2013 Update 5, Visual Studio 2015 Update 3,

or Visual Studio 2017. It is recommended that you make use of VS 2015 Update 3, Windows Tools

1.4.1, and the Windows 10 Anniversary Update SDK (14393) or VS 2017 with the Windows 10

Fall Creators Update SDK (16299).



DirectXTex\

    This contains the DirectXTex library. This includes a full-featured DDS reader and writer
@@ -118,10 +120,18 @@ RELEASE NOTES 
* Loading of 96bpp floating-point TIFF files results in a corrupted image prior to Windows 8. This fix is available

  on Windows 7 SP1 with KB 2670838 installed.



* The VS 2017 projects make use of /permissive- for improved C++ standard conformance. Use of a Windows 10 SDK prior to

  the Fall Creators Update (16299) or an Xbox One XDK prior to June 2017 QFE 4 may result in failures due to problems

  with the system headers. You can work around these by deleting /permissive- from the project files which is found

  in the <AdditionalOptions> element.





------------------------------------

RELEASE HISTORY



November 1, 2017

    VS 2017 updated for Windows 10 Fall Creators Update SDK (16299)



September 22, 2017

    Updated for VS 2017 15.3 update /permissive- changes

    WIC writer and ScreenGrab updated to use non-sRGB metadata for PNG