Remove CppUnit from proGen templates

2025-01-19 08:46:41 +01:00 · 2018-06-03 13:47:37 +02:00 · 2018-06-03 13:47:37 +02:00 · 9ba9254623
commit 9ba9254623
parent 6c59f60237
91 changed files with 92 additions and 90 deletions
--- a/ProGen/templates/vs100/Win32/testsuite/debug_shared.template
+++ b/ProGen/templates/vs100/Win32/testsuite/debug_shared.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies="WinTestRunnerd.lib ${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs100/Win32/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs100/Win32/testsuite/debug_static_md.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs100/Win32/testsuite/release_shared.template
+++ b/ProGen/templates/vs100/Win32/testsuite/release_shared.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs100/Win32/testsuite/release_static_md.template
+++ b/ProGen/templates/vs100/Win32/testsuite/release_static_md.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs100/x64/testsuite/debug_shared.template
+++ b/ProGen/templates/vs100/x64/testsuite/debug_shared.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs100/x64/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs100/x64/testsuite/debug_static_md.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs100/x64/testsuite/release_shared.template
+++ b/ProGen/templates/vs100/x64/testsuite/release_shared.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs100/x64/testsuite/release_static_md.template
+++ b/ProGen/templates/vs100/x64/testsuite/release_static_md.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs100/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs100/x64/testsuite/release_static_mt.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs110/Win32/testsuite/debug_shared.template
+++ b/ProGen/templates/vs110/Win32/testsuite/debug_shared.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs110/Win32/testsuite/release_shared.template
+++ b/ProGen/templates/vs110/Win32/testsuite/release_shared.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs110/Win32/testsuite/release_static_md.template
+++ b/ProGen/templates/vs110/Win32/testsuite/release_static_md.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs110/WinCE/testsuite/debug_shared.template
+++ b/ProGen/templates/vs110/WinCE/testsuite/debug_shared.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\shared\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs110/WinCE/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs110/WinCE/testsuite/debug_static_md.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs110/WinCE/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs110/WinCE/testsuite/debug_static_mt.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs110/WinCE/testsuite/release_shared.template
+++ b/ProGen/templates/vs110/WinCE/testsuite/release_shared.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\shared\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs110/WinCE/testsuite/release_static_md.template
+++ b/ProGen/templates/vs110/WinCE/testsuite/release_static_md.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs110/WinCE/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs110/WinCE/testsuite/release_static_mt.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs110/x64/testsuite/debug_shared.template
+++ b/ProGen/templates/vs110/x64/testsuite/debug_shared.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs110/x64/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs110/x64/testsuite/debug_static_md.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs110/x64/testsuite/release_shared.template
+++ b/ProGen/templates/vs110/x64/testsuite/release_shared.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs110/x64/testsuite/release_static_md.template
+++ b/ProGen/templates/vs110/x64/testsuite/release_static_md.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs110/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs110/x64/testsuite/release_static_mt.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs120/Win32/testsuite/debug_shared.template
+++ b/ProGen/templates/vs120/Win32/testsuite/debug_shared.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs120/Win32/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs120/Win32/testsuite/debug_static_md.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs120/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs120/Win32/testsuite/debug_static_mt.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs120/Win32/testsuite/release_shared.template
+++ b/ProGen/templates/vs120/Win32/testsuite/release_shared.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs120/Win32/testsuite/release_static_md.template
+++ b/ProGen/templates/vs120/Win32/testsuite/release_static_md.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs120/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs120/Win32/testsuite/release_static_mt.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs120/WinCE/testsuite/debug_shared.template
+++ b/ProGen/templates/vs120/WinCE/testsuite/debug_shared.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\shared\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs120/WinCE/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs120/WinCE/testsuite/debug_static_md.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs120/WinCE/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs120/WinCE/testsuite/debug_static_mt.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs120/WinCE/testsuite/release_shared.template
+++ b/ProGen/templates/vs120/WinCE/testsuite/release_shared.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\shared\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs120/WinCE/testsuite/release_static_md.template
+++ b/ProGen/templates/vs120/WinCE/testsuite/release_static_md.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs120/WinCE/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs120/WinCE/testsuite/release_static_mt.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs120/x64/testsuite/debug_shared.template
+++ b/ProGen/templates/vs120/x64/testsuite/debug_shared.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs120/x64/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs120/x64/testsuite/debug_static_md.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs120/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs120/x64/testsuite/debug_static_mt.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs120/x64/testsuite/release_shared.template
+++ b/ProGen/templates/vs120/x64/testsuite/release_shared.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs120/x64/testsuite/release_static_md.template
+++ b/ProGen/templates/vs120/x64/testsuite/release_static_md.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs120/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs120/x64/testsuite/release_static_mt.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs140/Win32/testsuite/debug_shared.template
+++ b/ProGen/templates/vs140/Win32/testsuite/debug_shared.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs140/Win32/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs140/Win32/testsuite/debug_static_md.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs140/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs140/Win32/testsuite/debug_static_mt.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs140/Win32/testsuite/release_shared.template
+++ b/ProGen/templates/vs140/Win32/testsuite/release_shared.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs140/Win32/testsuite/release_static_md.template
+++ b/ProGen/templates/vs140/Win32/testsuite/release_static_md.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs140/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs140/Win32/testsuite/release_static_mt.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs140/x64/testsuite/debug_shared.template
+++ b/ProGen/templates/vs140/x64/testsuite/debug_shared.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs140/x64/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs140/x64/testsuite/debug_static_md.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs140/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs140/x64/testsuite/debug_static_mt.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs140/x64/testsuite/release_shared.template
+++ b/ProGen/templates/vs140/x64/testsuite/release_shared.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs140/x64/testsuite/release_static_md.template
+++ b/ProGen/templates/vs140/x64/testsuite/release_static_md.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs140/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs140/x64/testsuite/release_static_mt.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs150/Win32/testsuite/debug_shared.template
+++ b/ProGen/templates/vs150/Win32/testsuite/debug_shared.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs150/Win32/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs150/Win32/testsuite/debug_static_md.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs150/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs150/Win32/testsuite/debug_static_mt.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs150/Win32/testsuite/release_shared.template
+++ b/ProGen/templates/vs150/Win32/testsuite/release_shared.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs150/Win32/testsuite/release_static_md.template
+++ b/ProGen/templates/vs150/Win32/testsuite/release_static_md.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs150/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs150/Win32/testsuite/release_static_mt.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs150/x64/testsuite/debug_shared.template
+++ b/ProGen/templates/vs150/x64/testsuite/debug_shared.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs150/x64/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs150/x64/testsuite/debug_static_md.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs150/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs150/x64/testsuite/debug_static_mt.template
@ -52,7 +52,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs150/x64/testsuite/release_shared.template
+++ b/ProGen/templates/vs150/x64/testsuite/release_shared.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs150/x64/testsuite/release_static_md.template
+++ b/ProGen/templates/vs150/x64/testsuite/release_static_md.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs150/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs150/x64/testsuite/release_static_mt.template
@ -54,7 +54,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs90/Win32/testsuite/debug_shared.template
+++ b/ProGen/templates/vs90/Win32/testsuite/debug_shared.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs90/Win32/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs90/Win32/testsuite/debug_static_md.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs90/Win32/testsuite/release_shared.template
+++ b/ProGen/templates/vs90/Win32/testsuite/release_shared.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs90/Win32/testsuite/release_static_md.template
+++ b/ProGen/templates/vs90/Win32/testsuite/release_static_md.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib"
--- a/ProGen/templates/vs90/WinCE/testsuite/debug_shared.template
+++ b/ProGen/templates/vs90/WinCE/testsuite/debug_shared.template
@ -53,7 +53,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalOptions="/FORCE:MULTIPLE ${configuration.linker.additionalOptions}"
-		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\shared\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs90/WinCE/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs90/WinCE/testsuite/debug_static_md.template
@ -53,7 +53,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalOptions="/FORCE:MULTIPLE ${configuration.linker.additionalOptions}"
-		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs90/WinCE/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs90/WinCE/testsuite/debug_static_mt.template
@ -53,7 +53,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalOptions="/FORCE:MULTIPLE ${configuration.linker.additionalOptions}"
-		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs90/WinCE/testsuite/release_shared.template
+++ b/ProGen/templates/vs90/WinCE/testsuite/release_shared.template
@ -53,7 +53,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalOptions="/FORCE:MULTIPLE ${configuration.linker.additionalOptions}"
-		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\shared\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs90/WinCE/testsuite/release_static_md.template
+++ b/ProGen/templates/vs90/WinCE/testsuite/release_static_md.template
@ -56,7 +56,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalOptions="/FORCE:MULTIPLE ${configuration.linker.additionalOptions}"
-		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs90/WinCE/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs90/WinCE/testsuite/release_static_mt.template
@ -56,7 +56,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalOptions="/FORCE:MULTIPLE ${configuration.linker.additionalOptions}"
-		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin\$(PlatformName)\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib\$(PlatformName)"
--- a/ProGen/templates/vs90/x64/testsuite/debug_shared.template
+++ b/ProGen/templates/vs90/x64/testsuite/debug_shared.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs90/x64/testsuite/debug_static_md.template
+++ b/ProGen/templates/vs90/x64/testsuite/debug_static_md.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template
+++ b/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template
@ -53,7 +53,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}d.exe"
 		LinkIncremental="2"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs90/x64/testsuite/release_shared.template
+++ b/ProGen/templates/vs90/x64/testsuite/release_shared.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs90/x64/testsuite/release_static_md.template
+++ b/ProGen/templates/vs90/x64/testsuite/release_static_md.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_md\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/ProGen/templates/vs90/x64/testsuite/release_static_mt.template
+++ b/ProGen/templates/vs90/x64/testsuite/release_static_mt.template
@ -55,7 +55,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		AdditionalDependencies=${configuration.linker.dependencies}"
 		OutputFile="bin64\static_mt\${project.target}.exe"
 		LinkIncremental="1"
 		AdditionalLibraryDirectories="${project.pocobase}\lib64"
--- a/cppignore.cmd
+++ b/cppignore.cmd
@ -14,4 +14,6 @@ class CppUnit::TestCaller^<class ThreadTest^>.testSleep, ^
 class CppUnit::TestCaller^<class TimerTest^>.testTimer, ^
 class CppUnit::TestCaller^<class TimerTest^>.testScheduleInterval, ^
 class CppUnit::TestCaller^<class TimerTest^>.testScheduleIntervalTimestamp, ^
+class CppUnit::TestCaller^<class TimerTest^>.testScheduleIntervalClock, ^
+class CppUnit::TestCaller^<class TimerTest^>.testScheduleAtFixedRate, ^
 %CPPUNIT_IGNORE%