From c5d9488fbf508d0263958a6da5e5b8d0f125834e Mon Sep 17 00:00:00 2001 From: Antoine Aubry Date: Thu, 14 Jan 2021 19:22:56 +0000 Subject: [PATCH 1/2] Prepare release 9.1.3 --- RELEASE_NOTES.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e5ec9e823..387fca87f 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,14 +1,14 @@ # Release notes -## Release 9.1.2 +## Release 9.1.3 -- Fix writePtr decrementation in InsertionQueue [#558] - -This fixes another critical bug that was causing failures while parsing Yaml documents. If you are using release 9.1.1, please use this version instead. +- Fix an error when a stream returns less than the requested amount of bytes + Fixes #560 # Previous releases +- [9.1.2](releases/9.1.2.md) - [9.1.1](releases/9.1.1.md) - [9.1.0](releases/9.1.0.md) - [8.1.2](releases/8.1.2.md) From 8c2929483fa2a68f46adf72ef8d0ae7e1613b325 Mon Sep 17 00:00:00 2001 From: dko Date: Fri, 15 Jan 2021 09:57:41 +0100 Subject: [PATCH 2/2] Fix immutable pattern in EmitterSettings --- YamlDotNet/Core/EmitterSettings.cs | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/YamlDotNet/Core/EmitterSettings.cs b/YamlDotNet/Core/EmitterSettings.cs index 65a638e33..df4be3794 100644 --- a/YamlDotNet/Core/EmitterSettings.cs +++ b/YamlDotNet/Core/EmitterSettings.cs @@ -89,7 +89,8 @@ public EmitterSettings WithBestIndent(int bestIndent) bestIndent, BestWidth, IsCanonical, - MaxSimpleKeyLength + MaxSimpleKeyLength, + SkipAnchorName ); } @@ -99,7 +100,8 @@ public EmitterSettings WithBestWidth(int bestWidth) BestIndent, bestWidth, IsCanonical, - MaxSimpleKeyLength + MaxSimpleKeyLength, + SkipAnchorName ); } @@ -109,7 +111,8 @@ public EmitterSettings WithMaxSimpleKeyLength(int maxSimpleKeyLength) BestIndent, BestWidth, IsCanonical, - maxSimpleKeyLength + maxSimpleKeyLength, + SkipAnchorName ); } @@ -119,14 +122,20 @@ public EmitterSettings Canonical() BestIndent, BestWidth, true, - MaxSimpleKeyLength + MaxSimpleKeyLength, + SkipAnchorName ); } public EmitterSettings WithoutAnchorName() { - SkipAnchorName = true; - return this; + return new EmitterSettings( + BestIndent, + BestWidth, + IsCanonical, + MaxSimpleKeyLength, + true + ); } } }