Skip to content

Commit 2a222c1

Browse files
walbournwalbourn
committed
VS 2017 and Windows 10 Creators Update SDK (15063)
1 parent 7cb7fc9 commit 2a222c1

File tree

182 files changed

+11603
-16209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+11603
-16209
lines changed

‎Kits/DirectXTK/Audio/AudioEngine.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,10 @@ X3DAUDIO_HANDLE& AudioEngine::Get3DHandle() const
15501550
#include <wrl.h>
15511551
#elif (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
15521552
#pragma comment(lib,"runtimeobject.lib")
1553+
#pragma warning(push)
1554+
#pragma warning(disable: 4471)
15531555
#include <Windows.Devices.Enumeration.h>
1556+
#pragma warning(pop)
15541557
#include <wrl.h>
15551558
#endif
15561559

‎Kits/DirectXTK/DirectXTK_Windows10.vcxproj‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -418,40 +418,40 @@
418418
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
419419
<AppContainerApplication>true</AppContainerApplication>
420420
<ApplicationType>Windows Store</ApplicationType>
421-
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
422-
<WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
421+
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
422+
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
423423
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
424424
</PropertyGroup>
425425
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
426426
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
427427
<ConfigurationType>StaticLibrary</ConfigurationType>
428428
<UseDebugLibraries>true</UseDebugLibraries>
429-
<PlatformToolset>v140</PlatformToolset>
429+
<PlatformToolset>v141</PlatformToolset>
430430
</PropertyGroup>
431431
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
432432
<ConfigurationType>StaticLibrary</ConfigurationType>
433433
<UseDebugLibraries>true</UseDebugLibraries>
434-
<PlatformToolset>v140</PlatformToolset>
434+
<PlatformToolset>v141</PlatformToolset>
435435
</PropertyGroup>
436436
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
437437
<ConfigurationType>StaticLibrary</ConfigurationType>
438438
<UseDebugLibraries>true</UseDebugLibraries>
439-
<PlatformToolset>v140</PlatformToolset>
439+
<PlatformToolset>v141</PlatformToolset>
440440
</PropertyGroup>
441441
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
442442
<ConfigurationType>StaticLibrary</ConfigurationType>
443443
<UseDebugLibraries>false</UseDebugLibraries>
444-
<PlatformToolset>v140</PlatformToolset>
444+
<PlatformToolset>v141</PlatformToolset>
445445
</PropertyGroup>
446446
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
447447
<ConfigurationType>StaticLibrary</ConfigurationType>
448448
<UseDebugLibraries>false</UseDebugLibraries>
449-
<PlatformToolset>v140</PlatformToolset>
449+
<PlatformToolset>v141</PlatformToolset>
450450
</PropertyGroup>
451451
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
452452
<ConfigurationType>StaticLibrary</ConfigurationType>
453453
<UseDebugLibraries>false</UseDebugLibraries>
454-
<PlatformToolset>v140</PlatformToolset>
454+
<PlatformToolset>v141</PlatformToolset>
455455
</PropertyGroup>
456456
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
457457
<ImportGroup Label="ExtensionSettings">
@@ -525,6 +525,7 @@
525525
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
526526
<WarningLevel>Level4</WarningLevel>
527527
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
528+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
528529
</ClCompile>
529530
<Link>
530531
<SubSystem>Console</SubSystem>
@@ -546,6 +547,7 @@
546547
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
547548
<WarningLevel>Level4</WarningLevel>
548549
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
550+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
549551
</ClCompile>
550552
<Link>
551553
<SubSystem>Console</SubSystem>
@@ -566,6 +568,7 @@
566568
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
567569
<WarningLevel>Level4</WarningLevel>
568570
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
571+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
569572
</ClCompile>
570573
<Link>
571574
<SubSystem>Console</SubSystem>
@@ -586,6 +589,7 @@
586589
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
587590
<WarningLevel>Level4</WarningLevel>
588591
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
592+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
589593
</ClCompile>
590594
<Link>
591595
<SubSystem>Console</SubSystem>
@@ -606,6 +610,7 @@
606610
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
607611
<WarningLevel>Level4</WarningLevel>
608612
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
613+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
609614
</ClCompile>
610615
<Link>
611616
<SubSystem>Console</SubSystem>
@@ -626,6 +631,7 @@
626631
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
627632
<WarningLevel>Level4</WarningLevel>
628633
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
634+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
629635
</ClCompile>
630636
<Link>
631637
<SubSystem>Console</SubSystem>
@@ -640,8 +646,6 @@
640646
<ImportGroup Label="ExtensionTargets">
641647
</ImportGroup>
642648
<Target Name="ATGEnsureShaders" BeforeTargets="PrepareForBuild">
643-
<Exec Condition="!Exists('src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')"
644-
WorkingDirectory="$(ProjectDir)src/Shaders"
645-
Command="CompileShaders" />
649+
<Exec Condition="!Exists('src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')" WorkingDirectory="$(ProjectDir)src/Shaders" Command="CompileShaders" />
646650
</Target>
647651
</Project>

‎Kits/DirectXTK/Readme.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 11
44

55
Copyright (c) Microsoft Corporation. All rights reserved.
66

7-
February 10, 2017
7+
April 7, 2017
88

99
This package contains the "DirectX Tool Kit", a collection of helper classes for
1010
writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10,
@@ -79,6 +79,10 @@ https://opensource.microsoft.com/codeofconduct/
7979
RELEASE HISTORY
8080
---------------
8181

82+
April 7, 2017
83+
VS 2017 updated for Windows Creators Update SDK (15063)
84+
XboxDDSTextureLoader updates
85+
8286
February 10, 2017
8387
GamePad now supports special value of -1 for 'most recently connected controller'
8488
WIC format 40bppCMYKAlpha should be converted to RGBA8 rather than RGBA16

‎Kits/DirectXTK/Src/pch.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@
3939
#endif
4040

4141
#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
42+
#pragma warning(push)
43+
#pragma warning(disable: 4471)
4244
#include <Windows.UI.Core.h>
45+
#pragma warning(pop)
4346
#endif
4447

4548
#include <DirectXMath.h>

‎Kits/DirectXTK12/Audio/AudioEngine.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,10 @@ X3DAUDIO_HANDLE& AudioEngine::Get3DHandle() const
15501550
#include <wrl.h>
15511551
#elif (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
15521552
#pragma comment(lib,"runtimeobject.lib")
1553+
#pragma warning(push)
1554+
#pragma warning(disable: 4471)
15531555
#include <Windows.Devices.Enumeration.h>
1556+
#pragma warning(pop)
15541557
#include <wrl.h>
15551558
#endif
15561559

‎Kits/DirectXTK12/DirectXTK_Windows10.vcxproj‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -350,40 +350,40 @@
350350
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
351351
<AppContainerApplication>true</AppContainerApplication>
352352
<ApplicationType>Windows Store</ApplicationType>
353-
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
354-
<WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
353+
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
354+
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
355355
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
356356
</PropertyGroup>
357357
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
358358
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
359359
<ConfigurationType>StaticLibrary</ConfigurationType>
360360
<UseDebugLibraries>true</UseDebugLibraries>
361-
<PlatformToolset>v140</PlatformToolset>
361+
<PlatformToolset>v141</PlatformToolset>
362362
</PropertyGroup>
363363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
364364
<ConfigurationType>StaticLibrary</ConfigurationType>
365365
<UseDebugLibraries>true</UseDebugLibraries>
366-
<PlatformToolset>v140</PlatformToolset>
366+
<PlatformToolset>v141</PlatformToolset>
367367
</PropertyGroup>
368368
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
369369
<ConfigurationType>StaticLibrary</ConfigurationType>
370370
<UseDebugLibraries>true</UseDebugLibraries>
371-
<PlatformToolset>v140</PlatformToolset>
371+
<PlatformToolset>v141</PlatformToolset>
372372
</PropertyGroup>
373373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
374374
<ConfigurationType>StaticLibrary</ConfigurationType>
375375
<UseDebugLibraries>false</UseDebugLibraries>
376-
<PlatformToolset>v140</PlatformToolset>
376+
<PlatformToolset>v141</PlatformToolset>
377377
</PropertyGroup>
378378
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
379379
<ConfigurationType>StaticLibrary</ConfigurationType>
380380
<UseDebugLibraries>false</UseDebugLibraries>
381-
<PlatformToolset>v140</PlatformToolset>
381+
<PlatformToolset>v141</PlatformToolset>
382382
</PropertyGroup>
383383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
384384
<ConfigurationType>StaticLibrary</ConfigurationType>
385385
<UseDebugLibraries>false</UseDebugLibraries>
386-
<PlatformToolset>v140</PlatformToolset>
386+
<PlatformToolset>v141</PlatformToolset>
387387
</PropertyGroup>
388388
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
389389
<ImportGroup Label="ExtensionSettings">
@@ -457,6 +457,7 @@
457457
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
458458
<WarningLevel>Level4</WarningLevel>
459459
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
460+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
460461
</ClCompile>
461462
<Link>
462463
<SubSystem>Console</SubSystem>
@@ -478,6 +479,7 @@
478479
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
479480
<WarningLevel>Level4</WarningLevel>
480481
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
482+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
481483
</ClCompile>
482484
<Link>
483485
<SubSystem>Console</SubSystem>
@@ -498,6 +500,7 @@
498500
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
499501
<WarningLevel>Level4</WarningLevel>
500502
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
503+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
501504
</ClCompile>
502505
<Link>
503506
<SubSystem>Console</SubSystem>
@@ -518,6 +521,7 @@
518521
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
519522
<WarningLevel>Level4</WarningLevel>
520523
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
524+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
521525
</ClCompile>
522526
<Link>
523527
<SubSystem>Console</SubSystem>
@@ -538,6 +542,7 @@
538542
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
539543
<WarningLevel>Level4</WarningLevel>
540544
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
545+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
541546
</ClCompile>
542547
<Link>
543548
<SubSystem>Console</SubSystem>
@@ -558,6 +563,7 @@
558563
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
559564
<WarningLevel>Level4</WarningLevel>
560565
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
566+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
561567
</ClCompile>
562568
<Link>
563569
<SubSystem>Console</SubSystem>
@@ -572,8 +578,6 @@
572578
<ImportGroup Label="ExtensionTargets">
573579
</ImportGroup>
574580
<Target Name="ATGEnsureShaders" BeforeTargets="PrepareForBuild">
575-
<Exec Condition="!Exists('src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')"
576-
WorkingDirectory="$(ProjectDir)src/Shaders"
577-
Command="CompileShaders" />
581+
<Exec Condition="!Exists('src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')" WorkingDirectory="$(ProjectDir)src/Shaders" Command="CompileShaders" />
578582
</Target>
579583
</Project>

‎Kits/DirectXTK12/Readme.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 12
44

55
Copyright (c) Microsoft Corporation. All rights reserved.
66

7-
February 10, 2017
7+
April 7, 2017
88

99
This package contains the "DirectX Tool Kit", a collection of helper classes for
1010
writing Direct3D 12 C++ code for Universal Windows Platform (UWP) apps, Win32 desktop
@@ -95,6 +95,10 @@ COMPARISONS TO DIRECTX 11 VERSION
9595
RELEASE HISTORY
9696
---------------
9797

98+
April 7, 2017
99+
VS 2017 updated for Windows Creators Update SDK (15063)
100+
XboxDDSTextureLoader updates
101+
98102
February 10, 2017
99103
SpriteBatch default rasterizer state now matches DirectX 11 version
100104
DDSTextureLoader now supports loading planar video format textures

‎Kits/DirectXTK12/Src/GamePad.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ namespace
8282
// Windows::Gaming::Input (Windows 10)
8383
//======================================================================================
8484

85+
#pragma warning(push)
86+
#pragma warning(disable : 4471)
8587
#include <Windows.Gaming.Input.h>
88+
#pragma warning(pop)
8689

8790
class GamePad::Impl
8891
{

‎Kits/DirectXTK12/Src/pch.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@
4848
#endif
4949

5050
#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
51+
#pragma warning(push)
52+
#pragma warning(disable : 4471)
5153
#include <Windows.UI.Core.h>
54+
#pragma warning(pop)
5255
#endif
5356

5457
#include <DirectXMath.h>

‎Media/Sounds/ChannelIDs714.wav‎

15.7 MB
Binary file not shown.

0 commit comments

Comments
 (0)