Exchange 2016 CU2 Commit

Updated to support CU2 (15.1.466.34)

DkimSigner.sln

@@ -31,9 +31,10 @@ Global
 		Ex2013 SP1 CU8|Any CPU = Ex2013 SP1 CU8|Any CPU
 		Ex2013 SP1 CU9|Any CPU = Ex2013 SP1 CU9|Any CPU
 		Ex2013|Any CPU = Ex2013|Any CPU
+		Ex2016 CU1|Any CPU = Ex2016 CU1|Any CPU
+		Ex2016 CU2|Any CPU = Ex2016 CU2|Any CPU
 		Ex2016 Preview|Any CPU = Ex2016 Preview|Any CPU
 		Ex2016 RTM|Any CPU = Ex2016 RTM|Any CPU
-		Ex2016 CU1|Any CPU = Ex2016 CU1|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -81,12 +82,13 @@ Global
 		{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013 SP1 CU9|Any CPU.Build.0 = Ex2013 SP1 CU9|Any CPU
 		{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013|Any CPU.ActiveCfg = Ex2013|Any CPU
 		{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013|Any CPU.Build.0 = Ex2013|Any CPU
+		{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 CU1|Any CPU.ActiveCfg = Ex2016 CU1|Any CPU
+		{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 CU1|Any CPU.Build.0 = Ex2016 CU1|Any CPU
+		{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 CU2|Any CPU.ActiveCfg = Ex2016 CU1|Any CPU
 		{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 Preview|Any CPU.ActiveCfg = Ex2016 Preview|Any CPU
 		{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 Preview|Any CPU.Build.0 = Ex2016 Preview|Any CPU
 		{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 RTM|Any CPU.ActiveCfg = Ex2016 RTM|Any CPU
 		{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 RTM|Any CPU.Build.0 = Ex2016 RTM|Any CPU
-		{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 CU1|Any CPU.ActiveCfg = Ex2016 CU1|Any CPU
-		{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 CU1|Any CPU.Build.0 = Ex2016 CU1|Any CPU
 		{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Release|Any CPU.ActiveCfg = Ex2016 CU1|Any CPU
 		{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Debug Ex2010 SP3|Any CPU.ActiveCfg = Release|Any CPU
 		{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Debug Ex2013 SP1 CU9|Any CPU.ActiveCfg = Release|Any CPU
@@ -111,9 +113,10 @@ Global
 		{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2013 SP1 CU8|Any CPU.ActiveCfg = Release|Any CPU
 		{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2013 SP1 CU9|Any CPU.ActiveCfg = Release|Any CPU
 		{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2013|Any CPU.ActiveCfg = Release|Any CPU
+		{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2016 CU1|Any CPU.ActiveCfg = Release|Any CPU
+		{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2016 CU2|Any CPU.ActiveCfg = Release|Any CPU
 		{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2016 Preview|Any CPU.ActiveCfg = Release|Any CPU
 		{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2016 RTM|Any CPU.ActiveCfg = Release|Any CPU
-		{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2016 CU1|Any CPU.ActiveCfg = Release|Any CPU
 		{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

README.md

@@ -1,4 +1,4 @@
-Exchange DKIM Signer [![Build Status](https://travis-ci.org/Pro/dkim-exchange.png?branch=master)](https://travis-ci.org/Pro/dkim-exchange) [![Coverity Scan Build Status](https://scan.coverity.com/projects/3482/badge.svg)](https://scan.coverity.com/projects/3482)
+Exchange DKIM Signer [![Build Status](https://travis-ci.org/Pro/dkim-exchange.png?branch=master)](https://travis-ci.org/Pro/dkim-exchange) [![Coverity Scan Build Status](https://scan.coverity.com/projects/3482/badge.svg)](https://scan.coverity.com/projects/3482)
 =============
 
 DKIM Signing Agent for Microsoft Exchange Server. This agent signs outgoing emails from your Exchange Server according to the DKIM specifications. It uses the DKIM signer implementation from the awesome [MimeKit](https://github.com/jstedfast/MimeKit) project.
@@ -34,6 +34,7 @@ The DKIM Signer Agent [ExchangeDkimSigner.dll] is compiled for .NET 3.5 (Exchang
 * Exchange 2016 Preview (15.1.225.17)
 * Exchange 2016 RTM     (15.1.225.42)
 * Exchange 2016 CU1     (15.1.396.30)
+* Exchange 2016 CU2 	(15.1.466.34)
 
 ## Requirements
 

Src/Configuration.DkimSigner/Constants.cs

@@ -44,7 +44,8 @@ public static string DkimSignerPath
             {"15.0.1178.4", "Exchange 2013 SP1 CU12"},
             {"15.1.225.17", "Exchange 2016 Preview"},
             {"15.1.225.42", "Exchange 2016 RTM"},
-            {"15.1.396.30", "Exchange 2016 CU1"}
+            {"15.1.396.30", "Exchange 2016 CU1"},
+            {"15.1.466.34", "Exchange 2016 CU2"}
         };
     }
 }

Src/Exchange.DkimSigner/Exchange.DkimSigner.csproj

@@ -237,6 +237,15 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Ex2016 CU2|AnyCPU'">
+    <OutputPath>bin\Exchange 2016 CU2\</OutputPath>
+    <DefineConstants>TRACE;EX_2016_CU2</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="BouncyCastle">
       <HintPath>..\..\packages\MimeKit.1.2.21\lib\net40\BouncyCastle.dll</HintPath>
@@ -389,6 +398,12 @@
     <Reference Include="Microsoft.Exchange.Data.Transport" Condition="'$(Configuration)'=='Ex2016 CU1'">
       <HintPath>..\..\Lib\Exchange 2016 CU1\Microsoft.Exchange.Data.Transport.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Exchange.Data.Common" Condition="'$(Configuration)'=='Ex2016 CU2'">
+      <HintPath>..\..\Lib\Exchange 2016 CU2\Microsoft.Exchange.Data.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Exchange.Data.Transport" Condition="'$(Configuration)'=='Ex2016 CU2'">
+      <HintPath>..\..\Lib\Exchange 2016 CU2\Microsoft.Exchange.Data.Transport.dll</HintPath>
+    </Reference>
     <Reference Include="MimeKit, Version=1.2.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
       <HintPath>..\..\packages\MimeKit.1.2.21\lib\net40\MimeKit.dll</HintPath>
       <Private>True</Private>

Src/Exchange.DkimSigner/Properties/AssemblyInfo.cs

@@ -16,12 +16,12 @@
 #endif
 [assembly: AssemblyCompany("github.com/Pro")]
 [assembly: AssemblyProduct("Exchange DKIM")]
-[assembly: AssemblyCopyright("Gnu GPL 3 by Stefan Profanter © 2013")]
+[assembly: AssemblyCopyright("Gnu GPL 3 by Stefan Profanter © 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("FA0D7628-702A-445B-9C78-887874B212BA")]
-[assembly: AssemblyVersion("3.0.3")]
+[assembly: AssemblyVersion("3.0.4")]
 [assembly: CLSCompliant(false)]
 [assembly: NeutralResourcesLanguage("en-US")]
-[assembly: AssemblyFileVersionAttribute("3.0.3")]
+[assembly: AssemblyFileVersionAttribute("3.0.4")]

coverity.proj

@@ -27,6 +27,7 @@
 	<MSBuild Projects="DkimSigner.sln" Properties="Configuration=Ex2016 Preview;Platform=Any CPU" />
 	<MSBuild Projects="DkimSigner.sln" Properties="Configuration=Ex2016 RTM;Platform=Any CPU" />
 	<MSBuild Projects="DkimSigner.sln" Properties="Configuration=Ex2016 CU1;Platform=Any CPU" />
+	<MSBuild Projects="DkimSigner.sln" Properties="Configuration=Ex2016 CU2;Platform=Any CPU" />
   </Target>
 
  </Project>

install.ps1

@@ -21,6 +21,7 @@ write-host "*** Exchange DkimSigner Install Script ***" -f "blue"
 # Exchange 2016 Preview	 (15.1.225.17)
 # Exchange 2016 RTM	     (15.1.225.42)
 # Exchange 2016 CU1	     (15.1.396.30)
+# Exchange 2016 CU2	     (15.1.466.34)
 write-host "Detecting Exchange version ... " -f "cyan"
 $hostname = hostname
 $exchserver = Get-ExchangeServer -Identity $hostname
@@ -68,6 +69,8 @@ if (($exchserver.admindisplayversion).major -eq 8 -and ($exchserver.admindisplay
 	$EXVER="Exchange 2016 RTM"
 } elseif (($exchserver.admindisplayversion).major -eq 15 -and ($exchserver.admindisplayversion).minor -eq 1 -and ($exchserver.admindisplayversion).build -eq 396) {
 	$EXVER="Exchange 2016 CU1"
+} elseif (($exchserver.admindisplayversion).major -eq 15 -and ($exchserver.admindisplayversion).minor -eq 1 -and ($exchserver.admindisplayversion).build -eq 466) {
+	$EXVER="Exchange 2016 CU2"
 }
 else {
 	throw "The exchange version is not yet supported: " + $exchserver.admindisplayversion