Add Exchange 2016 CU3

CatchAllAgent.sln

@@ -43,6 +43,7 @@ Global
 		Ex2016 RTM|Any CPU = Ex2016 RTM|Any CPU
 		Ex2016 CU1|Any CPU = Ex2016 CU1|Any CPU
 		Ex2016 CU2|Any CPU = Ex2016 CU2|Any CPU
+		Ex2016 CU3|Any CPU = Ex2016 CU3|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -99,6 +100,8 @@ Global
 		{8778ECD1-55C8-48D4-9E15-617A738E2FB7}.Ex2016 CU1|Any CPU.Build.0 = Ex2016 CU1|Any CPU
 		{8778ECD1-55C8-48D4-9E15-617A738E2FB7}.Ex2016 CU2|Any CPU.ActiveCfg = Ex2016 CU2|Any CPU
 		{8778ECD1-55C8-48D4-9E15-617A738E2FB7}.Ex2016 CU2|Any CPU.Build.0 = Ex2016 CU2|Any CPU
+		{8778ECD1-55C8-48D4-9E15-617A738E2FB7}.Ex2016 CU3|Any CPU.ActiveCfg = Ex2016 CU3|Any CPU
+		{8778ECD1-55C8-48D4-9E15-617A738E2FB7}.Ex2016 CU3|Any CPU.Build.0 = Ex2016 CU3|Any CPU
 		{8778ECD1-55C8-48D4-9E15-617A738E2FB7}.Release|Any CPU.ActiveCfg = Ex2016 Preview|Any CPU
 		{8778ECD1-55C8-48D4-9E15-617A738E2FB7}.Release|Any CPU.Build.0 = Ex2016 Preview|Any CPU
 	EndGlobalSection

CatchAllAgent/CatchAllAgent.cs

@@ -44,7 +44,7 @@ public class CatchAllAgent : SmtpReceiveAgent
         /// The address book to be used for lookups.
         /// </summary>
         private AddressBook addressBook;
-#if EX_2016_PREV || EX_2016_RTM || EX_2016_CU1 || EX_2016_CU2
+#if EX_2016_PREV || EX_2016_RTM || EX_2016_CU1 || EX_2016_CU2 || EX_2016_CU3
         private static SmtpResponse rejectResponse = SmtpResponse.Create("550", "5.1.1", "Recipient rejected");
 #else
         private static SmtpResponse rejectResponse = new SmtpResponse("550", "5.1.1", "Recipient rejected");

CatchAllAgent/Exchange.CatchAll.csproj

@@ -18,6 +18,7 @@
     <TargetFrameworkVersion Condition="'$(Configuration)|$(Platform)' == 'Ex2010 SP3|AnyCPU'">v3.5</TargetFrameworkVersion>
     <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.0</TargetFrameworkVersion>
     <TargetFrameworkVersion Condition="'$(Configuration)|$(Platform)' == 'Ex2016 CU2|AnyCPU'">v4.5</TargetFrameworkVersion>
+	<TargetFrameworkVersion Condition="'$(Configuration)|$(Platform)' == 'Ex2016 CU3|AnyCPU'">v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -257,6 +258,15 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Ex2016 CU3|AnyCPU'">
+    <OutputPath>bin\Exchange 2016 CU3\</OutputPath>
+    <DefineConstants>TRACE;EX_2016_CU3</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Exchange.Data.Common" Condition="'$(Configuration)'=='Debug Ex2010 SP3'">
       <HintPath>..\Lib\Exchange 2010 SP3\Microsoft.Exchange.Data.Common.dll</HintPath>
@@ -424,6 +434,12 @@
     <Reference Include="Microsoft.Exchange.Data.Transport" Condition="'$(Configuration)'=='Ex2016 CU2'">
       <HintPath>..\Lib\Exchange 2016 CU2\Microsoft.Exchange.Data.Transport.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Exchange.Data.Common" Condition="'$(Configuration)'=='Ex2016 CU3'">
+      <HintPath>..\Lib\Exchange 2016 CU3\Microsoft.Exchange.Data.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Exchange.Data.Transport" Condition="'$(Configuration)'=='Ex2016 CU3'">
+      <HintPath>..\Lib\Exchange 2016 CU3\Microsoft.Exchange.Data.Transport.dll</HintPath>
+    </Reference>
     <Reference Include="mysql.data, Version=6.6.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Lib\mysql.data.dll</HintPath>

CatchAllAgent/Properties/AssemblyInfo.cs

@@ -33,6 +33,6 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.7")]
-[assembly: AssemblyFileVersion("1.6.7")]
+[assembly: AssemblyVersion("1.6.8")]
+[assembly: AssemblyFileVersion("1.6.8")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]

README.md

@@ -43,6 +43,7 @@ The .dll is compiled for .NET 3.5 (Exchange 2007 and 2010) or .NET 4 (Exchange 2
 * Exchange 2016 RTM     (15.1.225.42)
 * Exchange 2016 CU1     (15.1.396.30)
 * Exchange 2016 CU2     (15.1.466.34)
+* Exchange 2016 CU3	    (15.1.544.27)
 
 ## Installing the Receive Agent
 

install.ps1

@@ -23,6 +23,7 @@ write-host " *** Exchange CatchAll Install Script ***" -f "blue"
 # Exchange 2016 RTM	     (15.1.225.42)
 # Exchange 2016 CU1	     (15.1.396.30)
 # Exchange 2016 CU2	     (15.1.466.34)
+# Exchange 2016 CU3		 (15.1.544.27)
 write-host "Detecting Exchange version ... " -f "cyan"
 $hostname = hostname
 $exchserver = Get-ExchangeServer -Identity $hostname
@@ -74,8 +75,9 @@ if (($exchserver.admindisplayversion).major -eq 8 -and ($exchserver.admindisplay
 	$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 {
+} elseif (($exchserver.admindisplayversion).major -eq 15 -and ($exchserver.admindisplayversion).minor -eq 1 -and ($exchserver.admindisplayversion).build -eq 544) {
+	$EXVER="Exchange 2016 CU3"
+} else {
 	throw "The exchange version is not yet supported: " + $exchserver.admindisplayversion
 }