Skip to content

Commit

Permalink
Bumped version to 5.4.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@axunonb
axunonb committed Feb 17, 2018
1 parent 79cc6bc commit 1eb3e2f
Show file tree
Hide file tree
Showing 24 changed files with 495 additions and 232 deletions.
7 changes: 5 additions & 2 deletions MailMergeLib.NetCore.VS2017.sln → MailMergeLib.NetStandard.VS2017.sln
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.16
VisualStudioVersion = 15.0.27130.2024
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MailMergeLib.NetCore", "MailMergeLib\MailMergeLib.NetCore.csproj", "{B0333A74-843F-4E09-B0DD-F48B9A45E430}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MailMergeLib.NetStandard", "MailMergeLib\MailMergeLib.NetStandard.csproj", "{B0333A74-843F-4E09-B0DD-F48B9A45E430}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -19,4 +19,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {08CE7487-B55B-4CD2-9F89-48283EDC3994}
EndGlobalSection
EndGlobal
13 changes: 5 additions & 8 deletions MailMergeLib/MailMergeLib.Net40.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,11 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Reference Include="AngleSharp">
<Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
<HintPath>..\packages\AngleSharp.0.9.9\lib\net40\AngleSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MailKit">
<HintPath>..\packages\MailKit.1.18.0\lib\net40\MailKit.dll</HintPath>
<Private>True</Private>
<Reference Include="MailKit, Version=1.22.0.0, Culture=neutral, PublicKeyToken=4e064fe7c44a8f1b, processorArchitecture=MSIL">
<HintPath>..\packages\MailKit.1.22.0\lib\net40\MailKit.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
Expand All @@ -59,9 +57,8 @@
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MimeKit">
<HintPath>..\packages\MimeKit.1.18.0\lib\net40\MimeKit.dll</HintPath>
<Private>True</Private>
<Reference Include="MimeKit, Version=1.22.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
<HintPath>..\packages\MimeKit.1.22.0\lib\net40\MimeKit.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
Expand Down
14 changes: 6 additions & 8 deletions MailMergeLib/MailMergeLib.Net45.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,18 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
<HintPath>..\packages\AngleSharp.0.9.9\lib\net45\AngleSharp.dll</HintPath>
<HintPath>..\packages\AngleSharp.0.9.9.1\lib\net45\AngleSharp.dll</HintPath>
</Reference>
<Reference Include="MailKit">
<HintPath>..\packages\MailKit.1.18.0\lib\net45\MailKit.dll</HintPath>
<Private>True</Private>
<Reference Include="MailKit, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4e064fe7c44a8f1b, processorArchitecture=MSIL">
<HintPath>..\packages\MailKit.2.0.1\lib\net45\MailKit.dll</HintPath>
</Reference>
<Reference Include="MimeKit">
<HintPath>..\packages\MimeKit.1.18.0\lib\net45\MimeKit.dll</HintPath>
<Private>True</Private>
<Reference Include="MimeKit, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
<HintPath>..\packages\MimeKit.2.0.1\lib\net45\MimeKit.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Security" />
<Reference Include="System.XML" />
<Reference Include="System.Xml.Linq" />
Expand Down Expand Up @@ -155,7 +154,6 @@
<ItemGroup>
<Content Include="SmartFormatMail\license.txt" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
19 changes: 13 additions & 6 deletions MailMergeLib/MailMergeLib.NetCore.csproj → MailMergeLib/MailMergeLib.NetStandard.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<PropertyGroup>
<Description>MailMergeLib is an SMTP mail client library which provides comfortable mail merge capabilities for text, inline images and attachments, as well as good throughput and fault tolerance for sending mail messages.</Description>
<Copyright>© 2007-2017 by axuno gGmbH</Copyright>
<Copyright>© 2007-2018 by axuno gGmbH</Copyright>
<AssemblyTitle>MailMergeLib 5</AssemblyTitle>
<VersionPrefix>5.3.0.0</VersionPrefix>
<Authors>axuno gGmbH</Authors>
<TargetFramework>netstandard1.6</TargetFramework>
<DefineConstants>TRACE;DEBUG;FXCORE</DefineConstants>
<DefineConstants>DEBUG;TRACE;RELEASE;NETSTANDARD1_6</DefineConstants>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>MailMergeLib</AssemblyName>
<AssemblyOriginatorKeyFile>MailMergeLib.snk</AssemblyOriginatorKeyFile>
Expand All @@ -16,7 +16,7 @@
<PackageId>MailMergeLib</PackageId>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<Version>5.3.0.0</Version>
<Version>5.4.0.0</Version>
<PackageProjectUrl>https://github.com/axuno/MailMergeLib</PackageProjectUrl>
<PackageIconUrl>https://github.com/axuno/MailMergeLib/raw/master/MailMergeLib_64x64.png</PackageIconUrl>
<PackageLicenseUrl>https://github.com/axuno/MailMergeLib/blob/master/MailMergeLib/License.txt</PackageLicenseUrl>
Expand All @@ -27,17 +27,24 @@
</PropertyGroup>

<ItemGroup>
<Compile Remove="nuget\**" />
<Compile Remove="Properties\**\*;SmartFormatMail\Properties\**\*;packages.*.config;" />
<EmbeddedResource Remove="nuget\**" />
<None Remove="nuget\**" />
<None Remove="app.config" />
<None Remove="MailMergeLib.Net40.nuget.targets" />
<None Remove="packages.MailMergeLib.Net40.config" />
<None Remove="packages.MailMergeLib.Net45.config" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="AngleSharp" Version="0.9.9" />
<PackageReference Include="MailKit" Version="1.18.0" />
<PackageReference Include="MimeKit" Version="1.18.0" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="AngleSharp" Version="0.9.9.1" />
<PackageReference Include="MailKit" Version="2.0.1" />
<PackageReference Include="MimeKit" Version="2.0.1" />
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
<PackageReference Include="System.Data.Common" Version="4.3.0" />
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
Expand Down
Loading

1 comment on commit 1eb3e2f

@axunonb
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes:

  • Refactored raising events in MailMergeSender and MailMergeMessage
  • Integrated SmartFormat.NET v.2.2.0 which resolves a rare issue, when null is a parameter of Send... methods of MailMergeSender.
  • Exceptions in MailSmartFormatter are all caught (i.e. not propagated to MailMergeSender), never mind the exception settings in SmartFormatMail modules. This way they do no more have influence when generating the email message. Format and parse errors always throw a MailMergeMessageException.
  • Added new exception of type ParseException for parsing issues in the template. ParseException are included as inner exceptions of MailMergeMessageException when building a message fails.
  • Updated dependency: MailKit v2.0,1 MimeKit v2.0.1 (.NetStandard, .Net 4.5) and v1.22.0 (.Net 4.0)
  • Updated dependency: AngleSharp 0.9.9.1
  • Updated dependencies in UnitTests: NUnit 3.9.0 and NUnit3TestAdapter 3.9.0
  • Added unit tests for raising events in MailMergeSender and MailMergeMessage
  • Updated the API documentation

Note:
As MailKit and MileKit no longer support .Net 4.0, this is expected to become the last release which supplies packages for .Net 4.0.

Please sign in to comment.