Skip to content

Commit c4c25da

Browse files
datadiodedatadiode
committed
Upgrade Visual Studio to 17.12.4 / Have the installer silently create any missing Microsoft.Cpp.*.user.props files to reduce hassle with Visual Studio 2019+ which no longer creates them by default / Remove an NSIS leftover
1 parent 9cdfdc0 commit c4c25da

File tree

19 files changed

+52
-40
lines changed

19 files changed

+52
-40
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Visual Leak Detector (Support Visual Studio 2019 16.7)
1+
# Visual Leak Detector (Support Visual Studio 2022 17.12)
22

33
## Introduction
44

@@ -18,6 +18,6 @@ We encourage developers who've added their own features, or fixed bugs they've f
1818

1919
* [Source code](https://github.com/oneiric/vld)
2020

21-
Copyright © 2005-2021 VLD Team
21+
Copyright © 2005-2025 VLD Team
2222

2323
[1]: https://github.com/oneiric/vld/blob/master/COPYING.txt

‎lib/cppformat/format.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<PropertyGroup Label="Configuration">
3131
<ConfigurationType>StaticLibrary</ConfigurationType>
3232
<CharacterSet>MultiByte</CharacterSet>
33-
<PlatformToolset>v142</PlatformToolset>
33+
<PlatformToolset>v143</PlatformToolset>
3434
</PropertyGroup>
3535
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3636
<ImportGroup Label="ExtensionSettings">

‎lib/gtest/msvc/gtest.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4545
<PropertyGroup Label="Configuration">
4646
<ConfigurationType>StaticLibrary</ConfigurationType>
47-
<PlatformToolset>v142</PlatformToolset>
47+
<PlatformToolset>v143</PlatformToolset>
4848
<CharacterSet>MultiByte</CharacterSet>
4949
</PropertyGroup>
5050
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎setup/version.h

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11

2-
#define VLDVERSION L"2.7.0"
3-
#define VERSION_NUMBER 2,7,0,0
4-
#define VERSION_STRING "2.7.0.0"
5-
#define VERSION_COPYRIGHT "Copyright (C) 2005-2021"
6-
7-
#ifndef __FILE__
8-
!define VLD_VERSION "2.7.0" // NSIS Script
9-
#endif
2+
#define VLDVERSION L"2.8.0"
3+
#define VERSION_NUMBER 2,8,0,0
4+
#define VERSION_STRING "2.8.0.0"
5+
#define VERSION_COPYRIGHT "Copyright (C) 2005-2025"

‎setup/vld-setup.iss

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "Visual Leak Detector"
5-
#define MyAppVersion "2.7.0"
5+
#define MyAppVersion "2.8.0"
66
#define MyAppPublisher "VLD Team"
7-
#define MyAppURL "http://vld.codeplex.com/"
7+
#define MyAppURL "https://github.com/oneiric/vld"
88
#define MyAppRegKey "Software\Visual Leak Detector"
99

1010
[Setup]
@@ -25,7 +25,7 @@ LicenseFile=license-free.txt
2525
OutputBaseFilename=vld-{#MyAppVersion}-setup
2626
Compression=lzma
2727
SolidCompression=True
28-
MinVersion=0,6.0
28+
MinVersion=0,6.1
2929
; Tell Windows Explorer to reload the environment
3030
ChangesEnvironment=yes
3131
AllowNoIcons=yes
@@ -45,12 +45,12 @@ Source: "dbghelp\x64\dbghelp.dll"; DestDir: "{app}\bin\Win64"; Flags: ignorevers
4545
Source: "dbghelp\x64\Microsoft.DTfW.DHL.manifest"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion
4646
Source: "dbghelp\x86\dbghelp.dll"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
4747
Source: "dbghelp\x86\Microsoft.DTfW.DHL.manifest"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
48-
Source: "..\src\bin\Win32\Release-v142\vld.lib"; DestDir: "{app}\lib\Win32"; Flags: ignoreversion
49-
Source: "..\src\bin\Win32\Release-v142\vld_x86.dll"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
50-
Source: "..\src\bin\Win32\Release-v142\vld_x86.pdb"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
51-
Source: "..\src\bin\x64\Release-v142\vld.lib"; DestDir: "{app}\lib\Win64"; Flags: ignoreversion
52-
Source: "..\src\bin\x64\Release-v142\vld_x64.dll"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion
53-
Source: "..\src\bin\x64\Release-v142\vld_x64.pdb"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion
48+
Source: "..\src\bin\Win32\Release-v143\vld.lib"; DestDir: "{app}\lib\Win32"; Flags: ignoreversion
49+
Source: "..\src\bin\Win32\Release-v143\vld_x86.dll"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
50+
Source: "..\src\bin\Win32\Release-v143\vld_x86.pdb"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
51+
Source: "..\src\bin\x64\Release-v143\vld.lib"; DestDir: "{app}\lib\Win64"; Flags: ignoreversion
52+
Source: "..\src\bin\x64\Release-v143\vld_x64.dll"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion
53+
Source: "..\src\bin\x64\Release-v143\vld_x64.pdb"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion
5454
Source: "..\src\vld.h"; DestDir: "{app}\include"; Flags: ignoreversion
5555
Source: "..\src\vld_def.h"; DestDir: "{app}\include"; Flags: ignoreversion
5656
Source: "..\vld.ini"; DestDir: "{app}"; Flags: ignoreversion
@@ -61,7 +61,7 @@ Source: "..\COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion
6161
[Tasks]
6262
Name: "modifypath"; Description: "Add VLD directory to your environmental path"
6363
Name: "modifyVS2008Props"; Description: "Add VLD directory to VS 2008"
64-
Name: "modifyVS2010Props"; Description: "Add VLD directory to VS 2010 - VS 2019"
64+
Name: "modifyVS2010Props"; Description: "Add VLD directory to VS 2010 - VS 2022"
6565

6666
[ThirdParty]
6767
UseRelativePaths=True
@@ -318,12 +318,28 @@ var
318318
StaticLibraryDirectoriesNode: Variant;
319319
AdditionalStaticLibraryDirectories: string;
320320
begin
321-
if not FileExists(filename) then
322-
Exit;
323321
XMLDocument := CreateOleObject('Msxml2.DOMDocument.3.0');
324322
try
325323
XMLDocument.async := False;
326-
XMLDocument.load(filename);
324+
XMLDocument.preserveWhiteSpace := True;
325+
if FileExists(filename) then
326+
XMLDocument.load(filename)
327+
else
328+
XMLDocument.loadXML(
329+
'<?xml version="1.0" encoding="utf-8"?>'#13#10
330+
'<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">'#13#10
331+
' <ItemDefinitionGroup>'#13#10
332+
' <ClCompile>'#13#10
333+
' <AdditionalIncludeDirectories></AdditionalIncludeDirectories>'#13#10
334+
' </ClCompile>'#13#10
335+
' <Link>'#13#10
336+
' <AdditionalLibraryDirectories></AdditionalLibraryDirectories>'#13#10
337+
' </Link>'#13#10
338+
' <Lib>'#13#10
339+
' <AdditionalLibraryDirectories></AdditionalLibraryDirectories>'#13#10
340+
' </Lib>'#13#10
341+
' </ItemDefinitionGroup>'#13#10
342+
'</Project>'#13#10);
327343
if (XMLDocument.parseError.errorCode = 0) then
328344
begin
329345
XMLDocument.setProperty('SelectionLanguage', 'XPath');
@@ -426,7 +442,7 @@ var
426442
Path: string;
427443
begin
428444
Path := GetEnv('LOCALAPPDATA')+'\Microsoft\MSBuild\v4.0\';
429-
if DirExists(Path) then
445+
if ForceDirectories(Path) then
430446
begin
431447
ModifyProps(Path + 'Microsoft.Cpp.Win32.user.props', 'Win32');
432448
ModifyProps(Path + 'Microsoft.Cpp.x64.user.props', 'Win64');

‎src/tests/basics/basics.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<PropertyGroup Label="Configuration">
6262
<ConfigurationType>Application</ConfigurationType>
6363
<CharacterSet>Unicode</CharacterSet>
64-
<PlatformToolset>v142</PlatformToolset>
64+
<PlatformToolset>v143</PlatformToolset>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6767
<UseDebugLibraries>true</UseDebugLibraries>

‎src/tests/corruption/corruption.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<PropertyGroup Label="Configuration">
6262
<ConfigurationType>Application</ConfigurationType>
6363
<CharacterSet>Unicode</CharacterSet>
64-
<PlatformToolset>v142</PlatformToolset>
64+
<PlatformToolset>v143</PlatformToolset>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6767
<UseDebugLibraries>true</UseDebugLibraries>

‎src/tests/dynamic_app/dynamic_app.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<PropertyGroup Label="Configuration">
6262
<ConfigurationType>Application</ConfigurationType>
6363
<CharacterSet>Unicode</CharacterSet>
64-
<PlatformToolset>v142</PlatformToolset>
64+
<PlatformToolset>v143</PlatformToolset>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6767
<UseDebugLibraries>true</UseDebugLibraries>

‎src/tests/dynamic_dll/dynamic.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<PropertyGroup Label="Configuration">
6262
<ConfigurationType>DynamicLibrary</ConfigurationType>
6363
<CharacterSet>Unicode</CharacterSet>
64-
<PlatformToolset>v142</PlatformToolset>
64+
<PlatformToolset>v143</PlatformToolset>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6767
<UseDebugLibraries>true</UseDebugLibraries>

‎src/tests/mfc/vldmfc.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<PropertyGroup Label="Configuration">
4646
<ConfigurationType>Application</ConfigurationType>
4747
<CharacterSet>Unicode</CharacterSet>
48-
<PlatformToolset>v142</PlatformToolset>
48+
<PlatformToolset>v143</PlatformToolset>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5151
<UseOfMfc>Dynamic</UseOfMfc>

‎src/tests/mfc_dll/mfc.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<PropertyGroup Label="Configuration">
6262
<ConfigurationType>DynamicLibrary</ConfigurationType>
6363
<CharacterSet>Unicode</CharacterSet>
64-
<PlatformToolset>v142</PlatformToolset>
64+
<PlatformToolset>v143</PlatformToolset>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6767
<UseDebugLibraries>true</UseDebugLibraries>

‎src/tests/suite/testsuite.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<PropertyGroup Label="Configuration">
6161
<ConfigurationType>Application</ConfigurationType>
6262
<CharacterSet>NotSet</CharacterSet>
63-
<PlatformToolset>v142</PlatformToolset>
63+
<PlatformToolset>v143</PlatformToolset>
6464
</PropertyGroup>
6565
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6666
<ImportGroup Label="ExtensionSettings">

‎src/tests/vld_ComTest/ComTest_vs14.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<PropertyGroup Label="Configuration">
6262
<ConfigurationType>DynamicLibrary</ConfigurationType>
6363
<CharacterSet>Unicode</CharacterSet>
64-
<PlatformToolset>v142</PlatformToolset>
64+
<PlatformToolset>v143</PlatformToolset>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
6767
<UseDebugLibraries>true</UseDebugLibraries>

‎src/tests/vld_dll1/vld_dll1_vs14.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
6161
<PropertyGroup Label="Configuration">
6262
<ConfigurationType>DynamicLibrary</ConfigurationType>
63-
<PlatformToolset>v142</PlatformToolset>
63+
<PlatformToolset>v143</PlatformToolset>
6464
<CharacterSet>Unicode</CharacterSet>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

‎src/tests/vld_dll2/vld_dll2_vs14.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
6161
<PropertyGroup Label="Configuration">
6262
<ConfigurationType>DynamicLibrary</ConfigurationType>
63-
<PlatformToolset>v142</PlatformToolset>
63+
<PlatformToolset>v143</PlatformToolset>
6464
<CharacterSet>Unicode</CharacterSet>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

‎src/tests/vld_main/vld_main_vs14.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
6161
<PropertyGroup Label="Configuration">
6262
<ConfigurationType>Application</ConfigurationType>
63-
<PlatformToolset>v142</PlatformToolset>
63+
<PlatformToolset>v143</PlatformToolset>
6464
<CharacterSet>Unicode</CharacterSet>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

‎src/tests/vld_main_test/vld_main_test_vs14.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
6161
<PropertyGroup Label="Configuration">
6262
<ConfigurationType>Application</ConfigurationType>
63-
<PlatformToolset>v142</PlatformToolset>
63+
<PlatformToolset>v143</PlatformToolset>
6464
<CharacterSet>Unicode</CharacterSet>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

‎src/tests/vld_unload/vld_unload_vs14.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
6161
<PropertyGroup Label="Configuration">
6262
<ConfigurationType>Application</ConfigurationType>
63-
<PlatformToolset>v142</PlatformToolset>
63+
<PlatformToolset>v143</PlatformToolset>
6464
<CharacterSet>Unicode</CharacterSet>
6565
</PropertyGroup>
6666
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

‎src/vld.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<!-- Import Default Property Sheets -->
3333
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3434
<PropertyGroup Label="Configuration">
35-
<PlatformToolset>v142</PlatformToolset>
35+
<PlatformToolset>v143</PlatformToolset>
3636
</PropertyGroup>
3737
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3838
<!-- Global properties -->

0 commit comments

Comments
 (0)