Merge fixes of v2.7.1 into version/v3 (axuno#214)

Merge fixes of v2.7.1 into version/v3
axunonb · Oct 21, 2021 · f9637ee · f9637ee
1 parent c9ae63b
commit f9637ee
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -215,6 +215,11 @@ SmartFormat is not a fully-fledged HTML parser. If this is required, use [AngleS
 * Fixes #211 Illegal placeholder characters that are not 8-bit, will not throw unexpected `ThrowByteOverflowException` ([#212](https://github.com/axuno/SmartFormat/pull/212))
 
 
+v2.7.1
+===
+* **Fixed**: [#179](https://github.com/axuno/SmartFormat/issues/179) DualFromZeroToTwo plural rule. Thanks to [@OhSoGood](https://github.com/OhSoGood)
+* **Fixed**: [#211](https://github.com/axuno/SmartFormat/issues/211) Illegal placeholder characters that are not 8-bit, will no more throw unexpected `ThrowByteOverflowException`. Thanks to [@bogatykh](https://github.com/bogatykh)
+
 v2.7.0
 ===
 * **Fixed** broken backward compatibilty introduced in v2.6.2 (issues referenced in [#148](https://github.com/axuno/SmartFormat/issues/148), [#147](https://github.com/axuno/SmartFormat/issues/147), [#143](https://github.com/axuno/SmartFormat/issues/143)).

diff --git a/README.md b/README.md
@@ -25,11 +25,8 @@ See [changelog](CHANGES.md) for changes.
 
 # Version 3.0
 
-<hr>
-
 **See the [list of changes](https://github.com/axuno/SmartFormat/blob/version/v3.0/CHANGES.md) already merged into branch `version/v3`**
 
 <hr>
 
 We have started to work on a new version of ```SmartFormat.Net``` and **would like to collect your input using [GitHub Discussions](https://github.com/axuno/SmartFormat/discussions/139)**. 
-
diff --git a/appveyor.yml b/appveyor.yml
@@ -59,3 +59,4 @@ for:
     test_script:
       - dotnet test --no-build --framework net5.0 SmartFormat.sln /p:configuration=release /p:AltCover=true /p:AltCoverXmlReport="coverage.xml" /p:AltCoverInplace=true /p:AltCoverForce=true /p:AltCoverStrongNameKey="../SmartFormat/SmartFormat.snk" /p:AltCoverAssemblyExcludeFilter="SmartFormat.Tests|NUnit3.TestAdapter|Cysharp" /p:AltCoverLineCover="true"
       - bash <(curl -s https://codecov.io/bash) -f ./SmartFormat.Tests/coverage.net5.0.xml -n net5.0linux
+
diff --git a/src/SmartFormat/Core/Parsing/Parser.cs b/src/SmartFormat/Core/Parsing/Parser.cs
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (C) axuno gGmbH, Scott Rippey, Bernhard Millauer and other contributors.
 // Licensed under the MIT license.
 //
@@ -881,4 +881,4 @@ private Format HandleParsingErrors(ParsingErrors parsingErrors, Format currentRe
 
         #endregion
     }
-}
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,3 +59,4 @@ for:
		test_script:
		- dotnet test --no-build --framework net5.0 SmartFormat.sln /p:configuration=release /p:AltCover=true /p:AltCoverXmlReport="coverage.xml" /p:AltCoverInplace=true /p:AltCoverForce=true /p:AltCoverStrongNameKey="../SmartFormat/SmartFormat.snk" /p:AltCoverAssemblyExcludeFilter="SmartFormat.Tests\|NUnit3.TestAdapter\|Cysharp" /p:AltCoverLineCover="true"
		- bash <(curl -s https://codecov.io/bash) -f ./SmartFormat.Tests/coverage.net5.0.xml -n net5.0linux