Skip to content

Commit a1a8939

Browse files
authored
Merge pull request #1862 from mjcheetham/winsdk-loose
Enforce minimum Windows API set, and loosen SDK requirement checks
2 parents 347b73a + b14c5a2 commit a1a8939

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

Directory.Build.props

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@
3434
<OutDir>$(ProjectOutPath)bin\$(Platform)\$(Configuration)\</OutDir>
3535
<IntDir>$(ProjectOutPath)intermediate\$(Platform)\$(Configuration)\</IntDir>
3636
<GeneratedIncludePath>$(IntDir)include\</GeneratedIncludePath>
37+
<!--
38+
Make sure that we don't accidentally use Windows APIs only available after
39+
Windows 10 build 16299 (aka '1709', 'RS3', and 'Fall Creators Update').
40+
The minimum Windows version that includes the final design of the
41+
Projected File System (ProjFS) APIs was actually Windows 10 version 1809
42+
(build 17763), but VFS for Git also supports using the older design of the
43+
ProjFS APIs from that version.
44+
-->
45+
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
3746
</PropertyGroup>
3847

3948
</Project>

scripts/Build.bat

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ SET VSWHERE_VER=2.6.7
4646
"%NUGET_EXEC%" install vswhere -Version %VSWHERE_VER% -OutputDirectory %VFS_PACKAGESDIR% || exit /b 1
4747
SET VSWHERE_EXEC="%VFS_PACKAGESDIR%\vswhere.%VSWHERE_VER%\tools\vswhere.exe"
4848

49-
REM Assumes default installation location for Windows 10 SDKs
50-
IF NOT EXIST "C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0" (
51-
ECHO ERROR: Could not find Windows 10 SDK Version 16299
52-
EXIT /B 1
53-
)
54-
5549
REM Use vswhere to find the latest VS installation with the MSBuild component
5650
REM See https://github.com/Microsoft/vswhere/wiki/Find-MSBuild
5751
FOR /F "tokens=* USEBACKQ" %%F IN (`%VSWHERE_EXEC% -all -prerelease -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\amd64\MSBuild.exe`) DO (

0 commit comments

Comments
 (0)