Skip to content

Commit 3b0f97e

Browse files
walbournwalbourn
authored
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``
1 parent 65ea76d commit 3b0f97e

File tree

89 files changed

+113
-84
lines changed

Some content is hidden

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

89 files changed

+113
-84
lines changed

‎Kits/DirectXTK/DirectXTK_Windows10.vcxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@
475475
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
476476
<AppContainerApplication>true</AppContainerApplication>
477477
<ApplicationType>Windows Store</ApplicationType>
478-
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
478+
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
479479
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
480480
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
481481
</PropertyGroup>
@@ -582,7 +582,7 @@
582582
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
583583
<WarningLevel>EnableAllWarnings</WarningLevel>
584584
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
585-
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
585+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
586586
</ClCompile>
587587
<Link>
588588
<SubSystem>Console</SubSystem>
@@ -601,7 +601,7 @@
601601
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
602602
<WarningLevel>EnableAllWarnings</WarningLevel>
603603
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
604-
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
604+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
605605
</ClCompile>
606606
<Link>
607607
<SubSystem>Console</SubSystem>
@@ -619,7 +619,7 @@
619619
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
620620
<WarningLevel>EnableAllWarnings</WarningLevel>
621621
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
622-
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
622+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
623623
</ClCompile>
624624
<Link>
625625
<SubSystem>Console</SubSystem>
@@ -637,7 +637,7 @@
637637
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
638638
<WarningLevel>EnableAllWarnings</WarningLevel>
639639
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
640-
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
640+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
641641
</ClCompile>
642642
<Link>
643643
<SubSystem>Console</SubSystem>
@@ -655,7 +655,7 @@
655655
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
656656
<WarningLevel>EnableAllWarnings</WarningLevel>
657657
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
658-
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
658+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
659659
</ClCompile>
660660
<Link>
661661
<SubSystem>Console</SubSystem>
@@ -673,7 +673,7 @@
673673
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
674674
<WarningLevel>EnableAllWarnings</WarningLevel>
675675
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
676-
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
676+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
677677
</ClCompile>
678678
<Link>
679679
<SubSystem>Console</SubSystem>

‎Kits/DirectXTK/Readme.txt‎

Lines changed: 15 additions & 2 deletions
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-
September 22, 2017
7+
November 1, 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,
@@ -15,7 +15,7 @@ Windows Vista Service Pack 2 Direct3D 11.0 applications.
1515
This code is designed to build with Visual Studio 2013 Update 5, Visual Studio 2015 Update 3,
1616
or Visual Studio 2017. It is recommended that you make use of VS 2015 Update 3, Windows Tools
1717
1.4.1, and the Windows 10 Anniversary Update SDK (14393) or VS 2017 with the Windows 10
18-
Creators Update SDK (15063).
18+
Fall Creators Update SDK (16299).
1919

2020
These components are designed to work without requiring any content from the DirectX SDK. For details,
2121
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 [email protected] with any additional questi
7878
https://opensource.microsoft.com/codeofconduct/
7979

8080

81+
-------------
82+
RELEASE NOTES
83+
-------------
84+
85+
* The VS 2017 projects make use of /permissive- for improved C++ standard conformance. Use of a Windows 10 SDK prior to
86+
the Fall Creators Update (16299) or an Xbox One XDK prior to June 2017 QFE 4 may result in failures due to problems
87+
with the system headers. You can work around these by deleting /permissive- from the project files which is found
88+
in the <AdditionalOptions> element.
89+
90+
8191
---------------
8292
RELEASE HISTORY
8393
---------------
8494

95+
November 1, 2017
96+
VS 2017 updated for Windows 10 Fall Creators Update SDK (16299)
97+
8598
September 22, 2017
8699
Updated for VS 2017 15.3 update /permissive- changes
87100
ScreenGrab updated to use non-sRGB metadata for PNG

‎Kits/DirectXTK12/DirectXTK_Windows10.vcxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@
419419
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
420420
<AppContainerApplication>true</AppContainerApplication>
421421
<ApplicationType>Windows Store</ApplicationType>
422-
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
422+
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
423423
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
424424
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
425425
</PropertyGroup>
@@ -526,7 +526,7 @@
526526
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
527527
<WarningLevel>EnableAllWarnings</WarningLevel>
528528
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
529-
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
529+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
530530
</ClCompile>
531531
<Link>
532532
<SubSystem>Console</SubSystem>
@@ -545,7 +545,7 @@
545545
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
546546
<WarningLevel>EnableAllWarnings</WarningLevel>
547547
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
548-
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
548+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
549549
</ClCompile>
550550
<Link>
551551
<SubSystem>Console</SubSystem>
@@ -563,7 +563,7 @@
563563
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
564564
<WarningLevel>EnableAllWarnings</WarningLevel>
565565
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
566-
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
566+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
567567
</ClCompile>
568568
<Link>
569569
<SubSystem>Console</SubSystem>
@@ -581,7 +581,7 @@
581581
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
582582
<WarningLevel>EnableAllWarnings</WarningLevel>
583583
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
584-
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
584+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
585585
</ClCompile>
586586
<Link>
587587
<SubSystem>Console</SubSystem>
@@ -599,7 +599,7 @@
599599
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
600600
<WarningLevel>EnableAllWarnings</WarningLevel>
601601
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
602-
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
602+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
603603
</ClCompile>
604604
<Link>
605605
<SubSystem>Console</SubSystem>
@@ -617,7 +617,7 @@
617617
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
618618
<WarningLevel>EnableAllWarnings</WarningLevel>
619619
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
620-
<AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
620+
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
621621
</ClCompile>
622622
<Link>
623623
<SubSystem>Console</SubSystem>

‎Kits/DirectXTK12/Readme.txt‎

Lines changed: 16 additions & 2 deletions
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-
September 22, 2017
7+
November 1, 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
@@ -13,7 +13,7 @@ applications for Windows 10, and Xbox One exclusive apps.
1313
This code is designed to build with Visual Studio 2015 Update 3 or Visual Studio 2017.
1414
It is recommended that you make use of VS 2015 Update 3, Windows Tools 1.4.1, and the
1515
Windows 10 Anniversary Update SDK (14393) or VS 2017 with the Windows 10
16-
Creators Update SDK (15063).
16+
Fall Creators Update SDK (16299).
1717

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

9696

97+
-------------
98+
RELEASE NOTES
99+
-------------
100+
101+
* The VS 2017 projects make use of /permissive- for improved C++ standard conformance. Use of a Windows 10 SDK prior to
102+
the Fall Creators Update (16299) or an Xbox One XDK prior to June 2017 QFE 4 may result in failures due to problems
103+
with the system headers. You can work around these by deleting /permissive- from the project files which is found
104+
in the <AdditionalOptions> element.
105+
106+
97107
---------------
98108
RELEASE HISTORY
99109
---------------
100110

111+
November 1, 2017
112+
VS 2017 updated for Windows 10 Fall Creators Update SDK (16299)
113+
Updated D3DX12 internal copy to latest version
114+
101115
September 22, 2017
102116
Updated for VS 2017 15.3 update /permissive- changes
103117
ScreenGrab updated to use non-sRGB metadata for PNG

‎Kits/DirectXTex/ReadMe.txt‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ DIRECTX TEXTURE LIBRARY (DirectXTex)
33

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

6-
September 22, 2017
6+
November 1, 2017
77

88
This package contains DirectXTex, a shared source library for reading and writing DDS
99
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
1313
readers and writers since these image file formats are commonly used for texture content
1414
processing pipelines, but are not currently supported by a built-in WIC codec.
1515

16-
The source is written for Visual Studio 2013 or 2015. It is recommended that you
17-
make use of VS 2013 Update 5 or VS 2015 Update 3 and Windows 7 Service Pack 1 or later.
16+
This code is designed to build with Visual Studio 2013 Update 5, Visual Studio 2015 Update 3,
17+
or Visual Studio 2017. It is recommended that you make use of VS 2015 Update 3, Windows Tools
18+
1.4.1, and the Windows 10 Anniversary Update SDK (14393) or VS 2017 with the Windows 10
19+
Fall Creators Update SDK (16299).
1820

1921
DirectXTex\
2022
This contains the DirectXTex library. This includes a full-featured DDS reader and writer
@@ -118,10 +120,18 @@ RELEASE NOTES
118120
* Loading of 96bpp floating-point TIFF files results in a corrupted image prior to Windows 8. This fix is available
119121
on Windows 7 SP1 with KB 2670838 installed.
120122

123+
* The VS 2017 projects make use of /permissive- for improved C++ standard conformance. Use of a Windows 10 SDK prior to
124+
the Fall Creators Update (16299) or an Xbox One XDK prior to June 2017 QFE 4 may result in failures due to problems
125+
with the system headers. You can work around these by deleting /permissive- from the project files which is found
126+
in the <AdditionalOptions> element.
127+
121128

122129
------------------------------------
123130
RELEASE HISTORY
124131

132+
November 1, 2017
133+
VS 2017 updated for Windows 10 Fall Creators Update SDK (16299)
134+
125135
September 22, 2017
126136
Updated for VS 2017 15.3 update /permissive- changes
127137
WIC writer and ScreenGrab updated to use non-sRGB metadata for PNG

‎README.md‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,8 @@ This repo contains game development samples written by the Microsoft Xbox Advanc
262262
# Requirements
263263

264264
## UWP apps
265-
* Windows 10 Creators Update (Build 15063)
266-
* Visual Studio 2017 with the *Universal Windows Platform development* workload, the *C++ Universal Windows Platform tools* component, *Windows 10 SDK (10.0.15063.0)*, and *Windows 10 SDK (10.0.14393.0)*.
267-
268-
Use of the Visual Studio 2017 update v15.3 is recommended.
269-
270-
> The *Windows 10 SDK (10.0.14393.0)* is required to support ``WindowsTargetPlatformMinVersion`` set the Windows 10 Anniversary Update in many of the samples that work on both versions of Windows 10.
265+
* Windows 10 Anniversary Update (Build 14393), Creators Update (Build 15063), or Fall Creators Update (Build 16299)
266+
* Visual Studio 2017 ([v15.4](https://blogs.msdn.microsoft.com/visualstudio/2017/10/10/visual-studio-2017-version-15-4-released/) update) with the *Universal Windows Platform development* workload, the *C++ Universal Windows Platform tools* component, and *Windows 10 SDK ([10.0.16299.0](https://blogs.msdn.microsoft.com/chuckw/2017/10/11/windows-10-fall-creators-update-sdk/))*.
271267

272268
## XDK apps
273269
* Xbox One Development Kit
@@ -283,7 +279,7 @@ Use of the Visual Studio 2017 update v15.3 is recommended.
283279

284280
When compiling and running a sample, the file name of the sample executable will be sent to Microsoft to help track sample usage. To opt-out of this data collection, you can remove the block of code in ``Main.cpp`` labeled _Sample Usage Telemetry_.
285281

286-
For more information about Microsoft’s privacy policies in general, see the [Microsoft Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement/).
282+
For more information about Microsoft's privacy policies in general, see the [Microsoft Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement/).
287283

288284
# Code of Conduct
289285

‎UWPSamples/Audio/AdvancedSpatialSoundsUWP/AdvancedSpatialSoundsUWP.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
3535
<AppContainerApplication>true</AppContainerApplication>
3636
<ApplicationType>Windows Store</ApplicationType>
37-
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
37+
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
3838
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
3939
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
4040
</PropertyGroup>

‎UWPSamples/Audio/AdvancedSpatialSoundsUWP/Readme.docx‎

-220 Bytes
Binary file not shown.

‎UWPSamples/Audio/SimplePlay3DSoundUWP/Readme.docx‎

2.33 KB
Binary file not shown.

‎UWPSamples/Audio/SimplePlay3DSoundUWP/SimplePlay3DSound.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
3535
<AppContainerApplication>true</AppContainerApplication>
3636
<ApplicationType>Windows Store</ApplicationType>
37-
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
37+
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
3838
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
3939
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
4040
</PropertyGroup>

0 commit comments

Comments
 (0)