File tree Expand file tree Collapse file tree 2 files changed +7
-8
lines changed Expand file tree Collapse file tree 2 files changed +7
-8
lines changed Original file line number Diff line number Diff line change
1
+ Fixes Windows SDK version detection when building for Windows.
Original file line number Diff line number Diff line change 72
72
possible version). Since we limit WINVER to Windows 7 anyway, it doesn't really
73
73
matter which WinSDK version we use.
74
74
-->
75
- <DefaultWindowsSDKVersion Condition =" $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) >= '10.0.15063'" >10.0.15063.0</DefaultWindowsSDKVersion >
76
- <DefaultWindowsSDKVersion Condition =" $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) >= '10.0.15063'" >10.0.15063.0</DefaultWindowsSDKVersion >
77
- <DefaultWindowsSDKVersion Condition =" $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.14393'" >10.0.14393.0</DefaultWindowsSDKVersion >
78
- <DefaultWindowsSDKVersion Condition =" $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.14393'" >10.0.14393.0</DefaultWindowsSDKVersion >
79
- <DefaultWindowsSDKVersion Condition =" $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10586'" >10.0.10586.0</DefaultWindowsSDKVersion >
80
- <DefaultWindowsSDKVersion Condition =" $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10586'" >10.0.10586.0</DefaultWindowsSDKVersion >
81
- <DefaultWindowsSDKVersion Condition =" $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10240'" >10.0.10240.0</DefaultWindowsSDKVersion >
82
- <DefaultWindowsSDKVersion Condition =" $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10240'" >10.0.10240.0</DefaultWindowsSDKVersion >
75
+ <_RegistryVersion >$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</_RegistryVersion >
76
+ <_RegistryVersion Condition =" $(_RegistryVersion) == ''" >$(Registry:HKEY_LOCAL_MACHINE\WOW6432Node\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</_RegistryVersion >
77
+ <DefaultWindowsSDKVersion >10.0.15063.0</DefaultWindowsSDKVersion >
78
+ <DefaultWindowsSDKVersion Condition =" $(_RegistryVersion) == '10.0.14393'" >10.0.14393.0</DefaultWindowsSDKVersion >
79
+ <DefaultWindowsSDKVersion Condition =" $(_RegistryVersion) == '10.0.10586'" >10.0.10586.0</DefaultWindowsSDKVersion >
80
+ <DefaultWindowsSDKVersion Condition =" $(_RegistryVersion) == '10.0.10240'" >10.0.10240.0</DefaultWindowsSDKVersion >
83
81
</PropertyGroup >
84
82
85
83
<PropertyGroup Condition =" '$(OverrideVersion)' == ''" >
You can’t perform that action at this time.
0 commit comments