Skip to content

Commit

Permalink
Merge pull request #346 from MisterSausage/v3.3.4
Browse files Browse the repository at this point in the history 
Add support for Exchange 2016 CU22 and Exchange 2019 CU11
  • Loading branch information
@DJBenson
DJBenson committed Oct 12, 2021
2 parents e00ca6d + 6188f10 commit 9678565
Show file tree
Hide file tree
Showing 287 changed files with 147,118 additions and 510 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
View file
Expand Up @@ -62,6 +62,7 @@ script:
- xbuild DkimSigner.sln /p:Configuration="Ex2016 CU19"
- xbuild DkimSigner.sln /p:Configuration="Ex2016 CU20"
- xbuild DkimSigner.sln /p:Configuration="Ex2016 CU21"
- xbuild DkimSigner.sln /p:Configuration="Ex2016 CU22"
- xbuild DkimSigner.sln /p:Configuration="Ex2016 Preview"
- xbuild DkimSigner.sln /p:Configuration="Ex2016 RTM"
- xbuild DkimSigner.sln /p:Configuration="Ex2019 Preview"
Expand All @@ -76,6 +77,7 @@ script:
- xbuild DkimSigner.sln /p:Configuration="Ex2019 CU8"
- xbuild DkimSigner.sln /p:Configuration="Ex2019 CU9"
- xbuild DkimSigner.sln /p:Configuration="Ex2019 CU10"
- xbuild DkimSigner.sln /p:Configuration="Ex2019 CU11"
- xbuild DkimSigner.sln /p:Configuration="Release"

#addons:
Expand Down
8 changes: 8 additions & 0 deletions DkimSigner.sln
View file
Expand Up @@ -57,6 +57,7 @@ Global
Ex2016 CU2|Any CPU = Ex2016 CU2|Any CPU
Ex2016 CU20|Any CPU = Ex2016 CU20|Any CPU
Ex2016 CU21|Any CPU = Ex2016 CU21|Any CPU
Ex2016 CU22|Any CPU = Ex2016 CU22|Any CPU
Ex2016 CU3|Any CPU = Ex2016 CU3|Any CPU
Ex2016 CU4|Any CPU = Ex2016 CU4|Any CPU
Ex2016 CU5|Any CPU = Ex2016 CU5|Any CPU
Expand All @@ -76,6 +77,7 @@ Global
Ex2019 CU8|Any CPU = Ex2019 CU8|Any CPU
Ex2019 CU9|Any CPU = Ex2019 CU9|Any CPU
Ex2019 CU10|Any CPU = Ex2019 CU10|Any CPU
Ex2019 CU11|Any CPU = Ex2019 CU11|Any CPU
Ex2019 Preview|Any CPU = Ex2019 Preview|Any CPU
Ex2019 RTM|Any CPU = Ex2019 RTM|Any CPU
Release|Any CPU = Release|Any CPU
Expand Down Expand Up @@ -177,6 +179,8 @@ Global
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 CU20|Any CPU.Build.0 = Ex2016 CU20|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 CU21|Any CPU.ActiveCfg = Ex2016 CU21|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 CU21|Any CPU.Build.0 = Ex2016 CU21|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 CU22|Any CPU.ActiveCfg = Ex2016 CU22|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 CU22|Any CPU.Build.0 = Ex2016 CU22|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 CU3|Any CPU.ActiveCfg = Ex2016 CU3|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 CU3|Any CPU.Build.0 = Ex2016 CU3|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2016 CU4|Any CPU.ActiveCfg = Ex2016 CU4|Any CPU
Expand Down Expand Up @@ -215,6 +219,8 @@ Global
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2019 CU9|Any CPU.Build.0 = Ex2019 CU9|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2019 CU10|Any CPU.ActiveCfg = Ex2019 CU10|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2019 CU10|Any CPU.Build.0 = Ex2019 CU10|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2019 CU11|Any CPU.ActiveCfg = Ex2019 CU11|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2019 CU11|Any CPU.Build.0 = Ex2019 CU11|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2019 Preview|Any CPU.ActiveCfg = Ex2019 Preview|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2019 Preview|Any CPU.Build.0 = Ex2019 Preview|Any CPU
{3AF0EAB4-6135-4908-A659-5E3C974E4718}.Ex2019 RTM|Any CPU.ActiveCfg = Ex2019 RTM|Any CPU
Expand Down Expand Up @@ -269,6 +275,7 @@ Global
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2016 CU2|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2016 CU20|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2016 CU21|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2016 CU22|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2016 CU3|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2016 CU4|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2016 CU5|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -288,6 +295,7 @@ Global
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2019 CU8|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2019 CU9|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2019 CU10|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2019 CU11|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2019 Preview|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Ex2019 RTM|Any CPU.ActiveCfg = Release|Any CPU
{8AA10740-EC1C-43D9-9BB2-9DF3F82A214F}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
Binary file added Lib/Exchange 2016 CU22/Microsoft.Exchange.Data.Common.dll
View file
Binary file not shown.
Binary file added Lib/Exchange 2016 CU22/Microsoft.Exchange.Data.Transport.dll
View file
Binary file not shown.
9,082 changes: 9,082 additions & 0 deletions Lib/Exchange 2016 CU22/microsoft.exchange.data.common.xml
View file

Large diffs are not rendered by default.

1,792 changes: 1,792 additions & 0 deletions Lib/Exchange 2016 CU22/microsoft.exchange.data.transport.xml
View file

Large diffs are not rendered by default.

Binary file added Lib/Exchange 2019 CU11/Microsoft.Exchange.Data.Common.dll
View file
Binary file not shown.
Binary file added Lib/Exchange 2019 CU11/Microsoft.Exchange.Data.Transport.dll
View file
Binary file not shown.
9,082 changes: 9,082 additions & 0 deletions Lib/Exchange 2019 CU11/microsoft.exchange.data.common.xml
View file

Large diffs are not rendered by default.

1,792 changes: 1,792 additions & 0 deletions Lib/Exchange 2019 CU11/microsoft.exchange.data.transport.xml
View file

Large diffs are not rendered by default.

75 changes: 38 additions & 37 deletions Src/Configuration.DkimSigner/Constants.cs
View file
Expand Up @@ -24,13 +24,12 @@ public static string DkimSignerPath

public static readonly Dictionary<string, string> DkimSignerVersionDirectory = new Dictionary<string, string>
{
// RU21 has newer .dlls than older SP3
{"8.3.298.", "Exchange 2007 SP3 RU21"},
{"8.3.", "Exchange 2007 SP3"},
{"14.0.", "Exchange 2010"},
{"14.1.", "Exchange 2010 SP1"},
{"14.2.", "Exchange 2010 SP2"},
{"14.3.", "Exchange 2010 SP3"},
{"8.3.298.*", "Exchange 2007 SP3 RU21"},
{"8.3.*", "Exchange 2007 SP3"},
{"14.0.*", "Exchange 2010"},
{"14.1.*", "Exchange 2010 SP1"},
{"14.2.*", "Exchange 2010 SP2"},
{"14.3.*", "Exchange 2010 SP3"},
{"15.0.516.32", "Exchange 2013"},
{"15.0.620.29", "Exchange 2013 CU1"},
{"15.0.712.24", "Exchange 2013 CU2"},
Expand All @@ -52,9 +51,9 @@ public static string DkimSignerPath
{"15.0.1347.2", "Exchange 2013 SP1 CU18"},
{"15.0.1365.1", "Exchange 2013 SP1 CU19"},
{"15.0.1367.3", "Exchange 2013 SP1 CU20"},
{"15.0.1395.4", "Exchange 2013 SP1 CU21"},
{"15.0.1473.3", "Exchange 2013 SP1 CU22"},
{"15.0.1497.2", "Exchange 2013 SP1 CU23"},
{"15.0.1395.*", "Exchange 2013 SP1 CU21"},
{"15.0.1473.*", "Exchange 2013 SP1 CU22"},
{"15.0.1497.*", "Exchange 2013 SP1 CU23"},
{"15.1.225.17", "Exchange 2016 Preview"},
{"15.1.225.42", "Exchange 2016 RTM"},
{"15.1.396.30", "Exchange 2016 CU1"},
Expand All @@ -64,32 +63,34 @@ public static string DkimSignerPath
{"15.1.845.34", "Exchange 2016 CU5"},
{"15.1.1034.26", "Exchange 2016 CU6"},
{"15.1.1261.35", "Exchange 2016 CU7"},
{"15.1.1415.2", "Exchange 2016 CU8"},
{"15.1.1466.3", "Exchange 2016 CU9"},
{"15.1.1531.3", "Exchange 2016 CU10"},
{"15.1.1591.10", "Exchange 2016 CU11"},
{"15.1.1713.5", "Exchange 2016 CU12"},
{"15.1.1779.2", "Exchange 2016 CU13"},
{"15.1.1847.3", "Exchange 2016 CU14"},
{"15.1.1913.5", "Exchange 2016 CU15"},
{"15.1.1979.3", "Exchange 2016 CU16"},
{"15.1.2044.4", "Exchange 2016 CU17"},
{"15.1.2106.2", "Exchange 2016 CU18"},
{"15.1.2176.2", "Exchange 2016 CU19"},
{"15.1.2242.4", "Exchange 2016 CU20"},
{"15.1.2308.8", "Exchange 2016 CU21"},
{"15.2.196.0", "Exchange 2019 Preview"},
{"15.2.221.12", "Exchange 2019 RTM"},
{"15.2.330.5", "Exchange 2019 CU1"},
{"15.2.397.3", "Exchange 2019 CU2"},
{"15.2.464.5", "Exchange 2019 CU3"},
{"15.2.529.5", "Exchange 2019 CU4"},
{"15.2.595.3", "Exchange 2019 CU5"},
{"15.2.659.4", "Exchange 2019 CU6"},
{"15.2.721.2", "Exchange 2019 CU7"},
{"15.2.792.3", "Exchange 2019 CU8"},
{"15.2.858.5", "Exchange 2019 CU9"},
{"15.2.922.7", "Exchange 2019 CU10"}
{"15.1.1415.*", "Exchange 2016 CU8"},
{"15.1.1466.*", "Exchange 2016 CU9"},
{"15.1.1531.*", "Exchange 2016 CU10"},
{"15.1.1591.*", "Exchange 2016 CU11"},
{"15.1.1713.*", "Exchange 2016 CU12"},
{"15.1.1779.*", "Exchange 2016 CU13"},
{"15.1.1847.*", "Exchange 2016 CU14"},
{"15.1.1913.*", "Exchange 2016 CU15"},
{"15.1.1979.*", "Exchange 2016 CU16"},
{"15.1.2044.*", "Exchange 2016 CU17"},
{"15.1.2106.*", "Exchange 2016 CU18"},
{"15.1.2176.*", "Exchange 2016 CU19"},
{"15.1.2242.*", "Exchange 2016 CU20"},
{"15.1.2308.*", "Exchange 2016 CU21"},
{"15.1.2375.*", "Exchange 2016 CU22"},
{"15.2.196.*", "Exchange 2019 Preview"},
{"15.2.221.*", "Exchange 2019 RTM"},
{"15.2.330.*", "Exchange 2019 CU1"},
{"15.2.397.*", "Exchange 2019 CU2"},
{"15.2.464.*", "Exchange 2019 CU3"},
{"15.2.529.*", "Exchange 2019 CU4"},
{"15.2.595.*", "Exchange 2019 CU5"},
{"15.2.659.*", "Exchange 2019 CU6"},
{"15.2.721.*", "Exchange 2019 CU7"},
{"15.2.792.*", "Exchange 2019 CU8"},
{"15.2.858.*", "Exchange 2019 CU9"},
{"15.2.922.*", "Exchange 2019 CU10"},
{"15.2.986.*", "Exchange 2019 CU11"}
};
}
}
}
10 changes: 5 additions & 5 deletions Src/Configuration.DkimSigner/ExchangeTransportServiceWindow.cs
View file
Expand Up @@ -84,15 +84,15 @@ private void RefreshTransportServiceAgents()

private void RefreshMoveButtons(bool isEnabled)
{
if (!isEnabled)
if (isEnabled && (dgvTransportServiceAgents.SelectedRows.Count >= 1))
{
btMoveUp.Enabled = false;
btMoveDown.Enabled = false;
btMoveUp.Enabled = dgvTransportServiceAgents.RowCount > 0 && dgvTransportServiceAgents.SelectedRows[0].Cells["dgvcName"].RowIndex > 0;
btMoveDown.Enabled = dgvTransportServiceAgents.RowCount > 0 && dgvTransportServiceAgents.SelectedRows[0].Cells["dgvcName"].RowIndex < (dgvTransportServiceAgents.RowCount - 1);
}
else
{
btMoveUp.Enabled = dgvTransportServiceAgents.RowCount > 0 && dgvTransportServiceAgents.SelectedRows[0].Cells["dgvcName"].RowIndex > 0;
btMoveDown.Enabled = dgvTransportServiceAgents.RowCount > 0 && dgvTransportServiceAgents.SelectedRows[0].Cells["dgvcName"].RowIndex < (dgvTransportServiceAgents.RowCount -1);
btMoveUp.Enabled = false;
btMoveDown.Enabled = false;
}
}

Expand Down
2 changes: 1 addition & 1 deletion Src/Configuration.DkimSigner/InstallWindow.cs
View file
Expand Up @@ -175,7 +175,7 @@ private void Install()

foreach (KeyValuePair<string, string> entry in Constants.DkimSignerVersionDirectory)
{
if (exchangeVersion.StartsWith(entry.Key))
if (exchangeVersion.StartsWith(entry.Key.TrimEnd('*')))
{
agentExchangeVersionPath = entry.Value;
break;
Expand Down
6 changes: 3 additions & 3 deletions Src/Configuration.DkimSigner/Properties/AssemblyInfo.cs
View file
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("github.com/pro")]
[assembly: AssemblyProduct("Exchange DKIM Signer Configuration")]
[assembly: AssemblyCopyright("Gnu LGPL 3 by Stefan Profanter © 2020")]
[assembly: AssemblyCopyright("Gnu LGPL 3 by Stefan Profanter © 2021")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.3.3")]
[assembly: AssemblyFileVersion("3.3.3")]
[assembly: AssemblyVersion("3.3.4")]
[assembly: AssemblyFileVersion("3.3.4")]
Binary file modified Src/Configuration.DkimSigner/bin/Release/Configuration.DkimSigner.exe
View file
Binary file not shown.
Binary file modified Src/Configuration.DkimSigner/bin/Release/Configuration.DkimSigner.pdb
View file
Binary file not shown.
6 changes: 0 additions & 6 deletions Src/Exchange.DkimSigner/App.config
View file

This file was deleted.

0 comments on commit 9678565

Please sign in to comment.