Skip to content

Commit

Permalink
Changes to statically linked runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryannewington
ryannewington committed Aug 30, 2022
1 parent 6e2928e commit 6f7f34c
Show file tree
Hide file tree
Showing 21 changed files with 780 additions and 615 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,3 +263,4 @@ __pycache__/
*.bin
/src/enc_temp_folder/*
*.cab
/*/*-cache
10 changes: 5 additions & 5 deletions src/Installer/Installer.wixproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MicrosoftSignedRelease|x64' ">
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
<OutputPath>D:\dev\installers\lpp\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'EVSignedRelease|x64' ">
Expand Down Expand Up @@ -92,12 +92,12 @@
</Target>
<PropertyGroup>
<PostBuildEvent>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)"
%25BuildToolsPath%25\sign-ev.bat "$(TargetFileName)"
) else (
if $(ConfigurationName) == MicrosoftSignedRelease (
"C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)"
if $(ConfigurationName) == MicrosoftSignedRelease (
%25BuildToolsPath%25\sign-ev.bat "$(TargetFileName)"
) else (
"C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)"
%25BuildToolsPath%25\sign.bat "$(TargetFileName)"
)
)</PostBuildEvent>
</PropertyGroup>
Expand Down
453 changes: 227 additions & 226 deletions src/Installer/Product.wxs
View file

Large diffs are not rendered by default.

330 changes: 330 additions & 0 deletions src/Lithnet Password Protection for Active Directory.aip
View file

Large diffs are not rendered by default.

108 changes: 2 additions & 106 deletions src/Lithnet.ActiveDirectory.PasswordProtection.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.15
# Visual Studio Version 17
VisualStudioVersion = 17.2.32630.192
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PasswordFilter", "PasswordFilter\PasswordFilter.vcxproj", "{850894DF-B439-4DAA-A574-F7CFEA422A2F}"
EndProject
Expand All @@ -17,145 +17,41 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lithnet.ActiveDirectory.Pas
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
EVSignedRelease|Any CPU = EVSignedRelease|Any CPU
EVSignedRelease|x64 = EVSignedRelease|x64
EVSignedRelease|x86 = EVSignedRelease|x86
MicrosoftSignedRelease|Any CPU = MicrosoftSignedRelease|Any CPU
MicrosoftSignedRelease|x64 = MicrosoftSignedRelease|x64
MicrosoftSignedRelease|x86 = MicrosoftSignedRelease|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.Debug|Any CPU.ActiveCfg = Debug|Win32
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.Debug|x64.ActiveCfg = Debug|x64
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.Debug|x64.Build.0 = Debug|x64
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.Debug|x86.ActiveCfg = Debug|Win32
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.Debug|x86.Build.0 = Debug|Win32
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.EVSignedRelease|Any CPU.ActiveCfg = Release|Win32
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.EVSignedRelease|x64.ActiveCfg = EVSignedRelease|x64
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.EVSignedRelease|x64.Build.0 = EVSignedRelease|x64
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.EVSignedRelease|x86.ActiveCfg = Release|Win32
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.EVSignedRelease|x86.Build.0 = Release|Win32
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.MicrosoftSignedRelease|Any CPU.ActiveCfg = MicrosoftSignedRelease|Win32
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.MicrosoftSignedRelease|x64.ActiveCfg = MicrosoftSignedRelease|x64
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.MicrosoftSignedRelease|x86.ActiveCfg = MicrosoftSignedRelease|Win32
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.MicrosoftSignedRelease|x86.Build.0 = MicrosoftSignedRelease|Win32
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.Release|Any CPU.ActiveCfg = Release|Win32
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.Release|x64.ActiveCfg = Release|x64
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.Release|x64.Build.0 = Release|x64
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.Release|x86.ActiveCfg = Release|Win32
{850894DF-B439-4DAA-A574-F7CFEA422A2F}.Release|x86.Build.0 = Release|Win32
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Debug|Any CPU.ActiveCfg = Debug|x86
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Debug|x64.ActiveCfg = Debug|x64
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Debug|x64.Build.0 = Debug|x64
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Debug|x86.ActiveCfg = Debug|x86
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Debug|x86.Build.0 = Debug|x86
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.EVSignedRelease|Any CPU.ActiveCfg = Release|x86
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.EVSignedRelease|x64.ActiveCfg = EVSignedRelease|x64
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.EVSignedRelease|x64.Build.0 = EVSignedRelease|x64
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.EVSignedRelease|x86.ActiveCfg = Release|x86
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.EVSignedRelease|x86.Build.0 = Release|x86
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|Any CPU.ActiveCfg = Release|x64
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|Any CPU.Build.0 = Release|x64
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x64.ActiveCfg = MicrosoftSignedRelease|x64
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x64.Build.0 = MicrosoftSignedRelease|x64
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x86.ActiveCfg = Release|x86
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x86.Build.0 = Release|x86
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Release|Any CPU.ActiveCfg = Release|x86
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Release|x64.ActiveCfg = Release|x64
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Release|x64.Build.0 = Release|x64
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Release|x86.ActiveCfg = Release|x86
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Release|x86.Build.0 = Release|x86
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Debug|Any CPU.ActiveCfg = Debug|Win32
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Debug|x64.ActiveCfg = Debug|x64
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Debug|x86.ActiveCfg = Debug|Win32
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Debug|x86.Build.0 = Debug|Win32
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.EVSignedRelease|Any CPU.ActiveCfg = Release|Win32
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.EVSignedRelease|x64.ActiveCfg = Release|x64
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.EVSignedRelease|x86.ActiveCfg = Release|Win32
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.EVSignedRelease|x86.Build.0 = Release|Win32
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.MicrosoftSignedRelease|Any CPU.ActiveCfg = MicrosoftSignedRelease|Win32
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.MicrosoftSignedRelease|x64.ActiveCfg = MicrosoftSignedRelease|x64
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.MicrosoftSignedRelease|x86.ActiveCfg = MicrosoftSignedRelease|Win32
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.MicrosoftSignedRelease|x86.Build.0 = MicrosoftSignedRelease|Win32
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Release|Any CPU.ActiveCfg = Release|Win32
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Release|x64.ActiveCfg = Release|x64
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Release|x86.ActiveCfg = Release|Win32
{4A2761CD-3D07-42C7-8BB9-5CBF3E725D32}.Release|x86.Build.0 = Release|Win32
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Debug|x64.ActiveCfg = Debug|x64
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Debug|x64.Build.0 = Debug|x64
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Debug|x86.ActiveCfg = Debug|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Debug|x86.Build.0 = Debug|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.EVSignedRelease|Any CPU.ActiveCfg = Release|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.EVSignedRelease|Any CPU.Build.0 = Release|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.EVSignedRelease|x64.ActiveCfg = Release|x64
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.EVSignedRelease|x86.ActiveCfg = Release|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.EVSignedRelease|x86.Build.0 = Release|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.MicrosoftSignedRelease|Any CPU.ActiveCfg = MicrosoftSignedRelease|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.MicrosoftSignedRelease|Any CPU.Build.0 = MicrosoftSignedRelease|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.MicrosoftSignedRelease|x64.ActiveCfg = MicrosoftSignedRelease|x64
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.MicrosoftSignedRelease|x86.ActiveCfg = MicrosoftSignedRelease|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.MicrosoftSignedRelease|x86.Build.0 = MicrosoftSignedRelease|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Release|Any CPU.Build.0 = Release|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Release|x64.ActiveCfg = Release|x64
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Release|x86.ActiveCfg = Release|Any CPU
{B94AE2C5-72F3-40FC-BB70-C18B33D19A2B}.Release|x86.Build.0 = Release|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Debug|x64.ActiveCfg = Debug|x64
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Debug|x64.Build.0 = Debug|x64
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Debug|x86.ActiveCfg = Debug|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Debug|x86.Build.0 = Debug|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.EVSignedRelease|Any CPU.ActiveCfg = Release|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.EVSignedRelease|Any CPU.Build.0 = Release|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.EVSignedRelease|x64.ActiveCfg = EVSignedRelease|x64
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.EVSignedRelease|x64.Build.0 = EVSignedRelease|x64
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.EVSignedRelease|x86.ActiveCfg = Release|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.EVSignedRelease|x86.Build.0 = Release|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.MicrosoftSignedRelease|Any CPU.ActiveCfg = MicrosoftSignedRelease|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.MicrosoftSignedRelease|Any CPU.Build.0 = MicrosoftSignedRelease|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.MicrosoftSignedRelease|x64.ActiveCfg = EVSignedRelease|x64
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.MicrosoftSignedRelease|x64.Build.0 = EVSignedRelease|x64
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.MicrosoftSignedRelease|x86.ActiveCfg = MicrosoftSignedRelease|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.MicrosoftSignedRelease|x86.Build.0 = MicrosoftSignedRelease|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Release|Any CPU.Build.0 = Release|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Release|x64.ActiveCfg = Release|x64
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Release|x64.Build.0 = Release|x64
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Release|x86.ActiveCfg = Release|Any CPU
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.Release|x86.Build.0 = Release|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Debug|x64.ActiveCfg = Debug|x64
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Debug|x64.Build.0 = Debug|x64
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Debug|x86.ActiveCfg = Debug|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Debug|x86.Build.0 = Debug|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.EVSignedRelease|Any CPU.ActiveCfg = Release|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.EVSignedRelease|Any CPU.Build.0 = Release|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.EVSignedRelease|x64.ActiveCfg = EVSignedRelease|x64
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.EVSignedRelease|x64.Build.0 = EVSignedRelease|x64
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.EVSignedRelease|x86.ActiveCfg = Release|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.EVSignedRelease|x86.Build.0 = Release|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.MicrosoftSignedRelease|Any CPU.ActiveCfg = MicrosoftSignedRelease|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.MicrosoftSignedRelease|Any CPU.Build.0 = MicrosoftSignedRelease|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.MicrosoftSignedRelease|x64.ActiveCfg = EVSignedRelease|x64
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.MicrosoftSignedRelease|x64.Build.0 = EVSignedRelease|x64
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.MicrosoftSignedRelease|x86.ActiveCfg = MicrosoftSignedRelease|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.MicrosoftSignedRelease|x86.Build.0 = MicrosoftSignedRelease|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Release|Any CPU.Build.0 = Release|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Release|x64.ActiveCfg = Release|x64
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Release|x64.Build.0 = Release|x64
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Release|x86.ActiveCfg = Release|Any CPU
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
41 changes: 14 additions & 27 deletions src/ManagedUnitTests/ManagedUnitTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,6 @@
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
Expand All @@ -57,15 +39,6 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MicrosoftSignedRelease|AnyCPU' ">
<OutputPath>bin\LsaProtectedModeRelease\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MicrosoftSignedRelease|x64' ">
<OutputPath>bin\x64\MicrosoftSignedRelease\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
Expand Down Expand Up @@ -105,6 +78,20 @@
<Name>Lithnet.ActiveDirectory.PasswordProtection</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="TestData\english.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="TestData\test-good-hash.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="TestData\test-hash-too-short.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="TestData\test-hash-too-long.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
4 changes: 2 additions & 2 deletions src/ManagedUnitTests/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
[assembly: Guid("b94ae2c5-72f3-40fc-bb70-c18b33d19a2b")]

// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.7239.0")]
[assembly: AssemblyFileVersion("1.0.7239.0")]
[assembly: AssemblyVersion("1.0.7240.0")]
[assembly: AssemblyFileVersion("1.0.7240.0")]
1 change: 1 addition & 0 deletions src/ManagedUnitTests/TestData/english.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
abacus
1 change: 1 addition & 0 deletions src/ManagedUnitTests/TestData/test-good-hash.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0CB6948805F797BF2A82807973B89537
1 change: 1 addition & 0 deletions src/ManagedUnitTests/TestData/test-hash-too-long.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0CB6948805F797BF2A82807973B895371
1 change: 1 addition & 0 deletions src/ManagedUnitTests/TestData/test-hash-too-short.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0CB6948805F797BF2A82807973B8953
2 changes: 1 addition & 1 deletion src/ManagedUnitTests/TestHelpers.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace ManagedUnitTests
{
public static class TestHelpers
{
public static string TestStorePath = "D:\\pwnedpwds\\test";
public static string TestStorePath = @"D:\dev\lppstore";

public static void AssertFileIsExpectedSize(string rawFile, int size)
{
Expand Down
8 changes: 4 additions & 4 deletions src/ManagedUnitTests/V3StoreTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ protected override string GetPrefixFromHash(string hash)
[TestMethod]
public void TestGoodHashTypes()
{
Lithnet.ActiveDirectory.PasswordProtection.Store.ImportHexHashesFromSortedFile(this.Store, StoreType.Password, @"D:\pwnedpwds\raw\test-good-hash.txt", new CancellationToken());
Lithnet.ActiveDirectory.PasswordProtection.Store.ImportHexHashesFromSortedFile(this.Store, StoreType.Password, @"TestData\test-good-hash.txt", new CancellationToken());
}

[TestMethod]
public void TestHashTooLong()
{
try
{
Lithnet.ActiveDirectory.PasswordProtection.Store.ImportHexHashesFromSortedFile(this.Store, StoreType.Password, @"D:\pwnedpwds\raw\test-hash-too-long.txt", new CancellationToken());
Lithnet.ActiveDirectory.PasswordProtection.Store.ImportHexHashesFromSortedFile(this.Store, StoreType.Password, @"TestData\test-hash-too-long.txt", new CancellationToken());
Assert.Fail("Did not throw the expected exception");
}
catch (InvalidDataException)
Expand All @@ -56,7 +56,7 @@ public void TestHashTooShort()
{
try
{
Lithnet.ActiveDirectory.PasswordProtection.Store.ImportHexHashesFromSortedFile(this.Store, StoreType.Password, @"D:\pwnedpwds\raw\test-hash-too-short.txt", new CancellationToken());
Lithnet.ActiveDirectory.PasswordProtection.Store.ImportHexHashesFromSortedFile(this.Store, StoreType.Password, @"TestData\test-hash-too-short.txt", new CancellationToken());
Assert.Fail("Did not throw the expected exception");
}
catch (InvalidDataException)
Expand Down Expand Up @@ -85,7 +85,7 @@ public void TestAddNormalizedWordToStore()
[TestMethod]
public void AddEnglishDictionaryToNewStoreAndValidate()
{
string file = @"D:\pwnedpwds\raw\english.txt";
string file = @"TestData\english.txt";
string path = Path.Combine(TestHelpers.TestStorePath, Guid.NewGuid().ToString());
Directory.CreateDirectory(path);
CancellationToken ct = new CancellationToken();
Expand Down
1 change: 0 additions & 1 deletion src/NativeUnitTests/FilterTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ namespace NativeUnitTests

TEST_METHOD(TestBadPasswordv3Store)
{
TestBannedPassword();
}
};
}
Binary file modified src/PasswordFilter/PasswordFilter.rc
View file
Binary file not shown.
Loading

0 comments on commit 6f7f34c

Please sign in to comment.