Skip to content

Commit 3645eaa

Browse files
tgauthtgauth
authored
Build tools version updates (#677)
* bump platform toolset to v143 * add updated proj files for testing * add _CRT_DECLARE_NONSTDC_NAMES=0 to projects with posix functions * revert onecore changes * fix typo * use latest sdk in build script * update build toolset in config proj * update build script to use latest toolsets * update paths.targets * update to win11 sdk in paths.targets * make build script more robust with VSwhere * change validity check from count check to null-check * remove static keyword from auth_debug declaration * change to ifndef for diff checking * update string compare * change msbuild tool search from manual check instead of using vswhere * update wixproj to work with wix install on new build image * update 2022 build image and zlib version
1 parent ad45b5c commit 3645eaa

31 files changed

+451
-447
lines changed

‎.azdo/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ stages:
2626
pool:
2727
name: PS-PowerShell-x64
2828
demands:
29-
- ImageOverride -equals PSMMS2019-OpenSSH-Secure
29+
- ImageOverride -equals PSMMS2022-OpenSSH-Secure
3030

3131
steps:
3232
- powershell: |

‎auth.c‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,14 @@ extern struct passwd *privsep_pw;
9292
extern struct sshauthopt *auth_opts;
9393

9494
/* Debugging messages */
95-
static struct sshbuf *auth_debug;
95+
#ifndef WINDOWS
96+
static struct sshbuf *auth_debug;
97+
#else
98+
/* removing static declaration due to access
99+
violation thrown when compiling with platform
100+
toolsets newer than v140 (VS2017 or above) */
101+
struct sshbuf *auth_debug;
102+
#endif
96103

97104
/*
98105
* Check if the user is allowed to log in via ssh. If user is listed

‎contrib/win32/install/openssh.wixproj‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
ProductVersion=$(ProductVersion);
1515
</DefineConstants>
1616
<DefineSolutionProperties>false</DefineSolutionProperties>
17-
<!-- This is sufficient for x86 and x64 but gets overwritten below for ARM64 -->
18-
<WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
17+
<!-- Assumes WixToolPath is an input provided at runtime -->
18+
<!-- If building x86/x64 MSI and have Wix 3.11 installed, can also try the below line instead -->
19+
<!-- WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath -->
20+
<WixTargetsPath>$(WixToolPath)Wix.targets</WixTargetsPath>
21+
<WixTasksPath>$(WixToolPath)wixtasks.dll</WixTasksPath>
1922
</PropertyGroup>
2023

2124
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -25,12 +28,6 @@
2528
</DefineConstants>
2629
</PropertyGroup>
2730

28-
<PropertyGroup Condition="'$(Platform)' == 'ARM64'">
29-
<!-- Assumes WixToolPath input is provided at runtime -->
30-
<WixTargetsPath>$(WixToolPath)Wix.targets</WixTargetsPath>
31-
<WixTasksPath>$(WixToolPath)wixtasks.dll</WixTasksPath>
32-
</PropertyGroup>
33-
3431
<ItemGroup>
3532
<BindInputPaths Include="..\..\..\bin\$(Platform)\$(Configuration)" />
3633
</ItemGroup>

‎contrib/win32/openssh/OpenSSHBuildHelper.psm1‎

Lines changed: 179 additions & 179 deletions
Large diffs are not rendered by default.

‎contrib/win32/openssh/config.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,52 +49,52 @@
4949
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5050
<ConfigurationType>Application</ConfigurationType>
5151
<UseDebugLibraries>true</UseDebugLibraries>
52-
<PlatformToolset>v140</PlatformToolset>
52+
<PlatformToolset>v143</PlatformToolset>
5353
<CharacterSet>MultiByte</CharacterSet>
5454
</PropertyGroup>
5555
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5656
<ConfigurationType>Application</ConfigurationType>
5757
<UseDebugLibraries>false</UseDebugLibraries>
58-
<PlatformToolset>v140</PlatformToolset>
58+
<PlatformToolset>v143</PlatformToolset>
5959
<WholeProgramOptimization>true</WholeProgramOptimization>
6060
<CharacterSet>MultiByte</CharacterSet>
6161
</PropertyGroup>
6262
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
6363
<ConfigurationType>Utility</ConfigurationType>
6464
<UseDebugLibraries>true</UseDebugLibraries>
65-
<PlatformToolset>v140</PlatformToolset>
65+
<PlatformToolset>v143</PlatformToolset>
6666
<CharacterSet>MultiByte</CharacterSet>
6767
</PropertyGroup>
6868
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
6969
<ConfigurationType>Utility</ConfigurationType>
7070
<UseDebugLibraries>true</UseDebugLibraries>
71-
<PlatformToolset>v141</PlatformToolset>
71+
<PlatformToolset>v143</PlatformToolset>
7272
<CharacterSet>MultiByte</CharacterSet>
7373
</PropertyGroup>
7474
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
7575
<ConfigurationType>Utility</ConfigurationType>
7676
<UseDebugLibraries>true</UseDebugLibraries>
77-
<PlatformToolset>v141</PlatformToolset>
77+
<PlatformToolset>v143</PlatformToolset>
7878
<CharacterSet>MultiByte</CharacterSet>
7979
</PropertyGroup>
8080
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
8181
<ConfigurationType>Application</ConfigurationType>
8282
<UseDebugLibraries>false</UseDebugLibraries>
83-
<PlatformToolset>v140</PlatformToolset>
83+
<PlatformToolset>v143</PlatformToolset>
8484
<WholeProgramOptimization>true</WholeProgramOptimization>
8585
<CharacterSet>MultiByte</CharacterSet>
8686
</PropertyGroup>
8787
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
8888
<ConfigurationType>Application</ConfigurationType>
8989
<UseDebugLibraries>false</UseDebugLibraries>
90-
<PlatformToolset>v141</PlatformToolset>
90+
<PlatformToolset>v143</PlatformToolset>
9191
<WholeProgramOptimization>true</WholeProgramOptimization>
9292
<CharacterSet>MultiByte</CharacterSet>
9393
</PropertyGroup>
9494
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
9595
<ConfigurationType>Application</ConfigurationType>
9696
<UseDebugLibraries>false</UseDebugLibraries>
97-
<PlatformToolset>v141</PlatformToolset>
97+
<PlatformToolset>v143</PlatformToolset>
9898
<WholeProgramOptimization>true</WholeProgramOptimization>
9999
<CharacterSet>MultiByte</CharacterSet>
100100
</PropertyGroup>

‎contrib/win32/openssh/keygen.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,52 +46,52 @@
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4747
<ConfigurationType>Application</ConfigurationType>
4848
<UseDebugLibraries>true</UseDebugLibraries>
49-
<PlatformToolset>v140</PlatformToolset>
49+
<PlatformToolset>v143</PlatformToolset>
5050
<CharacterSet>MultiByte</CharacterSet>
5151
</PropertyGroup>
5252
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5353
<ConfigurationType>Application</ConfigurationType>
5454
<UseDebugLibraries>false</UseDebugLibraries>
55-
<PlatformToolset>v140</PlatformToolset>
55+
<PlatformToolset>v143</PlatformToolset>
5656
<WholeProgramOptimization>true</WholeProgramOptimization>
5757
<CharacterSet>MultiByte</CharacterSet>
5858
</PropertyGroup>
5959
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
6060
<ConfigurationType>Application</ConfigurationType>
6161
<UseDebugLibraries>true</UseDebugLibraries>
62-
<PlatformToolset>v140</PlatformToolset>
62+
<PlatformToolset>v143</PlatformToolset>
6363
<CharacterSet>MultiByte</CharacterSet>
6464
</PropertyGroup>
6565
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
6666
<ConfigurationType>Application</ConfigurationType>
6767
<UseDebugLibraries>true</UseDebugLibraries>
68-
<PlatformToolset>v141</PlatformToolset>
68+
<PlatformToolset>v143</PlatformToolset>
6969
<CharacterSet>MultiByte</CharacterSet>
7070
</PropertyGroup>
7171
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
7272
<ConfigurationType>Application</ConfigurationType>
7373
<UseDebugLibraries>true</UseDebugLibraries>
74-
<PlatformToolset>v141</PlatformToolset>
74+
<PlatformToolset>v143</PlatformToolset>
7575
<CharacterSet>MultiByte</CharacterSet>
7676
</PropertyGroup>
7777
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7878
<ConfigurationType>Application</ConfigurationType>
7979
<UseDebugLibraries>false</UseDebugLibraries>
80-
<PlatformToolset>v140</PlatformToolset>
80+
<PlatformToolset>v143</PlatformToolset>
8181
<WholeProgramOptimization>true</WholeProgramOptimization>
8282
<CharacterSet>MultiByte</CharacterSet>
8383
</PropertyGroup>
8484
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
8585
<ConfigurationType>Application</ConfigurationType>
8686
<UseDebugLibraries>false</UseDebugLibraries>
87-
<PlatformToolset>v141</PlatformToolset>
87+
<PlatformToolset>v143</PlatformToolset>
8888
<WholeProgramOptimization>true</WholeProgramOptimization>
8989
<CharacterSet>MultiByte</CharacterSet>
9090
</PropertyGroup>
9191
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
9292
<ConfigurationType>Application</ConfigurationType>
9393
<UseDebugLibraries>false</UseDebugLibraries>
94-
<PlatformToolset>v141</PlatformToolset>
94+
<PlatformToolset>v143</PlatformToolset>
9595
<WholeProgramOptimization>true</WholeProgramOptimization>
9696
<CharacterSet>MultiByte</CharacterSet>
9797
</PropertyGroup>

‎contrib/win32/openssh/libssh.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,52 +45,52 @@
4545
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4646
<ConfigurationType>StaticLibrary</ConfigurationType>
4747
<UseDebugLibraries>true</UseDebugLibraries>
48-
<PlatformToolset>v140</PlatformToolset>
48+
<PlatformToolset>v143</PlatformToolset>
4949
<CharacterSet>MultiByte</CharacterSet>
5050
</PropertyGroup>
5151
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5252
<ConfigurationType>StaticLibrary</ConfigurationType>
5353
<UseDebugLibraries>true</UseDebugLibraries>
54-
<PlatformToolset>v140</PlatformToolset>
54+
<PlatformToolset>v143</PlatformToolset>
5555
<CharacterSet>MultiByte</CharacterSet>
5656
</PropertyGroup>
5757
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
5858
<ConfigurationType>StaticLibrary</ConfigurationType>
5959
<UseDebugLibraries>true</UseDebugLibraries>
60-
<PlatformToolset>v141</PlatformToolset>
60+
<PlatformToolset>v143</PlatformToolset>
6161
<CharacterSet>MultiByte</CharacterSet>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
6464
<ConfigurationType>StaticLibrary</ConfigurationType>
6565
<UseDebugLibraries>true</UseDebugLibraries>
66-
<PlatformToolset>v141</PlatformToolset>
66+
<PlatformToolset>v143</PlatformToolset>
6767
<CharacterSet>MultiByte</CharacterSet>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
7070
<ConfigurationType>StaticLibrary</ConfigurationType>
7171
<UseDebugLibraries>false</UseDebugLibraries>
72-
<PlatformToolset>v140</PlatformToolset>
72+
<PlatformToolset>v143</PlatformToolset>
7373
<WholeProgramOptimization>true</WholeProgramOptimization>
7474
<CharacterSet>MultiByte</CharacterSet>
7575
</PropertyGroup>
7676
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7777
<ConfigurationType>StaticLibrary</ConfigurationType>
7878
<UseDebugLibraries>false</UseDebugLibraries>
79-
<PlatformToolset>v140</PlatformToolset>
79+
<PlatformToolset>v143</PlatformToolset>
8080
<WholeProgramOptimization>true</WholeProgramOptimization>
8181
<CharacterSet>MultiByte</CharacterSet>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
8484
<ConfigurationType>StaticLibrary</ConfigurationType>
8585
<UseDebugLibraries>false</UseDebugLibraries>
86-
<PlatformToolset>v141</PlatformToolset>
86+
<PlatformToolset>v143</PlatformToolset>
8787
<WholeProgramOptimization>true</WholeProgramOptimization>
8888
<CharacterSet>MultiByte</CharacterSet>
8989
</PropertyGroup>
9090
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
9191
<ConfigurationType>StaticLibrary</ConfigurationType>
9292
<UseDebugLibraries>false</UseDebugLibraries>
93-
<PlatformToolset>v141</PlatformToolset>
93+
<PlatformToolset>v143</PlatformToolset>
9494
<WholeProgramOptimization>true</WholeProgramOptimization>
9595
<CharacterSet>MultiByte</CharacterSet>
9696
</PropertyGroup>

0 commit comments

Comments
 (0)