Bump version to v5.12.3 (#47)

Update SmartFormat package to v3.5.0
axuno · Jul 30, 2024 · 7424bf2 · 7424bf2
1 parent e7f1183
commit 7424bf2
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props
@@ -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.12.2</Version>
-        <FileVersion>5.12.2</FileVersion>
+        <Version>5.12.3</Version>
+        <FileVersion>5.12.3</FileVersion>
         <AssemblyVersion>5.0.0.0</AssemblyVersion> <!--only update AssemblyVersion with major releases -->
         <LangVersion>latest</LangVersion>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>

diff --git a/Src/MailMergeLib.Tests/MailMergeLib.Tests.csproj b/Src/MailMergeLib.Tests/MailMergeLib.Tests.csproj
@@ -35,13 +35,13 @@
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="netDumbster" Version="3.1.0" />
+    <PackageReference Include="netDumbster" Version="3.1.1" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/Src/MailMergeLib.Tests/Message_SmartFormatter.cs b/Src/MailMergeLib.Tests/Message_SmartFormatter.cs
@@ -35,14 +35,14 @@ private class TestClass2
     }
 
     [Test]
-    public void PlaceholderCaseSensitivityTest()
+    public void PlaceholderCaseSensitiveTest()
     {
         var dataItem = new
         {
             Email = "test@example.com",
         };
 
-        var mmm = new MailMergeMessage();
+        using var mmm = new MailMergeMessage();
         mmm.Config.SmartFormatterConfig.CaseSensitivity = CaseSensitivityType.CaseSensitive;
         mmm.Config.SmartFormatterConfig.FormatErrorAction = ErrorAction.OutputErrorInResult;
         mmm.Config.SmartFormatterConfig.ParseErrorAction = ErrorAction.OutputErrorInResult;
@@ -52,14 +52,24 @@ public void PlaceholderCaseSensitivityTest()
             Assert.That(mmm.SmartFormatter.Format("{Email}", dataItem), Is.EqualTo(dataItem.Email));
             Assert.That(mmm.SmartFormatter.Format("{EmAiL}", dataItem), Is.Not.EqualTo(dataItem.Email));
         });
-        // Changing the the SmartFormatterConfig settings creates a new instance of
-        // the SmartFormatter inside MailMergeMessage
+    }
+
+    [Test]
+    public void PlaceholderCaseInsensitiveTest()
+    {
+        var dataItem = new {
+            Email = "test@example.com",
+        };
+
+        using var mmm = new MailMergeMessage();
         mmm.Config.SmartFormatterConfig.CaseSensitivity = CaseSensitivityType.CaseInsensitive;
-        var actual = mmm.SmartFormatter.Format("{EmAiL}", dataItem);
+        mmm.Config.SmartFormatterConfig.FormatErrorAction = ErrorAction.OutputErrorInResult;
+        mmm.Config.SmartFormatterConfig.ParseErrorAction = ErrorAction.OutputErrorInResult;
+
+        var actual = mmm.SmartFormatter.Format("{EMAIl}", dataItem);
         Assert.That(actual, Is.EqualTo(dataItem.Email));
     }
 
-
     [Test]
     public void DataTypeTests()
     {

diff --git a/Src/MailMergeLib/MailMergeLib.csproj b/Src/MailMergeLib/MailMergeLib.csproj
@@ -58,7 +58,7 @@ https://github.com/axuno/MailMergeLib/releases</PackageReleaseNotes>
         <PackageReference Include="AngleSharp" Version="1.1.2" />
         <PackageReference Include="MailKit" Version="4.7.1.1" />
         <PackageReference Include="MimeKit" Version="4.7.1" />
-        <PackageReference Include="SmartFormat.NET" Version="3.4.0" />
+        <PackageReference Include="SmartFormat.NET" Version="3.5.0" />
         <PackageReference Include="YAXLib" Version="4.3.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
             <PrivateAssets>all</PrivateAssets>

diff --git a/Src/MailMergeLib/MailSmartFormatter.cs b/Src/MailMergeLib/MailSmartFormatter.cs
@@ -35,7 +35,6 @@ private MailSmartFormatter(SmartSettings? currentSmartSettings) : base(currentSm
                 new NullFormatter(),
                 new ChooseFormatter(),
                 new SubStringFormatter(),
-                // The DefaultSource reproduces the string.Format behavior:
                 new DefaultFormatter())
 
             // Extensions to keep API compatibility with MailMergeLib v5.x

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 5.12.2.{build} # Only change for mayor versions (e.g. 6.0.0)
+version: 5.0.0.{build} # Only change for mayor versions (e.g. 6.0.0)
 environment:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true 
   matrix:
@@ -27,7 +27,7 @@ for:
       - ps: dotnet restore --verbosity quiet
       - ps: dotnet add .\MailMergeLib.Tests\MailMergeLib.Tests.csproj package AltCover
       - ps: |
-          $version = "5.12.2"
+          $version = "5.12.3"
           $versionFile = $version + "." + ${env:APPVEYOR_BUILD_NUMBER}
 
           if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {