Skip to content

Commit

Permalink
Merge pull request #164 from sidgms/master
Browse files Browse the repository at this point in the history 
Add Exchange 2013 SP1 CU14
  • Loading branch information
@Pro
Pro authored Oct 26, 2016
2 parents 7679592 + 58e8ec7 commit 8bea701
Show file tree
Hide file tree
Showing 9 changed files with 10,913 additions and 15 deletions.
8 changes: 6 additions & 2 deletions DkimSigner.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Global
Ex2013 SP1 CU11|Any CPU = Ex2013 SP1 CU11|Any CPU
Ex2013 SP1 CU12|Any CPU = Ex2013 SP1 CU12|Any CPU
Ex2013 SP1 CU13|Any CPU = Ex2013 SP1 CU13|Any CPU
Ex2013 SP1 CU14|Any CPU = Ex2013 SP1 CU14|Any CPU
Ex2013 SP1 CU4|Any CPU = Ex2013 SP1 CU4|Any CPU
Ex2013 SP1 CU5|Any CPU = Ex2013 SP1 CU5|Any CPU
Ex2013 SP1 CU6|Any CPU = Ex2013 SP1 CU6|Any CPU
Expand Down Expand Up @@ -70,8 +71,10 @@ Global
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013 SP1 CU11|Any CPU.Build.0 = Ex2013 SP1 CU11|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013 SP1 CU12|Any CPU.ActiveCfg = Ex2013 SP1 CU12|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013 SP1 CU12|Any CPU.Build.0 = Ex2013 SP1 CU12|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013 SP1 CU13|Any CPU.ActiveCfg = Ex2013 SP1 CU12|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013 SP1 CU13|Any CPU.Build.0 = Ex2013 SP1 CU12|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013 SP1 CU13|Any CPU.ActiveCfg = Ex2013 SP1 CU13|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013 SP1 CU13|Any CPU.Build.0 = Ex2013 SP1 CU13|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013 SP1 CU14|Any CPU.ActiveCfg = Ex2013 SP1 CU14|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013 SP1 CU14|Any CPU.Build.0 = Ex2013 SP1 CU14|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013 SP1 CU4|Any CPU.ActiveCfg = Ex2013 SP1 CU4|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013 SP1 CU4|Any CPU.Build.0 = Ex2013 SP1 CU4|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2013 SP1 CU5|Any CPU.ActiveCfg = Ex2013 SP1 CU5|Any CPU
Expand Down Expand Up @@ -114,6 +117,7 @@ Global
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2013 SP1 CU11|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2013 SP1 CU12|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2013 SP1 CU13|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2013 SP1 CU14|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2013 SP1 CU4|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2013 SP1 CU5|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2013 SP1 CU6|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
Binary file added Lib/Exchange 2013 SP1 CU14/Microsoft.Exchange.Data.Common.dll
View file
Binary file not shown.
9,082 changes: 9,082 additions & 0 deletions Lib/Exchange 2013 SP1 CU14/Microsoft.Exchange.Data.Common.xml
View file

Large diffs are not rendered by default.

Binary file added Lib/Exchange 2013 SP1 CU14/Microsoft.Exchange.Data.Transport.dll
View file
Binary file not shown.
1,792 changes: 1,792 additions & 0 deletions Lib/Exchange 2013 SP1 CU14/Microsoft.Exchange.Data.Transport.xml
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Src/Configuration.DkimSigner/Constants.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public static string DkimSignerPath
{"15.0.1156.6", "Exchange 2013 SP1 CU11"},
{"15.0.1178.4", "Exchange 2013 SP1 CU12"},
{"15.0.1210.3", "Exchange 2013 SP1 CU13"},
{"15.1.225.17", "Exchange 2016 Preview"},
{"15.0.1236.3", "Exchange 2013 SP1 CU14"},
{"15.1.225.17", "Exchange 2016 Preview"},
{"15.1.225.42", "Exchange 2016 RTM"},
{"15.1.396.30", "Exchange 2016 CU1"},
{"15.1.466.34", "Exchange 2016 CU2"},
Expand Down
15 changes: 15 additions & 0 deletions Src/Exchange.DkimSigner/Exchange.DkimSigner.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,15 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Ex2013 SP1 CU14|AnyCPU'">
<OutputPath>bin\Exchange 2013 SP1 CU14\</OutputPath>
<DefineConstants>TRACE;EX_2013_SP1_CU14</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Ex2016 Preview|AnyCPU'">
<OutputPath>bin\Exchange 2016 Preview\</OutputPath>
<DefineConstants>TRACE;EX_2016_PREV</DefineConstants>
Expand Down Expand Up @@ -406,6 +415,12 @@
<Reference Include="Microsoft.Exchange.Data.Transport" Condition="'$(Configuration)'=='Ex2013 SP1 CU13'">
<HintPath>..\..\Lib\Exchange 2013 SP1 CU13\Microsoft.Exchange.Data.Transport.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Exchange.Data.Common" Condition="'$(Configuration)'=='Ex2013 SP1 CU14'">
<HintPath>..\..\Lib\Exchange 2013 SP1 CU14\Microsoft.Exchange.Data.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Exchange.Data.Transport" Condition="'$(Configuration)'=='Ex2013 SP1 CU14'">
<HintPath>..\..\Lib\Exchange 2013 SP1 CU14\Microsoft.Exchange.Data.Transport.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Exchange.Data.Common" Condition="'$(Configuration)'=='Ex2016 Preview'">
<HintPath>..\..\Lib\Exchange 2016 Preview\Microsoft.Exchange.Data.Common.dll</HintPath>
</Reference>
Expand Down
1 change: 1 addition & 0 deletions coverity.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<MSBuild Projects="DkimSigner.sln" Properties="Configuration=Ex2013 SP1 CU11;Platform=Any CPU" />
<MSBuild Projects="DkimSigner.sln" Properties="Configuration=Ex2013 SP1 CU12;Platform=Any CPU" />
<MSBuild Projects="DkimSigner.sln" Properties="Configuration=Ex2013 SP1 CU13;Platform=Any CPU" />
<MSBuild Projects="DkimSigner.sln" Properties="Configuration=Ex2013 SP1 CU14;Platform=Any CPU" />
<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" />
Expand Down
27 changes: 15 additions & 12 deletions install.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ write-host "*** Exchange DkimSigner Install Script ***" -f "blue"
# Exchange 2013 SP1 CU11 (15.0.1156.6)
# Exchange 2013 SP1 CU12 (15.0.1178.4)
# Exchange 2013 SP1 CU13 (15.0.1210.3)
# Exchange 2013 SP1 CU14 (15.0.1236.3)
# Exchange 2016 Preview (15.1.225.17)
# Exchange 2016 RTM (15.1.225.42)
# Exchange 2016 CU1 (15.1.396.30)
Expand All @@ -27,7 +28,7 @@ write-host "*** Exchange DkimSigner Install Script ***" -f "blue"
write-host "Detecting Exchange version ... " -f "cyan"
$hostname = hostname
$exchserver = Get-ExchangeServer -Identity $hostname
$EXDIR="C:\Program Files\Exchange DkimSigner"
$EXDIR="C:\Program Files\Exchange DkimSigner"
$EXVER="Unknown"
if (($exchserver.admindisplayversion).major -eq 8 -and ($exchserver.admindisplayversion).minor -eq 3) {
$EXVER="Exchange 2007 SP3"
Expand Down Expand Up @@ -67,6 +68,8 @@ if (($exchserver.admindisplayversion).major -eq 8 -and ($exchserver.admindisplay
$EXVER="Exchange 2013 SP1 CU12"
} elseif (($exchserver.admindisplayversion).major -eq 15 -and ($exchserver.admindisplayversion).minor -eq 0 -and ($exchserver.admindisplayversion).build -eq 1210) {
$EXVER="Exchange 2013 SP1 CU13"
} elseif (($exchserver.admindisplayversion).major -eq 15 -and ($exchserver.admindisplayversion).minor -eq 0 -and ($exchserver.admindisplayversion).build -eq 1236) {
$EXVER="Exchange 2013 SP1 CU14"
} elseif (($exchserver.admindisplayversion).major -eq 15 -and ($exchserver.admindisplayversion).minor -eq 1 -and ($exchserver.admindisplayversion).build -eq 225 -and ($exchserver.admindisplayversion).revision -eq 17) {
$EXVER="Exchange 2016 Preview"
} elseif (($exchserver.admindisplayversion).major -eq 15 -and ($exchserver.admindisplayversion).minor -eq 1 -and ($exchserver.admindisplayversion).build -eq 225 -and ($exchserver.admindisplayversion).revision -eq 42) {
Expand Down Expand Up @@ -95,10 +98,10 @@ if (Test-Path "HKLM:\SYSTEM\CurrentControlSet\Services\EventLog\Application\Exch
}


net stop MSExchangeTransport
net stop MSExchangeTransport

write-host "Creating install directory: '$EXDIR' and copying data from '$SRCDIR'" -f "green"
new-item -Type Directory -path $EXDIR -ErrorAction SilentlyContinue
new-item -Type Directory -path $EXDIR -ErrorAction SilentlyContinue

copy-item "$SRCDIR\*" $EXDIR -force
copy-item "Src\Configuration.DkimSigner\bin\Release\*" $EXDIR -force
Expand All @@ -119,11 +122,11 @@ read-host "Now open '$EXDIR\Configuration.DkimSigner.exe' to configure Exchange
write-host "Registering agent" -f "green"
Install-TransportAgent -Name "Exchange DkimSigner" -TransportAgentFactory "Exchange.DkimSigner.DkimSigningRoutingAgentFactory" -AssemblyPath "$EXDIR\ExchangeDkimSigner.dll"

write-host "Enabling agent" -f "green"
enable-transportagent -Identity "Exchange DkimSigner"
get-transportagent
write-host "Starting Edge Transport" -f "green"
net start MSExchangeTransport
write-host "Installation complete. Check previous outputs for any errors!" -f "yellow"
write-host "Enabling agent" -f "green"
enable-transportagent -Identity "Exchange DkimSigner"
get-transportagent

write-host "Starting Edge Transport" -f "green"
net start MSExchangeTransport

write-host "Installation complete. Check previous outputs for any errors!" -f "yellow"

0 comments on commit 8bea701

Please sign in to comment.