Skip to content

Commit

Permalink
Updates build configurations to support EV certs
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryannewington
ryannewington committed Jul 23, 2019
1 parent ec4a988 commit 5456e98
Show file tree
Hide file tree
Showing 10 changed files with 190 additions and 19 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,3 +262,4 @@ __pycache__/
*.dll
*.bin
/src/enc_temp_folder/*
*.cab
9 changes: 7 additions & 2 deletions src/Installer/Installer.wixproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'LsaProtectedModeRelease|x64' ">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MicrosoftSignedRelease|x64' ">
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'EVSignedRelease|x64' ">
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
Expand Down Expand Up @@ -85,8 +89,9 @@
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
</Target>

<PropertyGroup>
<PostBuildEvent>"C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)"</PostBuildEvent>
<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)") else ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)")</PostBuildEvent>
</PropertyGroup>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
46 changes: 40 additions & 6 deletions src/Lithnet.ActiveDirectory.PasswordProtection.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ Global
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
Expand All @@ -33,6 +36,11 @@ Global
{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
Expand All @@ -46,10 +54,15 @@ Global
{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 = Release|x64
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x64.Build.0 = Release|x64
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x64.ActiveCfg = EVSignedRelease|x64
{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x64.Build.0 = EVSignedRelease|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
Expand All @@ -61,6 +74,10 @@ Global
{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
Expand All @@ -75,6 +92,11 @@ Global
{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
Expand All @@ -91,10 +113,16 @@ Global
{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 = MicrosoftSignedRelease|x64
{61DF881D-34FE-462B-AAA8-A56CD4DFF287}.MicrosoftSignedRelease|x64.Build.0 = MicrosoftSignedRelease|x64
{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
Expand All @@ -109,10 +137,16 @@ Global
{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 = MicrosoftSignedRelease|x64
{5F3D1518-5EDC-4552-8A65-19C20037EF3E}.MicrosoftSignedRelease|x64.Build.0 = MicrosoftSignedRelease|x64
{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
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.7123.41695")]
[assembly: AssemblyFileVersion("1.0.7123.41695")]
[assembly: AssemblyVersion("1.0.7143.16175")]
[assembly: AssemblyFileVersion("1.0.7143.16175")]
Binary file modified src/PasswordFilter/PasswordFilter.rc
View file
Binary file not shown.
Loading

0 comments on commit 5456e98

Please sign in to comment.