Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit ebb820c
Merge: 365bbd0 ca28b30
Author: axunonb <[email protected]>
Date:   Thu Oct 21 10:06:49 2021 +0200

    Merge branch 'axuno:main' into main

commit ca28b30
Author: axunonb <[email protected]>
Date:   Thu Oct 21 10:05:03 2021 +0200

    Backport fixes from v3 (axuno#213)

    Bumped version to 2.7.1

    Back-ported bug fixes from v3.0.0-alpha:
    axuno#179 - Corrected DualFromZeroToTwo plural rule
    axuno#211 . Illegal placeholder characters that are not 8-bit, will no more throw unexpected ThrowByteOverflowException

commit 365bbd0
Author: axunonb <[email protected]>
Date:   Thu Oct 21 09:16:12 2021 +0200

    Bumped version to 2.7.1

    Backported bug fixes from v3.0.0-alpha:
    axuno#179 - Corrected DualFromZeroToTwo plural rule
    axuno#211 . Illegal placeholder characters that are not 8-bit, will no more throw unexpected ThrowByteOverflowException

commit 3165fc7
Author: axunonb <[email protected]>
Date:   Thu Oct 21 08:03:32 2021 +0200

    Updated NuGet secure key

commit 8169585
Author: axunonb <[email protected]>
Date:   Sun Sep 5 23:09:38 2021 +0200

    Update README.md

commit 1e09b6a
Author: axunonb <[email protected]>
Date:   Mon Aug 30 01:52:50 2021 +0200

    Update README.md

commit 8954f3e
Author: axunonb <[email protected]>
Date:   Mon Aug 30 01:51:32 2021 +0200

    Update README.md

commit a16b01c
Author: axunonb <[email protected]>
Date:   Tue Jun 15 00:06:03 2021 +0200

    Update README.md

commit d9462f5
Author: axunonb <[email protected]>
Date:   Tue Jun 15 00:05:17 2021 +0200

    Update README.md
  • Loading branch information
axunonb committed Oct 21, 2021
1 parent 310e9b7 commit 9c03a78
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)).
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)**.

1 change: 1 addition & 0 deletions appveyor.yml
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

4 changes: 2 additions & 2 deletions src/SmartFormat/Core/Parsing/Parser.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// Copyright (C) axuno gGmbH, Scott Rippey, Bernhard Millauer and other contributors.
// Licensed under the MIT license.
//
Expand Down Expand Up @@ -881,4 +881,4 @@ private Format HandleParsingErrors(ParsingErrors parsingErrors, Format currentRe

#endregion
}
}
}
2 changes: 1 addition & 1 deletion src/SmartFormat/SmartFormat.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>A string composition library written in C# that can format data into a string with a minimal, intuitive syntax. It uses extensions to provide named placeholders, pluralization, gender conjugation, and time and list formatting.</Description>
Expand Down

0 comments on commit 9c03a78

Please sign in to comment.