diff --git a/src/Installer/Product.wxs b/src/Installer/Product.wxs
index 2296f06..47cd146 100644
--- a/src/Installer/Product.wxs
+++ b/src/Installer/Product.wxs
@@ -107,7 +107,7 @@
-
+
diff --git a/src/NativeUnitTests/NativeUnitTests.vcxproj b/src/NativeUnitTests/NativeUnitTests.vcxproj
index 281dba5..72c9e9a 100644
--- a/src/NativeUnitTests/NativeUnitTests.vcxproj
+++ b/src/NativeUnitTests/NativeUnitTests.vcxproj
@@ -31,21 +31,21 @@
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}
Win32Proj
NativeUnitTests
- 10.0.17134.0
+ 10.0
NativeUnitTestProject
DynamicLibrary
true
- v141
+ v142
Unicode
false
DynamicLibrary
false
- v141
+ v142
true
Unicode
false
@@ -53,7 +53,7 @@
DynamicLibrary
false
- v141
+ v142
true
Unicode
false
@@ -61,7 +61,7 @@
DynamicLibrary
true
- v141
+ v142
Unicode
false
false
@@ -69,7 +69,7 @@
DynamicLibrary
false
- v141
+ v142
true
Unicode
false
@@ -77,7 +77,7 @@
DynamicLibrary
false
- v141
+ v142
true
Unicode
false
diff --git a/src/NativeUnitTests/PasswordEvaluatorRegexApproveTests.cpp b/src/NativeUnitTests/PasswordEvaluatorRegexApproveTests.cpp
index b28c104..6f1c95c 100644
--- a/src/NativeUnitTests/PasswordEvaluatorRegexApproveTests.cpp
+++ b/src/NativeUnitTests/PasswordEvaluatorRegexApproveTests.cpp
@@ -43,5 +43,13 @@ namespace NativeUnitTests
Assert::IsFalse(ProcessPasswordRegexReject(password, std::wstring(L"accountName"), std::wstring(L"full name"), TRUE, reg));
DeleteValue(REG_VALUE_REGEXREJECT);
}
+
+ TEST_METHOD(RegexRejectFail2)
+ {
+ SetValue(REG_VALUE_REGEXREJECT, L".+\\d{3,}$");
+ TestString password(L"reject me1234");
+ Assert::IsFalse(ProcessPasswordRegexReject(password, std::wstring(L"accountName"), std::wstring(L"full name"), TRUE, reg));
+ DeleteValue(REG_VALUE_REGEXREJECT);
+ }
};
}
\ No newline at end of file
diff --git a/src/PasswordFilter/PasswordFilter.vcxproj b/src/PasswordFilter/PasswordFilter.vcxproj
index 96a3b4c..c98d590 100644
--- a/src/PasswordFilter/PasswordFilter.vcxproj
+++ b/src/PasswordFilter/PasswordFilter.vcxproj
@@ -39,60 +39,60 @@
{850894DF-B439-4DAA-A574-F7CFEA422A2F}
Win32Proj
LithnetActiveDirectoryPasswordFilterNative
- 10.0.15063.0
+ 10.0
DynamicLibrary
true
- v141
+ v142
Unicode
DynamicLibrary
false
- v141
+ v142
true
Unicode
DynamicLibrary
false
- v141
+ v142
true
Unicode
DynamicLibrary
false
- v141
+ v142
true
Unicode
DynamicLibrary
true
- v141
+ v142
Unicode
DynamicLibrary
false
- v141
+ v142
true
Unicode
DynamicLibrary
false
- v141
+ v142
true
Unicode
DynamicLibrary
false
- v141
+ v142
true
Unicode
diff --git a/src/PasswordFilter/SecureArrayT.h b/src/PasswordFilter/SecureArrayT.h
index ad4b0ae..2d5e581 100644
--- a/src/PasswordFilter/SecureArrayT.h
+++ b/src/PasswordFilter/SecureArrayT.h
@@ -1,11 +1,15 @@
#pragma once
+#include
+#include
+
template
+
class SecureArrayT
{
protected:
- std::shared_ptr internalptr;
int size;
-
+ std::shared_ptr internalptr;
+
public:
SecureArrayT(T* item, const int size)
diff --git a/src/PasswordFilter/registry.cpp b/src/PasswordFilter/registry.cpp
index 19b3759..e039faa 100644
--- a/src/PasswordFilter/registry.cpp
+++ b/src/PasswordFilter/registry.cpp
@@ -1,5 +1,6 @@
#include "stdafx.h"
#include "registry.h"
+#include
registry::registry()
{
diff --git a/src/PasswordProtection/Lithnet.ActiveDirectory.PasswordProtection.csproj b/src/PasswordProtection/Lithnet.ActiveDirectory.PasswordProtection.csproj
index 32a0205..49060c7 100644
--- a/src/PasswordProtection/Lithnet.ActiveDirectory.PasswordProtection.csproj
+++ b/src/PasswordProtection/Lithnet.ActiveDirectory.PasswordProtection.csproj
@@ -142,6 +142,6 @@
if $(ConfigurationName) == EVSignedRelease ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)") else ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)")
-"C:\Program Files\Debugging Tools for Windows (x64)\symstore" add /f "$(TargetDir)*.pdb" /s \\localhost\symbols /t "$(ProjectName)" /v "@(VersionNumber)"
+"C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore" add /f "$(TargetDir)*.pdb" /s \\localhost\symbols /t "$(ProjectName)" /v "@(VersionNumber)"
\ No newline at end of file
diff --git a/src/PasswordProtectionPS/Lithnet.ActiveDirectory.PasswordProtection.PowerShell.csproj b/src/PasswordProtectionPS/Lithnet.ActiveDirectory.PasswordProtection.PowerShell.csproj
index 66a4855..12d08a1 100644
--- a/src/PasswordProtectionPS/Lithnet.ActiveDirectory.PasswordProtection.PowerShell.csproj
+++ b/src/PasswordProtectionPS/Lithnet.ActiveDirectory.PasswordProtection.PowerShell.csproj
@@ -174,7 +174,8 @@
PostBuildMacros;
if $(ConfigurationName) == EVSignedRelease ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)") else ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)")
-"C:\Program Files\Debugging Tools for Windows (x64)\symstore" add /f "$(TargetDir)*.pdb" /s \\localhost\symbols /t "$(ProjectName)" /v "@(VersionNumber)"
+
+"C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore" add /f "$(TargetDir)*.pdb" /s \\localhost\symbols /t "$(ProjectName)" /v "@(VersionNumber)"