Skip to content

Commit

Permalink
Version/v5.11.1 (#39)
Browse files Browse the repository at this point in the history
Fix nullability in MailMergeSender 'Send...' methods
* SendAsync(MailMergeMessage mailMergeMessage, object? dataItem)
* Send(MailMergeMessage mailMergeMessage, object? dataItem)

Update readme.txt
Set correct version 5.11.1 in CI build appveyor.yml
Bump version to v5.11.1
  • Loading branch information
axunonb authored Jul 4, 2023
1 parent 55ad086 commit 6591289
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 35 deletions.
4 changes: 2 additions & 2 deletions Src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<Copyright>Copyright 2011-$(CurrentYear) axuno, MailMergeLib Project maintainers and contributers</Copyright>
<RepositoryUrl>https://github.com/axuno/MailMergeLib.git</RepositoryUrl>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<Version>5.11.0</Version>
<FileVersion>5.11.0</FileVersion>
<Version>5.11.1</Version>
<FileVersion>5.11.1</FileVersion>
<AssemblyVersion>5.0.0.0</AssemblyVersion> <!--only update AssemblyVersion with major releases -->
<LangVersion>latest</LangVersion>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
Expand Down
21 changes: 0 additions & 21 deletions Src/MailMergeLib/License.txt

This file was deleted.

4 changes: 2 additions & 2 deletions Src/MailMergeLib/MailMergeSender.cs
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ void AfterSend(object? obj, MailSenderAfterSendEventArgs args)
/// <exception cref="InvalidOperationException">A send operation is pending.</exception>
/// <exception cref="AggregateException"></exception>
/// <exception cref="MailMergeMessage.MailMergeMessageException"></exception>
public async Task SendAsync(MailMergeMessage mailMergeMessage, object dataItem)
public async Task SendAsync(MailMergeMessage mailMergeMessage, object? dataItem)
{
if (mailMergeMessage == null)
throw new ArgumentNullException(nameof(mailMergeMessage),$"{nameof(SendAsync)}: {nameof(mailMergeMessage)} is null.");
Expand Down Expand Up @@ -597,7 +597,7 @@ public void Send<T>(MailMergeMessage mailMergeMessage, IEnumerable<T> dataSource
/// <exception cref="SmtpProtocolException"></exception>
/// <exception cref="AuthenticationException"></exception>
/// <exception cref="MailMergeMessage.MailMergeMessageException"></exception>
public void Send(MailMergeMessage mailMergeMessage, object dataItem)
public void Send(MailMergeMessage mailMergeMessage, object? dataItem)
{
if (mailMergeMessage == null)
throw new ArgumentNullException(nameof(mailMergeMessage),$"{nameof(Send)}: {nameof(mailMergeMessage)} is null.");
Expand Down
8 changes: 5 additions & 3 deletions Src/MailMergeLib/MessageStore/FileMessageStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class FileMessageStore : IMessageStore
public FileMessageStore()
{}

#pragma warning disable IDE0051
/// <summary>
/// The <see cref="Encoding"/> to apply when loading <see cref="MailMergeMessage"/>s.
/// Used for serialization. It is the string representation of <see cref="MessageEncoding"/>.
Expand All @@ -31,6 +32,7 @@ private string MessageEncodingName
get => MessageEncoding.WebName;
set => MessageEncoding = Encoding.GetEncoding(value);
}
#pragma warning restore IDE0051

/// <summary>
/// Gets or sets the <see cref="Encoding"/> to apply when loading <see cref="MailMergeMessage"/>s from the file system.
Expand All @@ -56,7 +58,7 @@ public FileMessageStore(string[] searchFolders, string[] searchPatterns, Encodin
/// A list of absolute paths to file system folders where deserialized <see cref="MailMergeMessage"/> files are stored.
/// </summary>
[YAXCollection(YAXCollectionSerializationTypes.Recursive, EachElementName = "Folder")]
public string[] SearchFolders { get; set; } = {};
public string[] SearchFolders { get; set; } = System.Array.Empty<string>();

/// <summary>
/// The search pattern to use for getting the file names of deserialized <see cref="MailMergeMessage"/> files.
Expand Down Expand Up @@ -187,7 +189,7 @@ public override bool Equals(object? obj)
{
if (obj is null) return false;
if (ReferenceEquals(this, obj)) return true;
if (obj.GetType() != this.GetType()) return false;
if (obj.GetType() != GetType()) return false;
return Equals((FileMessageStore) obj);
}

Expand All @@ -211,4 +213,4 @@ public override int GetHashCode()
}

#endregion
}
}
3 changes: 2 additions & 1 deletion Src/MailMergeLib/Templates/Template.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ public Template(string name, Parts parts, string? defaultKey = null) : this()
private void TextOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs notifyCollectionChangedEventArgs)
{
// call the setter to verify the current value can still be set after changing the collection
DefaultKey = DefaultKey;
var temp = DefaultKey;
DefaultKey = temp;
}

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 5.9.0.{build} # Only change for mayor versions (e.g. 6.0.0)
version: 5.11.1.{build} # Only change for mayor versions (e.g. 6.0.0)
environment:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
matrix:
Expand Down Expand Up @@ -27,13 +27,13 @@ for:
- ps: dotnet restore --verbosity quiet
- ps: dotnet add .\MailMergeLib.Tests\MailMergeLib.Tests.csproj package AltCover
- ps: |
$version = "5.9.1"
$version = "5.11.1"
$versionFile = $version + "." + ${env:APPVEYOR_BUILD_NUMBER}
if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {
$version = $version + "-PR" + $env:APPVEYOR_PULL_REQUEST_NUMBER
}
dotnet build MailMergeLib.sln /verbosity:minimal /t:rebuild /p:configuration=release /p:IncludeSymbols=true /p:ContinuousIntegrationBuild=true /p:Version=$version /p:FileVersion=$versionFile /nowarn:CS1591,CS0618
dotnet build MailMergeLib.sln /verbosity:minimal /t:rebuild /p:configuration=release /p:IncludeSymbols=true /p:ContinuousIntegrationBuild=true /p:Version=$version /p:FileVersion=$versionFile
dotnet pack MailMergeLib.sln --verbosity minimal --no-build --configuration release /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg /p:PackageOutputPath=$env:APPVEYOR_BUILD_FOLDER/artifacts /p:ContinuousIntegrationBuild=true
test_script:
- cmd: nuget install Appveyor.TestLogger
Expand Down
6 changes: 3 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Heads up for MailMergeLib 5.11.0
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Heads up for MailMergeLib 5.11
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

This version is API and source compatible with prior 5.x versions.

Expand Down

0 comments on commit 6591289

Please sign in to comment.