From e35409292f44cca3084f1d21090be265d6c18c08 Mon Sep 17 00:00:00 2001
From: Ian Griffiths <Ian.Griffiths@endjin.com>
Date: Fri, 27 Sep 2024 12:29:03 +0100
Subject: [PATCH 1/6] Add ValueStringBuilder.AppendFormat for .NET 8.0

---
 .../Corvus.HighPerformance.Specs.csproj       |   9 ++
 .../Net80/AppendCompositeFormat.feature       |  25 +++
 .../Net80/AppendCompositeFormat.feature.cs    | 152 ++++++++++++++++++
 .../ValueStringBuilderStepDefinitions.cs      |  14 ++
 .../ValueStringBuilderTestDriver.cs           |  13 ++
 .../ValueStringBuilder.AppendFormat.cs        |  52 ++++++
 ...alueStringBuilder.AppendSpanFormattable.cs |   2 +
 .../ValueStringBuilder.cs                     |   3 +-
 8 files changed, 269 insertions(+), 1 deletion(-)
 create mode 100644 Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature
 create mode 100644 Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature.cs
 create mode 100644 Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.AppendFormat.cs

diff --git a/Solutions/Corvus.HighPerformance.Specs/Corvus.HighPerformance.Specs.csproj b/Solutions/Corvus.HighPerformance.Specs/Corvus.HighPerformance.Specs.csproj
index df38232..f0113d6 100644
--- a/Solutions/Corvus.HighPerformance.Specs/Corvus.HighPerformance.Specs.csproj
+++ b/Solutions/Corvus.HighPerformance.Specs/Corvus.HighPerformance.Specs.csproj
@@ -10,6 +10,11 @@
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net481'">
+    <ReqnrollFeatureFiles Remove="ValueStringBuilderFeatures/Net80/*.feature" />
+    <Compile Remove="ValueStringBuilderFeatures/Net80/*.feature.cs" />
+  </ItemGroup>
+
   <PropertyGroup>
     <!--
     SA1602, CS1591: Doc all the things!  Not appropriate for test projects.
@@ -50,4 +55,8 @@
     <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="ValueStringBuilderFeatures\Net80\" />
+  </ItemGroup>
+
 </Project>
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature
new file mode 100644
index 0000000..6bdea5b
--- /dev/null
+++ b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature
@@ -0,0 +1,25 @@
+Feature: Append CompositeFormat into a ValueStringBuilder
+
+Scenario Outline: Append composite format
+    Given a ValueStringBuilder initialized with '<InitializationType>' of length <InitialLength>
+	And I append the format '<CompositeFormat>' to the ValueStringBuilder with arguments <FirstValue> and '<SecondValue>'
+	When I get the string from the ValueStringBuilder
+	Then the ValueStringBuilder string should be '<Result>'
+	Examples:
+		| InitializationType | InitialLength | CompositeFormat           | FirstValue | SecondValue   | Result                             |
+		| Span               | 34            | Number: {0}, string: {1}. | 42         | Hello, world! | Number: 42, string: Hello, world!. |
+		| Span               | 26            | {0}, string: {1}.         | 42         | Hello, world! | 42, string: Hello, world!.         |
+		| Span               | 33            | Number: {0}, string: {1}  | 42         | Hello, world! | Number: 42, string: Hello, world!  |
+		| Span               | 15            | {0}{1}                    | 42         | Hello, world! | 42Hello, world!                    |
+		| Span               | 15            | {1}{0}                    | 42         | Hello, world! | Hello, world!42                    |
+		| Capacity           | 34            | Number: {0}, string: {1}. | 42         | Hello, world! | Number: 42, string: Hello, world!. |
+		| Capacity           | 26            | {0}, string: {1}.         | 42         | Hello, world! | 42, string: Hello, world!.         |
+		| Capacity           | 33            | Number: {0}, string: {1}  | 42         | Hello, world! | Number: 42, string: Hello, world!  |
+		| Capacity           | 15            | {0}{1}                    | 42         | Hello, world! | 42Hello, world!                    |
+		| Capacity           | 15            | {1}{0}                    | 42         | Hello, world! | Hello, world!42                    |
+		| Span               | 34            | Number: {0}, string: {1}. | 42         | Hello, world! | Number: 42, string: Hello, world!. |
+		| Capacity           | 34            | Number: {0}, string: {1}. | 42         | Hello, world! | Number: 42, string: Hello, world!. |
+		| Span               | 35            | Number: {0}, string: {1}. | -42        | Hello, world! | Number: -42, string: Hello, world!. |
+		| Capacity           | 35            | Number: {0}, string: {1}. | -42        | Hello, world! | Number: -42, string: Hello, world!. |
+		| Span               | 35            | Number: {0}, string: {1}. | -42        | Hello, world! | Number: -42, string: Hello, world!. |
+		| Capacity           | 35            | Number: {0}, string: {1}. | -42        | Hello, world! | Number: -42, string: Hello, world!. |
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature.cs b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature.cs
new file mode 100644
index 0000000..4713d34
--- /dev/null
+++ b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature.cs
@@ -0,0 +1,152 @@
+// ------------------------------------------------------------------------------
+//  <auto-generated>
+//      This code was generated by Reqnroll (https://www.reqnroll.net/).
+//      Reqnroll Version:2.0.0.0
+//      Reqnroll Generator Version:2.0.0.0
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if
+//      the code is regenerated.
+//  </auto-generated>
+// ------------------------------------------------------------------------------
+#region Designer generated code
+#pragma warning disable
+namespace ValueStringBuilderFeatures.Net80
+{
+    using Reqnroll;
+    using System;
+    using System.Linq;
+    
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")]
+    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute()]
+    public partial class AppendCompositeFormatIntoAValueStringBuilderFeature
+    {
+        
+        private static global::Reqnroll.ITestRunner testRunner;
+        
+        private Microsoft.VisualStudio.TestTools.UnitTesting.TestContext _testContext;
+        
+        private static string[] featureTags = ((string[])(null));
+        
+#line 1 "AppendCompositeFormat.feature"
+#line hidden
+        
+        public virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
+        {
+            get
+            {
+                return this._testContext;
+            }
+            set
+            {
+                this._testContext = value;
+            }
+        }
+        
+        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute()]
+        public static async System.Threading.Tasks.Task FeatureSetupAsync(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext testContext)
+        {
+            testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(null, System.Threading.Thread.CurrentThread.ManagedThreadId.ToString());
+            global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "ValueStringBuilderFeatures/Net80", "Append CompositeFormat into a ValueStringBuilder", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags);
+            await testRunner.OnFeatureStartAsync(featureInfo);
+        }
+        
+        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute(Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupBehavior.EndOfClass)]
+        public static async System.Threading.Tasks.Task FeatureTearDownAsync()
+        {
+            await testRunner.OnFeatureEndAsync();
+            testRunner = null;
+        }
+        
+        [Microsoft.VisualStudio.TestTools.UnitTesting.TestInitializeAttribute()]
+        public async System.Threading.Tasks.Task TestInitializeAsync()
+        {
+            if (((testRunner.FeatureContext != null) 
+                        && (testRunner.FeatureContext.FeatureInfo.Title != "Append CompositeFormat into a ValueStringBuilder")))
+            {
+                await global::ValueStringBuilderFeatures.Net80.AppendCompositeFormatIntoAValueStringBuilderFeature.FeatureSetupAsync(null);
+            }
+        }
+        
+        [Microsoft.VisualStudio.TestTools.UnitTesting.TestCleanupAttribute()]
+        public async System.Threading.Tasks.Task TestTearDownAsync()
+        {
+            await testRunner.OnScenarioEndAsync();
+        }
+        
+        public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo)
+        {
+            testRunner.OnScenarioInitialize(scenarioInfo);
+            testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs<Microsoft.VisualStudio.TestTools.UnitTesting.TestContext>(_testContext);
+        }
+        
+        public async System.Threading.Tasks.Task ScenarioStartAsync()
+        {
+            await testRunner.OnScenarioStartAsync();
+        }
+        
+        public async System.Threading.Tasks.Task ScenarioCleanupAsync()
+        {
+            await testRunner.CollectScenarioErrorsAsync();
+        }
+        
+        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Append composite format")]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Append CompositeFormat into a ValueStringBuilder")]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "34", "Number: {0}, string: {1}.", "42", "Hello, world!", "Number: 42, string: Hello, world!.", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "26", "{0}, string: {1}.", "42", "Hello, world!", "42, string: Hello, world!.", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "33", "Number: {0}, string: {1}", "42", "Hello, world!", "Number: 42, string: Hello, world!", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "15", "{0}{1}", "42", "Hello, world!", "42Hello, world!", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "15", "{1}{0}", "42", "Hello, world!", "Hello, world!42", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "34", "Number: {0}, string: {1}.", "42", "Hello, world!", "Number: 42, string: Hello, world!.", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "26", "{0}, string: {1}.", "42", "Hello, world!", "42, string: Hello, world!.", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "33", "Number: {0}, string: {1}", "42", "Hello, world!", "Number: 42, string: Hello, world!", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "15", "{0}{1}", "42", "Hello, world!", "42Hello, world!", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "15", "{1}{0}", "42", "Hello, world!", "Hello, world!42", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "34", "Number: {0}, string: {1}.", "42", "Hello, world!", "Number: 42, string: Hello, world!.", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "34", "Number: {0}, string: {1}.", "42", "Hello, world!", "Number: 42, string: Hello, world!.", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "35", "Number: {0}, string: {1}.", "-42", "Hello, world!", "Number: -42, string: Hello, world!.", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "35", "Number: {0}, string: {1}.", "-42", "Hello, world!", "Number: -42, string: Hello, world!.", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "35", "Number: {0}, string: {1}.", "-42", "Hello, world!", "Number: -42, string: Hello, world!.", null)]
+        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "35", "Number: {0}, string: {1}.", "-42", "Hello, world!", "Number: -42, string: Hello, world!.", null)]
+        public async System.Threading.Tasks.Task AppendCompositeFormat(string initializationType, string initialLength, string compositeFormat, string firstValue, string secondValue, string result, string[] exampleTags)
+        {
+            string[] tagsOfScenario = exampleTags;
+            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
+            argumentsOfScenario.Add("InitializationType", initializationType);
+            argumentsOfScenario.Add("InitialLength", initialLength);
+            argumentsOfScenario.Add("CompositeFormat", compositeFormat);
+            argumentsOfScenario.Add("FirstValue", firstValue);
+            argumentsOfScenario.Add("SecondValue", secondValue);
+            argumentsOfScenario.Add("Result", result);
+            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Append composite format", null, tagsOfScenario, argumentsOfScenario, featureTags);
+#line 3
+this.ScenarioInitialize(scenarioInfo);
+#line hidden
+            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
+            {
+                testRunner.SkipScenario();
+            }
+            else
+            {
+                await this.ScenarioStartAsync();
+#line 4
+    await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length {1}", initializationType, initialLength), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
+#line hidden
+#line 5
+ await testRunner.AndAsync(string.Format("I append the format \'{0}\' to the ValueStringBuilder with arguments {1} and \'{2}\'", compositeFormat, firstValue, secondValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
+#line hidden
+#line 6
+ await testRunner.WhenAsync("I get the string from the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
+#line hidden
+#line 7
+ await testRunner.ThenAsync(string.Format("the ValueStringBuilder string should be \'{0}\'", result), ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
+#line hidden
+            }
+            await this.ScenarioCleanupAsync();
+        }
+    }
+}
+#pragma warning restore
+#endregion
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs
index d12115c..e60060f 100644
--- a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs
+++ b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs
@@ -2,6 +2,8 @@
 // Copyright (c) Endjin Limited. All rights reserved.
 // </copyright>
 
+using System.Text;
+
 using Corvus.HighPerformance.Specs;
 
 using Reqnroll;
@@ -36,6 +38,18 @@ public void GivenIAppendTheIntToTheValueStringBuilder(int v)
         this.Driver.AddOperation(new ValueStringBuilderTestDriver.AppendInt32Operation(v));
     }
 
+#if !NETFRAMEWORK
+    [Given("I append the format {string} to the ValueStringBuilder with arguments {int} and {string}")]
+    public void GivenIAppendTheFormatNumberString_ToTheValueStringBuilderWithArgumentsAnd(
+        string format, int arg1, string arg2)
+    {
+        this.Driver.AddOperation(new ValueStringBuilderTestDriver.AppendFormatOperation(
+            CompositeFormat.Parse(format),
+            arg1,
+            arg2));
+    }
+#endif
+
     [Given("I replace {string} with {string} at index {int} with count {int}")]
     public void GivenIReplaceWithAtIndexWithCount(
         string oldValue, string newValue, int startIndex, int count)
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderTestDriver.cs b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderTestDriver.cs
index 91228a5..4e128bf 100644
--- a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderTestDriver.cs
+++ b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderTestDriver.cs
@@ -2,6 +2,9 @@
 // Copyright (c) Endjin Limited. All rights reserved.
 // </copyright>
 
+using System.Globalization;
+using System.Text;
+
 using Corvus.HighPerformance;
 using Corvus.HighPerformance.Specs;
 
@@ -74,6 +77,16 @@ public override void Execute(ref ValueStringBuilder sb)
         }
     }
 
+#if !NETFRAMEWORK
+    public class AppendFormatOperation(CompositeFormat format, int arg1, string arg2) : OperationBase
+    {
+        public override void Execute(ref ValueStringBuilder sb)
+        {
+            sb.AppendFormat(CultureInfo.InvariantCulture, format, [arg1, arg2]);
+        }
+    }
+#endif
+
     public class ReplaceOperation(
             string oldValue,
             string newValue,
diff --git a/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.AppendFormat.cs b/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.AppendFormat.cs
new file mode 100644
index 0000000..e66a1a2
--- /dev/null
+++ b/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.AppendFormat.cs
@@ -0,0 +1,52 @@
+// <copyright file="ValueStringBuilder.AppendFormat.cs" company="Endjin Limited">
+// Copyright (c) Endjin Limited. All rights reserved.
+// </copyright>
+
+#if NET8_0_OR_GREATER
+
+using System.Diagnostics;
+using System.Text;
+
+namespace Corvus.HighPerformance;
+
+/// <summary>
+/// Low-allocation alternative to <see cref="StringBuilder"/>.
+/// </summary>
+public ref partial struct ValueStringBuilder
+{
+    /// <summary>
+    /// Appends the result of a composite format string with the specified arguments to the string.
+    /// </summary>
+    /// <param name="formatProvider">
+    /// Format provider for localisability.
+    /// </param>
+    /// <param name="format">The <see cref="CompositeFormat"/>.</param>
+    /// <param name="formatArgs">The arguments required by the <see cref="CompositeFormat"/>.</param>
+    public void AppendFormat(
+        IFormatProvider formatProvider,
+        CompositeFormat format,
+        scoped ReadOnlySpan<object?> formatArgs)
+    {
+        int charsWritten;
+        while (!this._chars[this._pos..].TryWrite(formatProvider, format, out charsWritten, formatArgs))
+        {
+            // TODO: it's unclear what the correct behaviour is here.
+            // We consider it to be symptomatic of a mistake if you hit this path, but we
+            // tolerate it. We aren't sure whether to Debug.Assert, or just plod on silently.
+            // Since we don't really understand whether there are scenarios in which the
+            // caller really can't correctly pre-allocate the buffer, we are going to
+            // Debug.Assert for now, but if it turns out there are really good reasons
+            // to be unable to do this, we will either relax this, or provide specialized
+            // overloads that enable the caller to control how to deal with reallocation.
+            Debug.Assert(false, "The buffer was too small to write the formatted string.");
+
+            // Since we don't have well-defined scenarios in which this is normal, we don't
+            // have a good growth strategy, so here is a strategy.
+            this.Grow(this._chars.Length - this._pos + 1);
+        }
+
+        this._pos += charsWritten;
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.AppendSpanFormattable.cs b/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.AppendSpanFormattable.cs
index 14446f6..c9baf95 100644
--- a/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.AppendSpanFormattable.cs
+++ b/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.AppendSpanFormattable.cs
@@ -11,6 +11,8 @@
 
 #if NET8_0_OR_GREATER
 
+using System.Text;
+
 namespace Corvus.HighPerformance;
 
 public ref partial struct ValueStringBuilder
diff --git a/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.cs b/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.cs
index 2472185..eac1d50 100644
--- a/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.cs
+++ b/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.cs
@@ -365,7 +365,8 @@ private void GrowAndAppend(char c)
     private void Grow(int additionalCapacityBeyondPos)
     {
         Debug.Assert(additionalCapacityBeyondPos > 0);
-        Debug.Assert(_pos > _chars.Length - additionalCapacityBeyondPos, "Grow called incorrectly, no resize is needed.");
+        Debug.Assert(_chars.Length < _pos + additionalCapacityBeyondPos, "Grow called incorrectly, no resize is needed.");
+        //Debug.Assert(_pos > _chars.Length - additionalCapacityBeyondPos, "Grow called incorrectly, no resize is needed.");
 
         const uint ArrayMaxLength = 0x7FFFFFC7; // same as Array.MaxLength
 

From 108ad86750dbf35c2b9416317ffe3fc50f46222d Mon Sep 17 00:00:00 2001
From: Ian Griffiths <Ian.Griffiths@endjin.com>
Date: Tue, 1 Oct 2024 12:13:46 +0100
Subject: [PATCH 2/6] Remove duplicate scenario outline examples

Update test packages
---
 .gitignore                                    |   2 +
 .../Corvus.HighPerformance.Specs.csproj       |   8 +-
 .../Append.feature.cs                         | 285 ---------
 .../Net80/AppendCompositeFormat.feature       |  28 +-
 .../Net80/AppendCompositeFormat.feature.cs    | 152 -----
 .../Replace.feature.cs                        | 551 ------------------
 .../ValueStringBuilderStepDefinitions.cs      |   4 -
 .../packages.lock.json                        | 276 ++++-----
 8 files changed, 147 insertions(+), 1159 deletions(-)
 delete mode 100644 Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Append.feature.cs
 delete mode 100644 Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature.cs
 delete mode 100644 Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Replace.feature.cs

diff --git a/.gitignore b/.gitignore
index b781cca..88ee831 100644
--- a/.gitignore
+++ b/.gitignore
@@ -397,3 +397,5 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 /Solutions/Corvus.HighPerformance.v3.ncrunchsolution
+
+*.feature.cs
diff --git a/Solutions/Corvus.HighPerformance.Specs/Corvus.HighPerformance.Specs.csproj b/Solutions/Corvus.HighPerformance.Specs/Corvus.HighPerformance.Specs.csproj
index f0113d6..136ce1f 100644
--- a/Solutions/Corvus.HighPerformance.Specs/Corvus.HighPerformance.Specs.csproj
+++ b/Solutions/Corvus.HighPerformance.Specs/Corvus.HighPerformance.Specs.csproj
@@ -41,10 +41,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
-    <PackageReference Include="Reqnroll.MsTest" Version="2.0.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
+    <PackageReference Include="Reqnroll.MsTest" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Append.feature.cs b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Append.feature.cs
deleted file mode 100644
index 7050696..0000000
--- a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Append.feature.cs
+++ /dev/null
@@ -1,285 +0,0 @@
-// ------------------------------------------------------------------------------
-//  <auto-generated>
-//      This code was generated by Reqnroll (https://www.reqnroll.net/).
-//      Reqnroll Version:2.0.0.0
-//      Reqnroll Generator Version:2.0.0.0
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if
-//      the code is regenerated.
-//  </auto-generated>
-// ------------------------------------------------------------------------------
-#region Designer generated code
-#pragma warning disable
-namespace ValueStringBuilderFeatures
-{
-    using Reqnroll;
-    using System;
-    using System.Linq;
-    
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")]
-    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute()]
-    public partial class AppendContentIntoAValueStringBuilderFeature
-    {
-        
-        private static global::Reqnroll.ITestRunner testRunner;
-        
-        private Microsoft.VisualStudio.TestTools.UnitTesting.TestContext _testContext;
-        
-        private static string[] featureTags = ((string[])(null));
-        
-#line 1 "Append.feature"
-#line hidden
-        
-        public virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
-        {
-            get
-            {
-                return this._testContext;
-            }
-            set
-            {
-                this._testContext = value;
-            }
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute()]
-        public static async System.Threading.Tasks.Task FeatureSetupAsync(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext testContext)
-        {
-            testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(null, System.Threading.Thread.CurrentThread.ManagedThreadId.ToString());
-            global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "ValueStringBuilderFeatures", "Append content into a ValueStringBuilder", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags);
-            await testRunner.OnFeatureStartAsync(featureInfo);
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute(Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupBehavior.EndOfClass)]
-        public static async System.Threading.Tasks.Task FeatureTearDownAsync()
-        {
-            await testRunner.OnFeatureEndAsync();
-            testRunner = null;
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestInitializeAttribute()]
-        public async System.Threading.Tasks.Task TestInitializeAsync()
-        {
-            if (((testRunner.FeatureContext != null) 
-                        && (testRunner.FeatureContext.FeatureInfo.Title != "Append content into a ValueStringBuilder")))
-            {
-                await global::ValueStringBuilderFeatures.AppendContentIntoAValueStringBuilderFeature.FeatureSetupAsync(null);
-            }
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestCleanupAttribute()]
-        public async System.Threading.Tasks.Task TestTearDownAsync()
-        {
-            await testRunner.OnScenarioEndAsync();
-        }
-        
-        public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo)
-        {
-            testRunner.OnScenarioInitialize(scenarioInfo);
-            testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs<Microsoft.VisualStudio.TestTools.UnitTesting.TestContext>(_testContext);
-        }
-        
-        public async System.Threading.Tasks.Task ScenarioStartAsync()
-        {
-            await testRunner.OnScenarioStartAsync();
-        }
-        
-        public async System.Threading.Tasks.Task ScenarioCleanupAsync()
-        {
-            await testRunner.CollectScenarioErrorsAsync();
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Fits in available space")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Append content into a ValueStringBuilder")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "11", "Hello", "World!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "11", "Hello", "World!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "20", "Hello", "World!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "20", "Hello", "World!", null)]
-        public async System.Threading.Tasks.Task FitsInAvailableSpace(string initializationType, string initialLength, string firstValue, string secondValue, string[] exampleTags)
-        {
-            string[] tagsOfScenario = exampleTags;
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            argumentsOfScenario.Add("InitializationType", initializationType);
-            argumentsOfScenario.Add("InitialLength", initialLength);
-            argumentsOfScenario.Add("FirstValue", firstValue);
-            argumentsOfScenario.Add("SecondValue", secondValue);
-            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Fits in available space", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 3
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                await this.ScenarioStartAsync();
-#line 4
-    await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length {1}", initializationType, initialLength), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
-#line hidden
-#line 5
- await testRunner.AndAsync(string.Format("I append \'{0}\' to the ValueStringBuilder", firstValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 6
- await testRunner.AndAsync(string.Format("I append \'{0}\' to the ValueStringBuilder", secondValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 7
- await testRunner.WhenAsync("I get the string from the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
-#line hidden
-#line 8
- await testRunner.ThenAsync(string.Format("the ValueStringBuilder string should be \'{0}{1}\'", firstValue, secondValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
-#line hidden
-            }
-            await this.ScenarioCleanupAsync();
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Grows")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Append content into a ValueStringBuilder")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "11", "Hello, world!", "It is mighty fine to see you today.", "ToString", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "11", "Hello, world!", "It is mighty fine to see you today.", "ToString", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "11", "Hello, world!", "It is mighty fine to see you today.", "GetRentedBuffer", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "11", "Hello, world!", "It is mighty fine to see you today.", "GetRentedBuffer", null)]
-        public async System.Threading.Tasks.Task Grows(string initializationType, string initialLength, string firstValue, string secondValue, string getStringMechanism, string[] exampleTags)
-        {
-            string[] tagsOfScenario = exampleTags;
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            argumentsOfScenario.Add("InitializationType", initializationType);
-            argumentsOfScenario.Add("InitialLength", initialLength);
-            argumentsOfScenario.Add("FirstValue", firstValue);
-            argumentsOfScenario.Add("SecondValue", secondValue);
-            argumentsOfScenario.Add("GetStringMechanism", getStringMechanism);
-            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Grows", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 16
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                await this.ScenarioStartAsync();
-#line 17
-    await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length {1}", initializationType, initialLength), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
-#line hidden
-#line 18
- await testRunner.AndAsync(string.Format("I append \'{0}\' to the ValueStringBuilder", firstValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 19
- await testRunner.AndAsync(string.Format("I append \'{0}\' to the ValueStringBuilder", secondValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 20
- await testRunner.WhenAsync(string.Format("I get the string from the ValueStringBuilder via \'{0}\'", getStringMechanism), ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
-#line hidden
-#line 21
- await testRunner.ThenAsync(string.Format("the ValueStringBuilder string should be \'{0}{1}\'", firstValue, secondValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
-#line hidden
-            }
-            await this.ScenarioCleanupAsync();
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Append number")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Append content into a ValueStringBuilder")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "13", "Hello, world!", "42", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "13", "Hello, world!", "42", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "15", "Hello, world!", "42", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "15", "Hello, world!", "42", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "13", "Hello, world!", "-42", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "13", "Hello, world!", "-42", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "15", "Hello, world!", "-42", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "15", "Hello, world!", "-42", null)]
-        public async System.Threading.Tasks.Task AppendNumber(string initializationType, string initialLength, string firstValue, string secondValue, string[] exampleTags)
-        {
-            string[] tagsOfScenario = exampleTags;
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            argumentsOfScenario.Add("InitializationType", initializationType);
-            argumentsOfScenario.Add("InitialLength", initialLength);
-            argumentsOfScenario.Add("FirstValue", firstValue);
-            argumentsOfScenario.Add("SecondValue", secondValue);
-            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Append number", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 29
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                await this.ScenarioStartAsync();
-#line 30
-    await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length {1}", initializationType, initialLength), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
-#line hidden
-#line 31
- await testRunner.AndAsync(string.Format("I append \'{0}\' to the ValueStringBuilder", firstValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 32
- await testRunner.AndAsync(string.Format("I append the Int32 {0} to the ValueStringBuilder", secondValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 33
- await testRunner.WhenAsync("I get the string from the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
-#line hidden
-#line 34
- await testRunner.ThenAsync(string.Format("the ValueStringBuilder string should be \'{0}{1}\'", firstValue, secondValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
-#line hidden
-            }
-            await this.ScenarioCleanupAsync();
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Append number then string")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Append content into a ValueStringBuilder")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "13", "42", "Hello, world!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "13", "42", "Hello, world!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "15", "42", "Hello, world!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "15", "42", "Hello, world!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "13", "-42", "Hello, world!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "13", "-42", "Hello, world!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "15", "-42", "Hello, world!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "15", "-42", "Hello, world!", null)]
-        public async System.Threading.Tasks.Task AppendNumberThenString(string initializationType, string initialLength, string firstValue, string secondValue, string[] exampleTags)
-        {
-            string[] tagsOfScenario = exampleTags;
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            argumentsOfScenario.Add("InitializationType", initializationType);
-            argumentsOfScenario.Add("InitialLength", initialLength);
-            argumentsOfScenario.Add("FirstValue", firstValue);
-            argumentsOfScenario.Add("SecondValue", secondValue);
-            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Append number then string", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 46
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                await this.ScenarioStartAsync();
-#line 47
-    await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length {1}", initializationType, initialLength), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
-#line hidden
-#line 48
- await testRunner.AndAsync(string.Format("I append the Int32 {0} to the ValueStringBuilder", firstValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 49
- await testRunner.AndAsync(string.Format("I append \'{0}\' to the ValueStringBuilder", secondValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 50
- await testRunner.WhenAsync("I get the string from the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
-#line hidden
-#line 51
- await testRunner.ThenAsync(string.Format("the ValueStringBuilder string should be \'{0}{1}\'", firstValue, secondValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
-#line hidden
-            }
-            await this.ScenarioCleanupAsync();
-        }
-    }
-}
-#pragma warning restore
-#endregion
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature
index 6bdea5b..59310b8 100644
--- a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature
+++ b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature
@@ -6,20 +6,18 @@ Scenario Outline: Append composite format
 	When I get the string from the ValueStringBuilder
 	Then the ValueStringBuilder string should be '<Result>'
 	Examples:
-		| InitializationType | InitialLength | CompositeFormat           | FirstValue | SecondValue   | Result                             |
-		| Span               | 34            | Number: {0}, string: {1}. | 42         | Hello, world! | Number: 42, string: Hello, world!. |
-		| Span               | 26            | {0}, string: {1}.         | 42         | Hello, world! | 42, string: Hello, world!.         |
-		| Span               | 33            | Number: {0}, string: {1}  | 42         | Hello, world! | Number: 42, string: Hello, world!  |
-		| Span               | 15            | {0}{1}                    | 42         | Hello, world! | 42Hello, world!                    |
-		| Span               | 15            | {1}{0}                    | 42         | Hello, world! | Hello, world!42                    |
-		| Capacity           | 34            | Number: {0}, string: {1}. | 42         | Hello, world! | Number: 42, string: Hello, world!. |
-		| Capacity           | 26            | {0}, string: {1}.         | 42         | Hello, world! | 42, string: Hello, world!.         |
-		| Capacity           | 33            | Number: {0}, string: {1}  | 42         | Hello, world! | Number: 42, string: Hello, world!  |
-		| Capacity           | 15            | {0}{1}                    | 42         | Hello, world! | 42Hello, world!                    |
-		| Capacity           | 15            | {1}{0}                    | 42         | Hello, world! | Hello, world!42                    |
-		| Span               | 34            | Number: {0}, string: {1}. | 42         | Hello, world! | Number: 42, string: Hello, world!. |
-		| Capacity           | 34            | Number: {0}, string: {1}. | 42         | Hello, world! | Number: 42, string: Hello, world!. |
-		| Span               | 35            | Number: {0}, string: {1}. | -42        | Hello, world! | Number: -42, string: Hello, world!. |
-		| Capacity           | 35            | Number: {0}, string: {1}. | -42        | Hello, world! | Number: -42, string: Hello, world!. |
+		| InitializationType | InitialLength | CompositeFormat           | FirstValue | SecondValue   | Result                              |
+		| Span               | 34            | Number: {0}, string: {1}. | 42         | Hello, world! | Number: 42, string: Hello, world!.  |
+		| Span               | 26            | {0}, string: {1}.         | 42         | Hello, world! | 42, string: Hello, world!.          |
+		| Span               | 33            | Number: {0}, string: {1}  | 42         | Hello, world! | Number: 42, string: Hello, world!   |
+		| Span               | 15            | {0}{1}                    | 42         | Hello, world! | 42Hello, world!                     |
+		| Span               | 15            | {1}{0}                    | 42         | Hello, world! | Hello, world!42                     |
+		| Capacity           | 34            | Number: {0}, string: {1}. | 42         | Hello, world! | Number: 42, string: Hello, world!.  |
+		| Capacity           | 26            | {0}, string: {1}.         | 42         | Hello, world! | 42, string: Hello, world!.          |
+		| Capacity           | 33            | Number: {0}, string: {1}  | 42         | Hello, world! | Number: 42, string: Hello, world!   |
+		| Capacity           | 15            | {0}{1}                    | 42         | Hello, world! | 42Hello, world!                     |
+		| Capacity           | 15            | {1}{0}                    | 42         | Hello, world! | Hello, world!42                     |
+		| Span               | 34            | Number: {0}, string: {1}. | 42         | Hello, world! | Number: 42, string: Hello, world!.  |
+		| Capacity           | 34            | Number: {0}, string: {1}. | 42         | Hello, world! | Number: 42, string: Hello, world!.  |
 		| Span               | 35            | Number: {0}, string: {1}. | -42        | Hello, world! | Number: -42, string: Hello, world!. |
 		| Capacity           | 35            | Number: {0}, string: {1}. | -42        | Hello, world! | Number: -42, string: Hello, world!. |
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature.cs b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature.cs
deleted file mode 100644
index 4713d34..0000000
--- a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Net80/AppendCompositeFormat.feature.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-// ------------------------------------------------------------------------------
-//  <auto-generated>
-//      This code was generated by Reqnroll (https://www.reqnroll.net/).
-//      Reqnroll Version:2.0.0.0
-//      Reqnroll Generator Version:2.0.0.0
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if
-//      the code is regenerated.
-//  </auto-generated>
-// ------------------------------------------------------------------------------
-#region Designer generated code
-#pragma warning disable
-namespace ValueStringBuilderFeatures.Net80
-{
-    using Reqnroll;
-    using System;
-    using System.Linq;
-    
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")]
-    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute()]
-    public partial class AppendCompositeFormatIntoAValueStringBuilderFeature
-    {
-        
-        private static global::Reqnroll.ITestRunner testRunner;
-        
-        private Microsoft.VisualStudio.TestTools.UnitTesting.TestContext _testContext;
-        
-        private static string[] featureTags = ((string[])(null));
-        
-#line 1 "AppendCompositeFormat.feature"
-#line hidden
-        
-        public virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
-        {
-            get
-            {
-                return this._testContext;
-            }
-            set
-            {
-                this._testContext = value;
-            }
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute()]
-        public static async System.Threading.Tasks.Task FeatureSetupAsync(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext testContext)
-        {
-            testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(null, System.Threading.Thread.CurrentThread.ManagedThreadId.ToString());
-            global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "ValueStringBuilderFeatures/Net80", "Append CompositeFormat into a ValueStringBuilder", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags);
-            await testRunner.OnFeatureStartAsync(featureInfo);
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute(Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupBehavior.EndOfClass)]
-        public static async System.Threading.Tasks.Task FeatureTearDownAsync()
-        {
-            await testRunner.OnFeatureEndAsync();
-            testRunner = null;
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestInitializeAttribute()]
-        public async System.Threading.Tasks.Task TestInitializeAsync()
-        {
-            if (((testRunner.FeatureContext != null) 
-                        && (testRunner.FeatureContext.FeatureInfo.Title != "Append CompositeFormat into a ValueStringBuilder")))
-            {
-                await global::ValueStringBuilderFeatures.Net80.AppendCompositeFormatIntoAValueStringBuilderFeature.FeatureSetupAsync(null);
-            }
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestCleanupAttribute()]
-        public async System.Threading.Tasks.Task TestTearDownAsync()
-        {
-            await testRunner.OnScenarioEndAsync();
-        }
-        
-        public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo)
-        {
-            testRunner.OnScenarioInitialize(scenarioInfo);
-            testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs<Microsoft.VisualStudio.TestTools.UnitTesting.TestContext>(_testContext);
-        }
-        
-        public async System.Threading.Tasks.Task ScenarioStartAsync()
-        {
-            await testRunner.OnScenarioStartAsync();
-        }
-        
-        public async System.Threading.Tasks.Task ScenarioCleanupAsync()
-        {
-            await testRunner.CollectScenarioErrorsAsync();
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Append composite format")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Append CompositeFormat into a ValueStringBuilder")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "34", "Number: {0}, string: {1}.", "42", "Hello, world!", "Number: 42, string: Hello, world!.", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "26", "{0}, string: {1}.", "42", "Hello, world!", "42, string: Hello, world!.", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "33", "Number: {0}, string: {1}", "42", "Hello, world!", "Number: 42, string: Hello, world!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "15", "{0}{1}", "42", "Hello, world!", "42Hello, world!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "15", "{1}{0}", "42", "Hello, world!", "Hello, world!42", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "34", "Number: {0}, string: {1}.", "42", "Hello, world!", "Number: 42, string: Hello, world!.", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "26", "{0}, string: {1}.", "42", "Hello, world!", "42, string: Hello, world!.", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "33", "Number: {0}, string: {1}", "42", "Hello, world!", "Number: 42, string: Hello, world!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "15", "{0}{1}", "42", "Hello, world!", "42Hello, world!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "15", "{1}{0}", "42", "Hello, world!", "Hello, world!42", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "34", "Number: {0}, string: {1}.", "42", "Hello, world!", "Number: 42, string: Hello, world!.", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "34", "Number: {0}, string: {1}.", "42", "Hello, world!", "Number: 42, string: Hello, world!.", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "35", "Number: {0}, string: {1}.", "-42", "Hello, world!", "Number: -42, string: Hello, world!.", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "35", "Number: {0}, string: {1}.", "-42", "Hello, world!", "Number: -42, string: Hello, world!.", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "35", "Number: {0}, string: {1}.", "-42", "Hello, world!", "Number: -42, string: Hello, world!.", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "35", "Number: {0}, string: {1}.", "-42", "Hello, world!", "Number: -42, string: Hello, world!.", null)]
-        public async System.Threading.Tasks.Task AppendCompositeFormat(string initializationType, string initialLength, string compositeFormat, string firstValue, string secondValue, string result, string[] exampleTags)
-        {
-            string[] tagsOfScenario = exampleTags;
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            argumentsOfScenario.Add("InitializationType", initializationType);
-            argumentsOfScenario.Add("InitialLength", initialLength);
-            argumentsOfScenario.Add("CompositeFormat", compositeFormat);
-            argumentsOfScenario.Add("FirstValue", firstValue);
-            argumentsOfScenario.Add("SecondValue", secondValue);
-            argumentsOfScenario.Add("Result", result);
-            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Append composite format", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 3
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                await this.ScenarioStartAsync();
-#line 4
-    await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length {1}", initializationType, initialLength), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
-#line hidden
-#line 5
- await testRunner.AndAsync(string.Format("I append the format \'{0}\' to the ValueStringBuilder with arguments {1} and \'{2}\'", compositeFormat, firstValue, secondValue), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 6
- await testRunner.WhenAsync("I get the string from the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
-#line hidden
-#line 7
- await testRunner.ThenAsync(string.Format("the ValueStringBuilder string should be \'{0}\'", result), ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
-#line hidden
-            }
-            await this.ScenarioCleanupAsync();
-        }
-    }
-}
-#pragma warning restore
-#endregion
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Replace.feature.cs b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Replace.feature.cs
deleted file mode 100644
index 5b417a2..0000000
--- a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Replace.feature.cs
+++ /dev/null
@@ -1,551 +0,0 @@
-// ------------------------------------------------------------------------------
-//  <auto-generated>
-//      This code was generated by Reqnroll (https://www.reqnroll.net/).
-//      Reqnroll Version:2.0.0.0
-//      Reqnroll Generator Version:2.0.0.0
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if
-//      the code is regenerated.
-//  </auto-generated>
-// ------------------------------------------------------------------------------
-#region Designer generated code
-#pragma warning disable
-namespace ValueStringBuilderFeatures
-{
-    using Reqnroll;
-    using System;
-    using System.Linq;
-    
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")]
-    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute()]
-    public partial class ReplaceContentInAValueStringBuilderFeature
-    {
-        
-        private static global::Reqnroll.ITestRunner testRunner;
-        
-        private Microsoft.VisualStudio.TestTools.UnitTesting.TestContext _testContext;
-        
-        private static string[] featureTags = ((string[])(null));
-        
-#line 1 "Replace.feature"
-#line hidden
-        
-        public virtual Microsoft.VisualStudio.TestTools.UnitTesting.TestContext TestContext
-        {
-            get
-            {
-                return this._testContext;
-            }
-            set
-            {
-                this._testContext = value;
-            }
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassInitializeAttribute()]
-        public static async System.Threading.Tasks.Task FeatureSetupAsync(Microsoft.VisualStudio.TestTools.UnitTesting.TestContext testContext)
-        {
-            testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(null, System.Threading.Thread.CurrentThread.ManagedThreadId.ToString());
-            global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "ValueStringBuilderFeatures", "Replace content in a ValueStringBuilder", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags);
-            await testRunner.OnFeatureStartAsync(featureInfo);
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupAttribute(Microsoft.VisualStudio.TestTools.UnitTesting.ClassCleanupBehavior.EndOfClass)]
-        public static async System.Threading.Tasks.Task FeatureTearDownAsync()
-        {
-            await testRunner.OnFeatureEndAsync();
-            testRunner = null;
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestInitializeAttribute()]
-        public async System.Threading.Tasks.Task TestInitializeAsync()
-        {
-            if (((testRunner.FeatureContext != null) 
-                        && (testRunner.FeatureContext.FeatureInfo.Title != "Replace content in a ValueStringBuilder")))
-            {
-                await global::ValueStringBuilderFeatures.ReplaceContentInAValueStringBuilderFeature.FeatureSetupAsync(null);
-            }
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestCleanupAttribute()]
-        public async System.Threading.Tasks.Task TestTearDownAsync()
-        {
-            await testRunner.OnScenarioEndAsync();
-        }
-        
-        public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo)
-        {
-            testRunner.OnScenarioInitialize(scenarioInfo);
-            testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs<Microsoft.VisualStudio.TestTools.UnitTesting.TestContext>(_testContext);
-        }
-        
-        public async System.Threading.Tasks.Task ScenarioStartAsync()
-        {
-            await testRunner.OnScenarioStartAsync();
-        }
-        
-        public async System.Threading.Tasks.Task ScenarioCleanupAsync()
-        {
-            await testRunner.CollectScenarioErrorsAsync();
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("No change")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Replace content in a ValueStringBuilder")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "", null)]
-        public async System.Threading.Tasks.Task NoChange(string initializationType, string notUsed6248, string[] exampleTags)
-        {
-            string[] tagsOfScenario = exampleTags;
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            argumentsOfScenario.Add("InitializationType", initializationType);
-            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("No change", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 3
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                await this.ScenarioStartAsync();
-#line 4
- await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length 13", initializationType), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
-#line hidden
-#line 5
- await testRunner.AndAsync("I append \'Hello, World!\' to the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 6
- await testRunner.AndAsync("I replace \'notpresent\' with \'notused\' at index 0 with count 13", ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 7
- await testRunner.WhenAsync("I get the string from the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
-#line hidden
-#line 8
- await testRunner.ThenAsync("the ValueStringBuilder string should be \'Hello, World!\'", ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
-#line hidden
-            }
-            await this.ScenarioCleanupAsync();
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Shrinks")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Replace content in a ValueStringBuilder")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "i", "0", "13", "Hio, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "i", "0", "13", "Hio, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "i", "1", "12", "Hio, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "i", "1", "12", "Hio, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "i", "1", "3", "Hio, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "i", "1", "3", "Hio, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "i", "1", "2", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "i", "1", "2", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "i", "2", "11", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "i", "2", "11", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "x", "2", "23", "Hello, Wxld x wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "x", "2", "23", "Hello, Wxld x wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "x", "2", "10", "Hello, Wxld or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "x", "2", "10", "Hello, Wxld or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "x", "9", "6", "Hello, World x wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "x", "9", "6", "Hello, World x wherever!", null)]
-        public async System.Threading.Tasks.Task Shrinks(string initializationType, string find, string replacement, string start, string length, string result, string[] exampleTags)
-        {
-            string[] tagsOfScenario = exampleTags;
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            argumentsOfScenario.Add("InitializationType", initializationType);
-            argumentsOfScenario.Add("Find", find);
-            argumentsOfScenario.Add("Replacement", replacement);
-            argumentsOfScenario.Add("Start", start);
-            argumentsOfScenario.Add("Length", length);
-            argumentsOfScenario.Add("Result", result);
-            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Shrinks", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 14
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                await this.ScenarioStartAsync();
-#line 15
- await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length 23", initializationType), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
-#line hidden
-#line 16
- await testRunner.AndAsync("I append \'Hello, World or wherever!\' to the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 17
- await testRunner.AndAsync(string.Format("I replace \'{0}\' with \'{1}\' at index {2} with count {3}", find, replacement, start, length), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 18
- await testRunner.WhenAsync("I get the string from the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
-#line hidden
-#line 19
- await testRunner.ThenAsync(string.Format("the ValueStringBuilder string should be \'{0}\'", result), ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
-#line hidden
-            }
-            await this.ScenarioCleanupAsync();
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Changes without length change")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Replace content in a ValueStringBuilder")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijk", "0", "13", "Hijko, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijk", "0", "13", "Hijko, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijk", "1", "12", "Hijko, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijk", "1", "12", "Hijko, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijk", "1", "3", "Hijko, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijk", "1", "3", "Hijko, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijk", "1", "2", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijk", "1", "2", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijk", "2", "11", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijk", "2", "11", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "al", "2", "23", "Hello, Walld al wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "al", "2", "23", "Hello, Walld al wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "al", "2", "10", "Hello, Walld or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "al", "2", "10", "Hello, Walld or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "al", "9", "6", "Hello, World al wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "al", "9", "6", "Hello, World al wherever!", null)]
-        public async System.Threading.Tasks.Task ChangesWithoutLengthChange(string initializationType, string find, string replacement, string start, string length, string result, string[] exampleTags)
-        {
-            string[] tagsOfScenario = exampleTags;
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            argumentsOfScenario.Add("InitializationType", initializationType);
-            argumentsOfScenario.Add("Find", find);
-            argumentsOfScenario.Add("Replacement", replacement);
-            argumentsOfScenario.Add("Start", start);
-            argumentsOfScenario.Add("Length", length);
-            argumentsOfScenario.Add("Result", result);
-            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Changes without length change", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 39
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                await this.ScenarioStartAsync();
-#line 40
- await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length 23", initializationType), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
-#line hidden
-#line 41
- await testRunner.AndAsync("I append \'Hello, World or wherever!\' to the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 42
- await testRunner.AndAsync(string.Format("I replace \'{0}\' with \'{1}\' at index {2} with count {3}", find, replacement, start, length), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 43
- await testRunner.WhenAsync("I get the string from the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
-#line hidden
-#line 44
- await testRunner.ThenAsync(string.Format("the ValueStringBuilder string should be \'{0}\'", result), ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
-#line hidden
-            }
-            await this.ScenarioCleanupAsync();
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Grows but fits in available space")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Replace content in a ValueStringBuilder")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkx", "0", "13", "Hijkxo, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkx", "0", "13", "Hijkxo, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkx", "1", "12", "Hijkxo, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkx", "1", "12", "Hijkxo, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkx", "1", "3", "Hijkxo, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkx", "1", "3", "Hijkxo, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkx", "1", "2", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkx", "1", "2", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkx", "2", "11", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkx", "2", "11", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "alz", "2", "23", "Hello, Walzld alz wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "alz", "2", "23", "Hello, Walzld alz wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "alz", "2", "10", "Hello, Walzld or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "alz", "2", "10", "Hello, Walzld or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "alz", "9", "6", "Hello, World alz wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "alz", "9", "6", "Hello, World alz wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkxwv", "0", "13", "Hijkxwvo, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkxwv", "0", "13", "Hijkxwvo, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkxwv", "1", "12", "Hijkxwvo, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkxwv", "1", "12", "Hijkxwvo, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkxwv", "1", "3", "Hijkxwvo, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkxwv", "1", "3", "Hijkxwvo, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkxwv", "1", "2", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkxwv", "1", "2", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkxwv", "2", "11", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkxwv", "2", "11", "Hello, World or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "alzyh", "2", "23", "Hello, Walzyhld alzyh wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "alzyh", "2", "23", "Hello, Walzyhld alzyh wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "alzyh", "2", "10", "Hello, Walzyhld or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "alzyh", "2", "10", "Hello, Walzyhld or wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "alzyh", "9", "6", "Hello, World alzyh wherever!", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "alzyh", "9", "6", "Hello, World alzyh wherever!", null)]
-        public async System.Threading.Tasks.Task GrowsButFitsInAvailableSpace(string initializationType, string find, string replacement, string start, string length, string result, string[] exampleTags)
-        {
-            string[] tagsOfScenario = exampleTags;
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            argumentsOfScenario.Add("InitializationType", initializationType);
-            argumentsOfScenario.Add("Find", find);
-            argumentsOfScenario.Add("Replacement", replacement);
-            argumentsOfScenario.Add("Start", start);
-            argumentsOfScenario.Add("Length", length);
-            argumentsOfScenario.Add("Result", result);
-            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Grows but fits in available space", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 64
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                await this.ScenarioStartAsync();
-#line 65
- await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length 25", initializationType), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
-#line hidden
-#line 66
- await testRunner.AndAsync("I append \'Hello, World or wherever!\' to the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 67
- await testRunner.AndAsync(string.Format("I replace \'{0}\' with \'{1}\' at index {2} with count {3}", find, replacement, start, length), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 68
- await testRunner.WhenAsync("I get the string from the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
-#line hidden
-#line 69
- await testRunner.ThenAsync(string.Format("the ValueStringBuilder string should be \'{0}\'", result), ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
-#line hidden
-            }
-            await this.ScenarioCleanupAsync();
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Grows and requires resize")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Replace content in a ValueStringBuilder")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkx", "0", "13", "Hijkxo, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkx", "0", "13", "Hijkxo, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkx", "1", "12", "Hijkxo, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkx", "1", "12", "Hijkxo, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkx", "1", "3", "Hijkxo, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkx", "1", "3", "Hijkxo, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkx", "1", "2", "Hello, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkx", "1", "2", "Hello, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkx", "2", "11", "Hello, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkx", "2", "11", "Hello, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "alz", "2", "23", "Hello, Walzld alz wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "alz", "2", "23", "Hello, Walzld alz wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "alz", "2", "10", "Hello, Walzld or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "alz", "2", "10", "Hello, Walzld or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "alz", "9", "6", "Hello, World alz wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "alz", "9", "6", "Hello, World alz wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkxwv", "0", "13", "Hijkxwvo, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkxwv", "0", "13", "Hijkxwvo, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkxwv", "1", "12", "Hijkxwvo, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkxwv", "1", "12", "Hijkxwvo, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkxwv", "1", "3", "Hijkxwvo, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkxwv", "1", "3", "Hijkxwvo, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkxwv", "1", "2", "Hello, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkxwv", "1", "2", "Hello, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "ell", "ijkxwv", "2", "11", "Hello, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "ell", "ijkxwv", "2", "11", "Hello, World or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "alzyh", "2", "23", "Hello, Walzyhld alzyh wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "alzyh", "2", "23", "Hello, Walzyhld alzyh wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "alzyh", "2", "10", "Hello, Walzyhld or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "alzyh", "2", "10", "Hello, Walzyhld or wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "or", "alzyh", "9", "6", "Hello, World alzyh wherever!padpadp", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "or", "alzyh", "9", "6", "Hello, World alzyh wherever!padpadp", null)]
-        public async System.Threading.Tasks.Task GrowsAndRequiresResize(string initializationType, string find, string replacement, string start, string length, string result, string[] exampleTags)
-        {
-            string[] tagsOfScenario = exampleTags;
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            argumentsOfScenario.Add("InitializationType", initializationType);
-            argumentsOfScenario.Add("Find", find);
-            argumentsOfScenario.Add("Replacement", replacement);
-            argumentsOfScenario.Add("Start", start);
-            argumentsOfScenario.Add("Length", length);
-            argumentsOfScenario.Add("Result", result);
-            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Grows and requires resize", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 106
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                await this.ScenarioStartAsync();
-#line 107
- await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length 32", initializationType), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
-#line hidden
-#line 108
- await testRunner.AndAsync("I append \'Hello, World or wherever!padpadp\' to the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 109
- await testRunner.AndAsync(string.Format("I replace \'{0}\' with \'{1}\' at index {2} with count {3}", find, replacement, start, length), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 110
- await testRunner.WhenAsync("I get the string from the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
-#line hidden
-#line 111
- await testRunner.ThenAsync(string.Format("the ValueStringBuilder string should be \'{0}\'", result), ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
-#line hidden
-            }
-            await this.ScenarioCleanupAsync();
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Text not present")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Replace content in a ValueStringBuilder")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "foo", "ijkx", "0", "25", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "foo", "ijkx", "0", "25", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "elloo", "ijkx", "0", "25", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "elloo", "ijkx", "0", "25", null)]
-        public async System.Threading.Tasks.Task TextNotPresent(string initializationType, string find, string replacement, string start, string length, string[] exampleTags)
-        {
-            string[] tagsOfScenario = exampleTags;
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            argumentsOfScenario.Add("InitializationType", initializationType);
-            argumentsOfScenario.Add("Find", find);
-            argumentsOfScenario.Add("Replacement", replacement);
-            argumentsOfScenario.Add("Start", start);
-            argumentsOfScenario.Add("Length", length);
-            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Text not present", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 148
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                await this.ScenarioStartAsync();
-#line 149
- await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length 25", initializationType), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
-#line hidden
-#line 150
- await testRunner.AndAsync("I append \'Hello, World or wherever!\' to the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 151
- await testRunner.AndAsync(string.Format("I replace \'{0}\' with \'{1}\' at index {2} with count {3}", find, replacement, start, length), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 152
- await testRunner.WhenAsync("I get the string from the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
-#line hidden
-#line 153
- await testRunner.ThenAsync("the ValueStringBuilder string should be \'Hello, World or wherever!\'", ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
-#line hidden
-            }
-            await this.ScenarioCleanupAsync();
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Text not within specified range")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Replace content in a ValueStringBuilder")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "orld", "ijkx", "0", "8", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "orld", "ijkx", "0", "8", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "orld", "ijkx", "0", "8", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "orld", "ijkx", "0", "11", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "orld", "ijkx", "8", "3", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "orld", "ijkx", "8", "3", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "orld", "ijkx", "9", "16", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "orld", "ijkx", "9", "16", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "orld", "ijkx", "12", "13", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "orld", "ijkx", "12", "13", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "orld", "ijkx", "0", "0", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "orld", "ijkx", "0", "0", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "orld", "ijkx", "8", "0", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "orld", "ijkx", "8", "0", null)]
-        public async System.Threading.Tasks.Task TextNotWithinSpecifiedRange(string initializationType, string find, string replacement, string start, string length, string[] exampleTags)
-        {
-            string[] tagsOfScenario = exampleTags;
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            argumentsOfScenario.Add("InitializationType", initializationType);
-            argumentsOfScenario.Add("Find", find);
-            argumentsOfScenario.Add("Replacement", replacement);
-            argumentsOfScenario.Add("Start", start);
-            argumentsOfScenario.Add("Length", length);
-            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Text not within specified range", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 162
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                await this.ScenarioStartAsync();
-#line 163
- await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length 25", initializationType), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
-#line hidden
-#line 164
- await testRunner.AndAsync("I append \'Hello, World or wherever!\' to the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 165
- await testRunner.AndAsync(string.Format("I replace \'{0}\' with \'{1}\' at index {2} with count {3}", find, replacement, start, length), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 166
- await testRunner.WhenAsync("I get the string from the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "When ");
-#line hidden
-#line 167
- await testRunner.ThenAsync("the ValueStringBuilder string should be \'Hello, World or wherever!\'", ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
-#line hidden
-            }
-            await this.ScenarioCleanupAsync();
-        }
-        
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute()]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DescriptionAttribute("Specified range is out of bounds")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.TestPropertyAttribute("FeatureTitle", "Replace content in a ValueStringBuilder")]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "orld", "ijkx", "0", "26", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "orld", "ijkx", "0", "26", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "orld", "ijkx", "1", "25", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "orld", "ijkx", "1", "25", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Span", "orld", "ijkx", "10", "-4", null)]
-        [Microsoft.VisualStudio.TestTools.UnitTesting.DataRowAttribute("Capacity", "orld", "ijkx", "10", "-4", null)]
-        public async System.Threading.Tasks.Task SpecifiedRangeIsOutOfBounds(string initializationType, string find, string replacement, string start, string length, string[] exampleTags)
-        {
-            string[] tagsOfScenario = exampleTags;
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            argumentsOfScenario.Add("InitializationType", initializationType);
-            argumentsOfScenario.Add("Find", find);
-            argumentsOfScenario.Add("Replacement", replacement);
-            argumentsOfScenario.Add("Start", start);
-            argumentsOfScenario.Add("Length", length);
-            global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Specified range is out of bounds", null, tagsOfScenario, argumentsOfScenario, featureTags);
-#line 185
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags)))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                await this.ScenarioStartAsync();
-#line 186
- await testRunner.GivenAsync(string.Format("a ValueStringBuilder initialized with \'{0}\' of length 25", initializationType), ((string)(null)), ((global::Reqnroll.Table)(null)), "Given ");
-#line hidden
-#line 187
- await testRunner.AndAsync("I append \'Hello, World or wherever!\' to the ValueStringBuilder", ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 188
- await testRunner.AndAsync(string.Format("I attempt to replace \'{0}\' with \'{1}\' at index {2} with count {3}", find, replacement, start, length), ((string)(null)), ((global::Reqnroll.Table)(null)), "And ");
-#line hidden
-#line 189
- await testRunner.ThenAsync("the attempt should have thrown a \'System.ArgumentOutOfRangeException\'", ((string)(null)), ((global::Reqnroll.Table)(null)), "Then ");
-#line hidden
-            }
-            await this.ScenarioCleanupAsync();
-        }
-    }
-}
-#pragma warning restore
-#endregion
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs
index e60060f..beb173a 100644
--- a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs
+++ b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs
@@ -2,14 +2,10 @@
 // Copyright (c) Endjin Limited. All rights reserved.
 // </copyright>
 
-using System.Text;
-
 using Corvus.HighPerformance.Specs;
 
 using Reqnroll;
 
-using static System.Net.Mime.MediaTypeNames;
-
 namespace ValueStringBuilderFeatures;
 
 [Binding]
diff --git a/Solutions/Corvus.HighPerformance.Specs/packages.lock.json b/Solutions/Corvus.HighPerformance.Specs/packages.lock.json
index 7a146b5..dbca46b 100644
--- a/Solutions/Corvus.HighPerformance.Specs/packages.lock.json
+++ b/Solutions/Corvus.HighPerformance.Specs/packages.lock.json
@@ -20,11 +20,11 @@
       },
       "Microsoft.NET.Test.Sdk": {
         "type": "Direct",
-        "requested": "[17.10.0, )",
-        "resolved": "17.10.0",
-        "contentHash": "0/2HeACkaHEYU3wc83YlcD2Fi4LMtECJjqrtvw0lPi9DCEa35zSPt1j4fuvM8NagjDqJuh1Ja35WcRtn1Um6/A==",
+        "requested": "[17.11.1, )",
+        "resolved": "17.11.1",
+        "contentHash": "U3Ty4BaGoEu+T2bwSko9tWqWUOU16WzSFkq6U8zve75oRBMSLTBdMAZrVNNz1Tq12aCdDom9fcOcM9QZaFHqFg==",
         "dependencies": {
-          "Microsoft.CodeCoverage": "17.10.0"
+          "Microsoft.CodeCoverage": "17.11.1"
         }
       },
       "Microsoft.NETFramework.ReferenceAssemblies": {
@@ -38,29 +38,29 @@
       },
       "MSTest.TestAdapter": {
         "type": "Direct",
-        "requested": "[3.5.0, )",
-        "resolved": "3.5.0",
-        "contentHash": "a5a7vo9vp21DbduF6vru34e0nS4Ggxk9pQ3rVJmsI9u+5/Sr83oHsvPGpnSxKi4S6ktEISDEdBuKZNZMsp+JkA==",
+        "requested": "[3.6.0, )",
+        "resolved": "3.6.0",
+        "contentHash": "UIoSCVXds8Wxk5yWwoSJ6Q87LD6Hv7WrbggK1Uxwir1FmTrTLYtBTap0qUA6yhms4paZsMfESqq3ufJen17A1Q==",
         "dependencies": {
-          "Microsoft.Testing.Extensions.VSTestBridge": "1.3.1",
-          "Microsoft.Testing.Platform.MSBuild": "1.3.1"
+          "Microsoft.Testing.Extensions.VSTestBridge": "1.4.0",
+          "Microsoft.Testing.Platform.MSBuild": "1.4.0"
         }
       },
       "MSTest.TestFramework": {
         "type": "Direct",
-        "requested": "[3.5.0, )",
-        "resolved": "3.5.0",
-        "contentHash": "N99l244tFQp4wmYQynUrL8Ws/0mnG+m/G66ahH0JyRoNCd9PMAYBvGUKC1JT3oXyg0YV8o8sHauw2IR6R1M9mQ=="
+        "requested": "[3.6.0, )",
+        "resolved": "3.6.0",
+        "contentHash": "mpIPmxsKPfjc08X9tqh0ec4Pyt/zpFUIfL2GA6CjvLmnX4zTw6llqJGnWpUbXTWEVhQu38jtqfEjeUYjMGT4Gg=="
       },
       "Reqnroll.MsTest": {
         "type": "Direct",
-        "requested": "[2.0.3, )",
-        "resolved": "2.0.3",
-        "contentHash": "zAlMj5TeqAW6ivPn81mMcdr8IMf850Ij4LGY+szgDSV/grRZ3Kn7e+ELb6M8mvqFvA49QPqi3k/0z1moz8HK4g==",
+        "requested": "[2.1.0, )",
+        "resolved": "2.1.0",
+        "contentHash": "+XSRmQHtq7korAg1AokWUaaQPWh9bFeskGiV2okbInm/TKztwStR4HsIq8Byq3YEb7dvrJrEP0Zcz1EOLTkDOQ==",
         "dependencies": {
           "MSTest.TestFramework": "2.2.8",
-          "Reqnroll": "[2.0.3]",
-          "Reqnroll.Tools.MsBuild.Generation": "[2.0.3]"
+          "Reqnroll": "[2.1.0]",
+          "Reqnroll.Tools.MsBuild.Generation": "[2.1.0]"
         }
       },
       "Roslynator.Analyzers": {
@@ -80,8 +80,8 @@
       },
       "Cucumber.CucumberExpressions": {
         "type": "Transitive",
-        "resolved": "16.0.0",
-        "contentHash": "fFuJVpAXfIOvN9EXbCiYSg9vS6m9Y24jsQfhvSn7kYQRHtXksCSy/JAkWDbyUEheQUkeM1FRaC9Pt2ODHpSBeQ=="
+        "resolved": "17.1.0",
+        "contentHash": "IZFDLLwrUCKuGDXQzmAWZa+kQFpVmVwWD8wEl0UWGOR83UQfzqg8hZeSSNUOXlW0Kh3vMO6kEm3FpNC4amKMaw=="
       },
       "Endjin.RecommendedPractices": {
         "type": "Transitive",
@@ -93,8 +93,8 @@
       },
       "Gherkin": {
         "type": "Transitive",
-        "resolved": "19.0.3",
-        "contentHash": "kq9feqMojMj9aABrHb/ABEPaH2Y4dSclseSahAru6qxCeqVQNLLTgw/6vZMauzI1yBUL2fz03ub5yEd5btLfvg=="
+        "resolved": "29.0.0",
+        "contentHash": "az9zmD5V72UZUzYcDyHoZHFRT5eSLOg1Co2r3AtlshPe41Am7iMwOJG+xHxZ1Pfn6agGoWw1dhm6Pn8Dg6QBUg=="
       },
       "IndexRange": {
         "type": "Transitive",
@@ -111,8 +111,8 @@
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==",
+        "resolved": "8.0.0",
+        "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==",
         "dependencies": {
           "System.Threading.Tasks.Extensions": "4.5.4"
         }
@@ -124,20 +124,18 @@
       },
       "Microsoft.CodeCoverage": {
         "type": "Transitive",
-        "resolved": "17.10.0",
-        "contentHash": "yC7oSlnR54XO5kOuHlVOKtxomNNN1BWXX8lK1G2jaPXT9sUok7kCOoA4Pgs0qyFaCtMrNsprztYMeoEGqCm4uA=="
+        "resolved": "17.11.1",
+        "contentHash": "nPJqrcA5iX+Y0kqoT3a+pD/8lrW/V7ayqnEJQsTonSoPz59J8bmoQhcSN4G8+UJ64Hkuf0zuxnfuj2lkHOq4cA=="
       },
       "Microsoft.Extensions.DependencyModel": {
         "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "TD5QHg98m3+QhgEV1YVoNMl5KtBw/4rjfxLHO0e/YV9bPUBDKntApP4xdrVtGgCeQZHVfC2EXIGsdpRNrr87Pg==",
+        "resolved": "8.0.1",
+        "contentHash": "5Ou6varcxLBzQ+Agfm0k0pnH7vrEITYlXMDuE6s7ZHlZHz6/G8XJ3iISZDr5rfwfge6RnXJ1+Wc479mMn52vjA==",
         "dependencies": {
           "System.Buffers": "4.5.1",
-          "System.Memory": "4.5.4",
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0",
-          "System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
-          "System.Text.Encodings.Web": "6.0.0",
-          "System.Text.Json": "6.0.0"
+          "System.Memory": "4.5.5",
+          "System.Text.Encodings.Web": "8.0.0",
+          "System.Text.Json": "8.0.4"
         }
       },
       "Microsoft.NETFramework.ReferenceAssemblies.net481": {
@@ -161,72 +159,72 @@
       },
       "Microsoft.Testing.Extensions.Telemetry": {
         "type": "Transitive",
-        "resolved": "1.3.1",
-        "contentHash": "6+v8QX9bnE3AxoYKyRVyKBo4tON8RXHyX9VvR5nt5yU4n1o5RhCs7DXJeHRx5b8JjssWzAEcJxWrdFWmUJGncA==",
+        "resolved": "1.4.0",
+        "contentHash": "UX+T/xUOOh63KqWj6kPS2bw/E0uViIdLWUZmxk/iI+RvCzVklNzEKyaaPNo74T1GOowOSc2Kgp7RGhQK57FdyQ==",
         "dependencies": {
           "Microsoft.ApplicationInsights": "2.22.0",
-          "Microsoft.Testing.Platform": "1.3.1"
+          "Microsoft.Testing.Platform": "1.4.0"
         }
       },
       "Microsoft.Testing.Extensions.TrxReport.Abstractions": {
         "type": "Transitive",
-        "resolved": "1.3.1",
-        "contentHash": "v1DSyf1yBGGfuHUeq4fJ5br/KmmWgRE5o/+zrAnO8pdOJAGDhM69AF94Lo1JjSFRxIALW7JKzLF2EeGh8w8GlQ==",
+        "resolved": "1.4.0",
+        "contentHash": "7ulY2yQ+0BH1sjSRvgXNBmhWDTtPDHOirULnnOnuKpf0m9sIETttURmfF2xZaGYsajZ/hECkL1AKFegGB+Kb9g==",
         "dependencies": {
-          "Microsoft.Testing.Platform": "1.3.1"
+          "Microsoft.Testing.Platform": "1.4.0"
         }
       },
       "Microsoft.Testing.Extensions.VSTestBridge": {
         "type": "Transitive",
-        "resolved": "1.3.1",
-        "contentHash": "EOfSPyjA1uQ2lIp99dPKfIY2m2vJx/Aw9FsfChZ1/9sBD4UGOVNokAFr7O29tZB2esp7IW6xVgrB5+25xzLQ1g==",
+        "resolved": "1.4.0",
+        "contentHash": "C6XAiFJuxjJsk67VgoVjhkNvCp0WZSEUJRpzaDTe92GatOY7CkWP9cj78qZuw/JD0mv6kktdKwNcU5lF9F8Yew==",
         "dependencies": {
           "Microsoft.ApplicationInsights": "2.22.0",
-          "Microsoft.TestPlatform.ObjectModel": "17.10.0",
-          "Microsoft.Testing.Extensions.Telemetry": "1.3.1",
-          "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.3.1",
-          "Microsoft.Testing.Platform": "1.3.1"
+          "Microsoft.TestPlatform.ObjectModel": "17.11.0",
+          "Microsoft.Testing.Extensions.Telemetry": "1.4.0",
+          "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.0",
+          "Microsoft.Testing.Platform": "1.4.0"
         }
       },
       "Microsoft.Testing.Platform": {
         "type": "Transitive",
-        "resolved": "1.3.1",
-        "contentHash": "6XIhbvn3o7+KRlHzf0qHjVlQRjVHpsQNWQZtDyclMpfcYfkulqan+e0ZkhpcnqVMYZ9HyiHvQ4q8QIUYH4stbQ=="
+        "resolved": "1.4.0",
+        "contentHash": "6JtCqi0nq43wFDUrDfx3NrmFJYqWpmbEjEv4bVtgP6BTry1aw0Zd3FDQmZbWqnWGbvPgwm39YUXedf1+yzTkmg=="
       },
       "Microsoft.Testing.Platform.MSBuild": {
         "type": "Transitive",
-        "resolved": "1.3.1",
-        "contentHash": "zv5iC5H6IYDxc1+QXN3LY4mUG1WjBNLrh+PG+Lra8cHdFiFFoU0ZnZ1BRn2dBVwl3YmU57ouKFivhRoLjisl3Q==",
+        "resolved": "1.4.0",
+        "contentHash": "EBarJH6u97ng2DIpNNimUnbMGAMh2mC3uxaXqdnhLNtdLjNq9QNtEfrf+nOr84mTNA4KwDXZZAK1H5ZupoAaWw==",
         "dependencies": {
-          "Microsoft.Testing.Platform": "1.3.1"
+          "Microsoft.Testing.Platform": "1.4.0"
         }
       },
       "Microsoft.TestPlatform.ObjectModel": {
         "type": "Transitive",
-        "resolved": "17.10.0",
-        "contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==",
+        "resolved": "17.11.0",
+        "contentHash": "PU+CC1yRzbR0IllrtdILaeep7WP5OIrvmWrvCMqG3jB1h4F6Ur7CYHl6ENbDVXPzEvygXh0GWbTyrbjfvgTpAg==",
         "dependencies": {
           "System.Reflection.Metadata": "1.6.0"
         }
       },
       "Reqnroll": {
         "type": "Transitive",
-        "resolved": "2.0.3",
-        "contentHash": "J4l4rrVuhu+Avhp6huzK+/sLenpQPndHH9Ma6M9ul+qeqwQ+2glJfRQ/GSslqYxtrdcX4Wwr+9xla5SdEriRAg==",
+        "resolved": "2.1.0",
+        "contentHash": "lkNiB+MMwNeKL8/p2TqHVmUpMB0G2vVYdhyz9XFNutxDLRD2L6eBNU3jBeCyAoWcBkXMB1lG0gTV7u8LqbEBwA==",
         "dependencies": {
-          "Cucumber.CucumberExpressions": "16.0.0",
-          "Gherkin": "19.0.3",
-          "Microsoft.Extensions.DependencyModel": "6.0.0",
+          "Cucumber.CucumberExpressions": "17.1.0",
+          "Gherkin": "29.0.0",
+          "Microsoft.Extensions.DependencyModel": "8.0.1",
           "SpecFlow.Internal.Json": "1.0.8",
           "System.Runtime.Loader": "4.3.0"
         }
       },
       "Reqnroll.Tools.MsBuild.Generation": {
         "type": "Transitive",
-        "resolved": "2.0.3",
-        "contentHash": "H7yIi52OvzJiJX0tI4GYa4kZjPzxavkcEMIWWtKHugpAOwSXWO7TvXlnz6DHW7F2Nty0n+3M/FhaNNlt28OnFA==",
+        "resolved": "2.1.0",
+        "contentHash": "3RRbCQRriNbSsS1O4xI38NGMssA89sDgxG6NAPE4j4QkscmsStl+M015raIb3dGWMxkZ/1o4oYcL/HQG4sJpGQ==",
         "dependencies": {
-          "Reqnroll": "[2.0.3]"
+          "Reqnroll": "[2.1.0]"
         }
       },
       "SpecFlow.Internal.Json": {
@@ -286,11 +284,6 @@
         "resolved": "6.0.0",
         "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
       },
-      "System.Runtime.InteropServices.RuntimeInformation": {
-        "type": "Transitive",
-        "resolved": "4.3.0",
-        "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw=="
-      },
       "System.Runtime.Loader": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -298,25 +291,24 @@
       },
       "System.Text.Encodings.Web": {
         "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
+        "resolved": "8.0.0",
+        "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==",
         "dependencies": {
           "System.Buffers": "4.5.1",
-          "System.Memory": "4.5.4",
+          "System.Memory": "4.5.5",
           "System.Runtime.CompilerServices.Unsafe": "6.0.0"
         }
       },
       "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==",
+        "resolved": "8.0.4",
+        "contentHash": "bAkhgDJ88XTsqczoxEMliSrpijKZHhbJQldhAmObj/RbrN3sU5dcokuXmWJWsdQAhiMJ9bTayWsL1C9fbbCRhw==",
         "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "8.0.0",
           "System.Buffers": "4.5.1",
-          "System.Memory": "4.5.4",
-          "System.Numerics.Vectors": "4.5.0",
+          "System.Memory": "4.5.5",
           "System.Runtime.CompilerServices.Unsafe": "6.0.0",
-          "System.Text.Encodings.Web": "6.0.0",
+          "System.Text.Encodings.Web": "8.0.0",
           "System.Threading.Tasks.Extensions": "4.5.4",
           "System.ValueTuple": "4.5.0"
         }
@@ -362,39 +354,39 @@
       },
       "Microsoft.NET.Test.Sdk": {
         "type": "Direct",
-        "requested": "[17.10.0, )",
-        "resolved": "17.10.0",
-        "contentHash": "0/2HeACkaHEYU3wc83YlcD2Fi4LMtECJjqrtvw0lPi9DCEa35zSPt1j4fuvM8NagjDqJuh1Ja35WcRtn1Um6/A==",
+        "requested": "[17.11.1, )",
+        "resolved": "17.11.1",
+        "contentHash": "U3Ty4BaGoEu+T2bwSko9tWqWUOU16WzSFkq6U8zve75oRBMSLTBdMAZrVNNz1Tq12aCdDom9fcOcM9QZaFHqFg==",
         "dependencies": {
-          "Microsoft.CodeCoverage": "17.10.0",
-          "Microsoft.TestPlatform.TestHost": "17.10.0"
+          "Microsoft.CodeCoverage": "17.11.1",
+          "Microsoft.TestPlatform.TestHost": "17.11.1"
         }
       },
       "MSTest.TestAdapter": {
         "type": "Direct",
-        "requested": "[3.5.0, )",
-        "resolved": "3.5.0",
-        "contentHash": "a5a7vo9vp21DbduF6vru34e0nS4Ggxk9pQ3rVJmsI9u+5/Sr83oHsvPGpnSxKi4S6ktEISDEdBuKZNZMsp+JkA==",
+        "requested": "[3.6.0, )",
+        "resolved": "3.6.0",
+        "contentHash": "UIoSCVXds8Wxk5yWwoSJ6Q87LD6Hv7WrbggK1Uxwir1FmTrTLYtBTap0qUA6yhms4paZsMfESqq3ufJen17A1Q==",
         "dependencies": {
-          "Microsoft.Testing.Extensions.VSTestBridge": "1.3.1",
-          "Microsoft.Testing.Platform.MSBuild": "1.3.1"
+          "Microsoft.Testing.Extensions.VSTestBridge": "1.4.0",
+          "Microsoft.Testing.Platform.MSBuild": "1.4.0"
         }
       },
       "MSTest.TestFramework": {
         "type": "Direct",
-        "requested": "[3.5.0, )",
-        "resolved": "3.5.0",
-        "contentHash": "N99l244tFQp4wmYQynUrL8Ws/0mnG+m/G66ahH0JyRoNCd9PMAYBvGUKC1JT3oXyg0YV8o8sHauw2IR6R1M9mQ=="
+        "requested": "[3.6.0, )",
+        "resolved": "3.6.0",
+        "contentHash": "mpIPmxsKPfjc08X9tqh0ec4Pyt/zpFUIfL2GA6CjvLmnX4zTw6llqJGnWpUbXTWEVhQu38jtqfEjeUYjMGT4Gg=="
       },
       "Reqnroll.MsTest": {
         "type": "Direct",
-        "requested": "[2.0.3, )",
-        "resolved": "2.0.3",
-        "contentHash": "zAlMj5TeqAW6ivPn81mMcdr8IMf850Ij4LGY+szgDSV/grRZ3Kn7e+ELb6M8mvqFvA49QPqi3k/0z1moz8HK4g==",
+        "requested": "[2.1.0, )",
+        "resolved": "2.1.0",
+        "contentHash": "+XSRmQHtq7korAg1AokWUaaQPWh9bFeskGiV2okbInm/TKztwStR4HsIq8Byq3YEb7dvrJrEP0Zcz1EOLTkDOQ==",
         "dependencies": {
           "MSTest.TestFramework": "2.2.8",
-          "Reqnroll": "[2.0.3]",
-          "Reqnroll.Tools.MsBuild.Generation": "[2.0.3]"
+          "Reqnroll": "[2.1.0]",
+          "Reqnroll.Tools.MsBuild.Generation": "[2.1.0]"
         }
       },
       "Roslynator.Analyzers": {
@@ -414,8 +406,8 @@
       },
       "Cucumber.CucumberExpressions": {
         "type": "Transitive",
-        "resolved": "16.0.0",
-        "contentHash": "fFuJVpAXfIOvN9EXbCiYSg9vS6m9Y24jsQfhvSn7kYQRHtXksCSy/JAkWDbyUEheQUkeM1FRaC9Pt2ODHpSBeQ=="
+        "resolved": "17.1.0",
+        "contentHash": "IZFDLLwrUCKuGDXQzmAWZa+kQFpVmVwWD8wEl0UWGOR83UQfzqg8hZeSSNUOXlW0Kh3vMO6kEm3FpNC4amKMaw=="
       },
       "Endjin.RecommendedPractices": {
         "type": "Transitive",
@@ -427,8 +419,8 @@
       },
       "Gherkin": {
         "type": "Transitive",
-        "resolved": "19.0.3",
-        "contentHash": "kq9feqMojMj9aABrHb/ABEPaH2Y4dSclseSahAru6qxCeqVQNLLTgw/6vZMauzI1yBUL2fz03ub5yEd5btLfvg=="
+        "resolved": "29.0.0",
+        "contentHash": "az9zmD5V72UZUzYcDyHoZHFRT5eSLOg1Co2r3AtlshPe41Am7iMwOJG+xHxZ1Pfn6agGoWw1dhm6Pn8Dg6QBUg=="
       },
       "Microsoft.ApplicationInsights": {
         "type": "Transitive",
@@ -445,19 +437,16 @@
       },
       "Microsoft.CodeCoverage": {
         "type": "Transitive",
-        "resolved": "17.10.0",
-        "contentHash": "yC7oSlnR54XO5kOuHlVOKtxomNNN1BWXX8lK1G2jaPXT9sUok7kCOoA4Pgs0qyFaCtMrNsprztYMeoEGqCm4uA=="
+        "resolved": "17.11.1",
+        "contentHash": "nPJqrcA5iX+Y0kqoT3a+pD/8lrW/V7ayqnEJQsTonSoPz59J8bmoQhcSN4G8+UJ64Hkuf0zuxnfuj2lkHOq4cA=="
       },
       "Microsoft.Extensions.DependencyModel": {
         "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "TD5QHg98m3+QhgEV1YVoNMl5KtBw/4rjfxLHO0e/YV9bPUBDKntApP4xdrVtGgCeQZHVfC2EXIGsdpRNrr87Pg==",
+        "resolved": "8.0.1",
+        "contentHash": "5Ou6varcxLBzQ+Agfm0k0pnH7vrEITYlXMDuE6s7ZHlZHz6/G8XJ3iISZDr5rfwfge6RnXJ1+Wc479mMn52vjA==",
         "dependencies": {
-          "System.Buffers": "4.5.1",
-          "System.Memory": "4.5.4",
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0",
-          "System.Text.Encodings.Web": "6.0.0",
-          "System.Text.Json": "6.0.0"
+          "System.Text.Encodings.Web": "8.0.0",
+          "System.Text.Json": "8.0.4"
         }
       },
       "Microsoft.NETCore.Platforms": {
@@ -486,60 +475,60 @@
       },
       "Microsoft.Testing.Extensions.Telemetry": {
         "type": "Transitive",
-        "resolved": "1.3.1",
-        "contentHash": "6+v8QX9bnE3AxoYKyRVyKBo4tON8RXHyX9VvR5nt5yU4n1o5RhCs7DXJeHRx5b8JjssWzAEcJxWrdFWmUJGncA==",
+        "resolved": "1.4.0",
+        "contentHash": "UX+T/xUOOh63KqWj6kPS2bw/E0uViIdLWUZmxk/iI+RvCzVklNzEKyaaPNo74T1GOowOSc2Kgp7RGhQK57FdyQ==",
         "dependencies": {
           "Microsoft.ApplicationInsights": "2.22.0",
-          "Microsoft.Testing.Platform": "1.3.1"
+          "Microsoft.Testing.Platform": "1.4.0"
         }
       },
       "Microsoft.Testing.Extensions.TrxReport.Abstractions": {
         "type": "Transitive",
-        "resolved": "1.3.1",
-        "contentHash": "v1DSyf1yBGGfuHUeq4fJ5br/KmmWgRE5o/+zrAnO8pdOJAGDhM69AF94Lo1JjSFRxIALW7JKzLF2EeGh8w8GlQ==",
+        "resolved": "1.4.0",
+        "contentHash": "7ulY2yQ+0BH1sjSRvgXNBmhWDTtPDHOirULnnOnuKpf0m9sIETttURmfF2xZaGYsajZ/hECkL1AKFegGB+Kb9g==",
         "dependencies": {
-          "Microsoft.Testing.Platform": "1.3.1"
+          "Microsoft.Testing.Platform": "1.4.0"
         }
       },
       "Microsoft.Testing.Extensions.VSTestBridge": {
         "type": "Transitive",
-        "resolved": "1.3.1",
-        "contentHash": "EOfSPyjA1uQ2lIp99dPKfIY2m2vJx/Aw9FsfChZ1/9sBD4UGOVNokAFr7O29tZB2esp7IW6xVgrB5+25xzLQ1g==",
+        "resolved": "1.4.0",
+        "contentHash": "C6XAiFJuxjJsk67VgoVjhkNvCp0WZSEUJRpzaDTe92GatOY7CkWP9cj78qZuw/JD0mv6kktdKwNcU5lF9F8Yew==",
         "dependencies": {
           "Microsoft.ApplicationInsights": "2.22.0",
-          "Microsoft.TestPlatform.ObjectModel": "17.10.0",
-          "Microsoft.Testing.Extensions.Telemetry": "1.3.1",
-          "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.3.1",
-          "Microsoft.Testing.Platform": "1.3.1"
+          "Microsoft.TestPlatform.ObjectModel": "17.11.0",
+          "Microsoft.Testing.Extensions.Telemetry": "1.4.0",
+          "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.4.0",
+          "Microsoft.Testing.Platform": "1.4.0"
         }
       },
       "Microsoft.Testing.Platform": {
         "type": "Transitive",
-        "resolved": "1.3.1",
-        "contentHash": "6XIhbvn3o7+KRlHzf0qHjVlQRjVHpsQNWQZtDyclMpfcYfkulqan+e0ZkhpcnqVMYZ9HyiHvQ4q8QIUYH4stbQ=="
+        "resolved": "1.4.0",
+        "contentHash": "6JtCqi0nq43wFDUrDfx3NrmFJYqWpmbEjEv4bVtgP6BTry1aw0Zd3FDQmZbWqnWGbvPgwm39YUXedf1+yzTkmg=="
       },
       "Microsoft.Testing.Platform.MSBuild": {
         "type": "Transitive",
-        "resolved": "1.3.1",
-        "contentHash": "zv5iC5H6IYDxc1+QXN3LY4mUG1WjBNLrh+PG+Lra8cHdFiFFoU0ZnZ1BRn2dBVwl3YmU57ouKFivhRoLjisl3Q==",
+        "resolved": "1.4.0",
+        "contentHash": "EBarJH6u97ng2DIpNNimUnbMGAMh2mC3uxaXqdnhLNtdLjNq9QNtEfrf+nOr84mTNA4KwDXZZAK1H5ZupoAaWw==",
         "dependencies": {
-          "Microsoft.Testing.Platform": "1.3.1"
+          "Microsoft.Testing.Platform": "1.4.0"
         }
       },
       "Microsoft.TestPlatform.ObjectModel": {
         "type": "Transitive",
-        "resolved": "17.10.0",
-        "contentHash": "KkwhjQevuDj0aBRoPLY6OLAhGqbPUEBuKLbaCs0kUVw29qiOYncdORd4mLVJbn9vGZ7/iFGQ/+AoJl0Tu5Umdg==",
+        "resolved": "17.11.1",
+        "contentHash": "E2jZqAU6JeWEVsyOEOrSW1o1bpHLgb25ypvKNB/moBXPVsFYBPd/Jwi7OrYahG50J83LfHzezYI+GaEkpAotiA==",
         "dependencies": {
           "System.Reflection.Metadata": "1.6.0"
         }
       },
       "Microsoft.TestPlatform.TestHost": {
         "type": "Transitive",
-        "resolved": "17.10.0",
-        "contentHash": "LWpMdfqhHvcUkeMCvNYJO8QlPLlYz9XPPb+ZbaXIKhdmjAV0wqTSrTiW5FLaf7RRZT50AQADDOYMOe0HxDxNgA==",
+        "resolved": "17.11.1",
+        "contentHash": "DnG+GOqJXO/CkoqlJWeDFTgPhqD/V6VqUIL3vINizCWZ3X+HshCtbbyDdSHQQEjrc2Sl/K3yaxX6s+5LFEdYuw==",
         "dependencies": {
-          "Microsoft.TestPlatform.ObjectModel": "17.10.0",
+          "Microsoft.TestPlatform.ObjectModel": "17.11.1",
           "Newtonsoft.Json": "13.0.1"
         }
       },
@@ -550,22 +539,22 @@
       },
       "Reqnroll": {
         "type": "Transitive",
-        "resolved": "2.0.3",
-        "contentHash": "J4l4rrVuhu+Avhp6huzK+/sLenpQPndHH9Ma6M9ul+qeqwQ+2glJfRQ/GSslqYxtrdcX4Wwr+9xla5SdEriRAg==",
+        "resolved": "2.1.0",
+        "contentHash": "lkNiB+MMwNeKL8/p2TqHVmUpMB0G2vVYdhyz9XFNutxDLRD2L6eBNU3jBeCyAoWcBkXMB1lG0gTV7u8LqbEBwA==",
         "dependencies": {
-          "Cucumber.CucumberExpressions": "16.0.0",
-          "Gherkin": "19.0.3",
-          "Microsoft.Extensions.DependencyModel": "6.0.0",
+          "Cucumber.CucumberExpressions": "17.1.0",
+          "Gherkin": "29.0.0",
+          "Microsoft.Extensions.DependencyModel": "8.0.1",
           "SpecFlow.Internal.Json": "1.0.8",
           "System.Runtime.Loader": "4.3.0"
         }
       },
       "Reqnroll.Tools.MsBuild.Generation": {
         "type": "Transitive",
-        "resolved": "2.0.3",
-        "contentHash": "H7yIi52OvzJiJX0tI4GYa4kZjPzxavkcEMIWWtKHugpAOwSXWO7TvXlnz6DHW7F2Nty0n+3M/FhaNNlt28OnFA==",
+        "resolved": "2.1.0",
+        "contentHash": "3RRbCQRriNbSsS1O4xI38NGMssA89sDgxG6NAPE4j4QkscmsStl+M015raIb3dGWMxkZ/1o4oYcL/HQG4sJpGQ==",
         "dependencies": {
-          "Reqnroll": "[2.0.3]"
+          "Reqnroll": "[2.1.0]"
         }
       },
       "SpecFlow.Internal.Json": {
@@ -641,11 +630,6 @@
           "Microsoft.NETCore.Targets": "1.1.0"
         }
       },
-      "System.Runtime.CompilerServices.Unsafe": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
-      },
       "System.Runtime.Loader": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -668,19 +652,15 @@
       },
       "System.Text.Encodings.Web": {
         "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        }
+        "resolved": "8.0.0",
+        "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ=="
       },
       "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==",
+        "resolved": "8.0.4",
+        "contentHash": "bAkhgDJ88XTsqczoxEMliSrpijKZHhbJQldhAmObj/RbrN3sU5dcokuXmWJWsdQAhiMJ9bTayWsL1C9fbbCRhw==",
         "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0",
-          "System.Text.Encodings.Web": "6.0.0"
+          "System.Text.Encodings.Web": "8.0.0"
         }
       },
       "System.Threading.Tasks": {

From d1cbc63f44955802ff3623dc438109d803910336 Mon Sep 17 00:00:00 2001
From: Ian Griffiths <Ian.Griffiths@endjin.com>
Date: Tue, 1 Oct 2024 12:20:10 +0100
Subject: [PATCH 3/6] Restore overeagerly removed using directive

VS said we weren't using it. VS lied.
---
 .../ValueStringBuilderStepDefinitions.cs                        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs
index beb173a..37ff081 100644
--- a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs
+++ b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs
@@ -2,6 +2,8 @@
 // Copyright (c) Endjin Limited. All rights reserved.
 // </copyright>
 
+using System.Text;
+
 using Corvus.HighPerformance.Specs;
 
 using Reqnroll;

From 7f94d1a67dd8413d90d770580ba8980f4a2c5ab2 Mon Sep 17 00:00:00 2001
From: Ian Griffiths <Ian.Griffiths@endjin.com>
Date: Wed, 2 Jul 2025 11:43:58 +0100
Subject: [PATCH 4/6] Add ValueStringBuilder.AsMemory methods

---
 .../ValueStringBuilder.cs                     | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.cs b/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.cs
index eac1d50..2143a1b 100644
--- a/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.cs
+++ b/Solutions/Corvus.HighPerformance/Corvus.HighPerformance/ValueStringBuilder.cs
@@ -160,6 +160,42 @@ public ReadOnlySpan<char> AsSpan(bool terminate)
     public ReadOnlySpan<char> AsSpan(int start) => _chars.Slice(start, _pos - start);
     public ReadOnlySpan<char> AsSpan(int start, int length) => _chars.Slice(start, length);
 
+    /// <summary>
+    /// Returns the contents of the builder as a <see cref="ReadOnlyMemory{T}"/>, renting the underlying buffer if it
+    /// is not already backed by a rented buffer.
+    /// </summary>
+    /// <returns>The value as a <see cref="ReadOnlyMemory{Char}"/></returns>
+    public ReadOnlyMemory<char> AsMemory()
+    {
+        this.EnsureRented();
+        return _arrayToReturnToPool.AsMemory(0, _pos);
+    }
+
+    /// <summary>
+    /// Returns the contents of the builder as a <see cref="ReadOnlyMemory{T}"/>, renting the underlying buffer if it
+    /// is not already backed by a rented buffer.
+    /// </summary>
+    /// <param name="start">The index within the string at which to start.</param>
+    /// <returns>The value as a <see cref="ReadOnlyMemory{Char}"/></returns>
+    public ReadOnlyMemory<char> AsMemory(int start)
+    {
+        this.EnsureRented();
+        return _arrayToReturnToPool.AsMemory(start, _pos - start);
+    }
+
+    /// <summary>
+    /// Returns the contents of the builder as a <see cref="ReadOnlyMemory{T}"/>, renting the underlying buffer if it
+    /// is not already backed by a rented buffer.
+    /// </summary>
+    /// <param name="start">The index within the string at which to start.</param>
+    /// <param name="length">The length of the span to return.</param>
+    /// <returns>The value as a <see cref="ReadOnlyMemory{Char}"/></returns>
+    public ReadOnlyMemory<char> AsMemory(int start, int length)
+    {
+        this.EnsureRented();
+        return _arrayToReturnToPool.AsMemory(start, length);
+    }
+
     public bool TryCopyTo(Span<char> destination, out int charsWritten)
     {
         if (_chars.Slice(0, _pos).TryCopyTo(destination))
@@ -411,4 +447,14 @@ private void SetToDisposed()
     {
         this = default(ValueStringBuilder) with { _pos = -1 };
     }
+
+    private void EnsureRented()
+    {
+        if (_arrayToReturnToPool == null)
+        {
+            _arrayToReturnToPool = ArrayPool<char>.Shared.Rent(_chars.Length);
+            _chars.Slice(0, _pos).CopyTo(_arrayToReturnToPool);
+            _chars = _arrayToReturnToPool;
+        }
+    }
 }

From 825a6f6f2ca7575ef6fc26ad95fb365139ab47ba Mon Sep 17 00:00:00 2001
From: Ian Griffiths <Ian.Griffiths@endjin.com>
Date: Wed, 2 Jul 2025 12:13:58 +0100
Subject: [PATCH 5/6] Add specs for AsMemory and AsSpan

---
 .../ValueStringBuilderFeatures/Append.feature | 10 +--
 .../AsMemory.feature                          | 67 ++++++++++++++++++
 .../ValueStringBuilderFeatures/AsSpan.feature | 67 ++++++++++++++++++
 .../ValueStringBuilderStepDefinitions.cs      | 47 ++++++++++---
 .../ValueStringBuilderTestDriver.cs           | 68 ++++++++++++++++---
 .../ValueStringBuilderValueFrom.cs            | 13 ++++
 6 files changed, 250 insertions(+), 22 deletions(-)
 create mode 100644 Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/AsMemory.feature
 create mode 100644 Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/AsSpan.feature
 create mode 100644 Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderValueFrom.cs

diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Append.feature b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Append.feature
index 554d24b..3c633a5 100644
--- a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Append.feature
+++ b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/Append.feature
@@ -20,11 +20,11 @@ Scenario Outline: Grows
 	When I get the string from the ValueStringBuilder via '<GetStringMechanism>'
 	Then the ValueStringBuilder string should be '<FirstValue><SecondValue>'
 	Examples:
-		| InitializationType | InitialLength | FirstValue    | SecondValue                         | GetStringMechanism |
-		| Span               | 11            | Hello, world! | It is mighty fine to see you today. | ToString           |
-		| Capacity           | 11            | Hello, world! | It is mighty fine to see you today. | ToString           |
-		| Span               | 11            | Hello, world! | It is mighty fine to see you today. | GetRentedBuffer    |
-		| Capacity           | 11            | Hello, world! | It is mighty fine to see you today. | GetRentedBuffer    |
+		| InitializationType | InitialLength | FirstValue    | SecondValue                         | GetStringMechanism     |
+		| Span               | 11            | Hello, world! | It is mighty fine to see you today. | CreateStringAndDispose |
+		| Capacity           | 11            | Hello, world! | It is mighty fine to see you today. | CreateStringAndDispose |
+		| Span               | 11            | Hello, world! | It is mighty fine to see you today. | RentedBuffer           |
+		| Capacity           | 11            | Hello, world! | It is mighty fine to see you today. | RentedBuffer           |
 
 Scenario Outline: Append number
     Given a ValueStringBuilder initialized with '<InitializationType>' of length <InitialLength>
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/AsMemory.feature b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/AsMemory.feature
new file mode 100644
index 0000000..cea142a
--- /dev/null
+++ b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/AsMemory.feature
@@ -0,0 +1,67 @@
+Feature: Retrieve a Memory from a ValueStringBuilder
+
+Scenario Outline: Retrieve a Memory from a ValueStringBuilder
+    Given a ValueStringBuilder initialized with '<InitializationType>' of length <InitialLength>
+	And I append 'Hello' to the ValueStringBuilder
+	And I append 'World!' to the ValueStringBuilder
+	When I get the Memory from the ValueStringBuilder
+	Then the ValueStringBuilder string should be 'HelloWorld!'
+	Examples:
+		| InitializationType | InitialLength |
+		| Span               | 10            |
+		| Capacity           | 10            |
+		| Span               | 11            |
+		| Capacity           | 11            |
+		| Span               | 20            |
+		| Capacity           | 20            |
+
+Scenario Outline: Retrieve a Memory with a start position from a ValueStringBuilder
+    Given a ValueStringBuilder initialized with '<InitializationType>' of length <InitialLength>
+	And I append 'Hello' to the ValueStringBuilder
+	And I append 'World!' to the ValueStringBuilder
+	When I get the Memory starting at <Start> from the ValueStringBuilder
+	Then the ValueStringBuilder string should be '<ExpectedValue>'
+	Examples:
+		| InitializationType | InitialLength | Start | ExpectedValue |
+		| Span               | 10            | 0     | HelloWorld!   |
+		| Capacity           | 10            | 0     | HelloWorld!   |
+		| Span               | 20            | 0     | HelloWorld!   |
+		| Capacity           | 20            | 0     | HelloWorld!   |
+		| Span               | 10            | 3     | loWorld!      |
+		| Capacity           | 10            | 3     | loWorld!      |
+		| Span               | 20            | 3     | loWorld!      |
+		| Capacity           | 20            | 3     | loWorld!      |
+
+
+Scenario Outline: Retrieve a Memory with a start position and length from a ValueStringBuilder
+    Given a ValueStringBuilder initialized with '<InitializationType>' of length <InitialLength>
+	And I append 'Hello' to the ValueStringBuilder
+	And I append 'World!' to the ValueStringBuilder
+	When I get the Memory starting at <Start> with length <Length> from the ValueStringBuilder
+	Then the ValueStringBuilder string should be '<ExpectedValue>'
+	Examples:
+		| InitializationType | InitialLength | Start | Length | ExpectedValue |
+		| Span               | 10            | 0     | 11     | HelloWorld!   |
+		| Capacity           | 10            | 0     | 11     | HelloWorld!   |
+		| Span               | 20            | 0     | 11     | HelloWorld!   |
+		| Capacity           | 20            | 0     | 11     | HelloWorld!   |
+		| Span               | 10            | 0     | 0      |               |
+		| Capacity           | 10            | 0     | 0      |               |
+		| Span               | 20            | 0     | 0      |               |
+		| Capacity           | 20            | 0     | 0      |               |
+		| Span               | 10            | 5     | 0      |               |
+		| Capacity           | 10            | 5     | 0      |               |
+		| Span               | 20            | 5     | 0      |               |
+		| Capacity           | 20            | 5     | 0      |               |
+		| Span               | 10            | 3     | 8      | loWorld!      |
+		| Capacity           | 10            | 3     | 8      | loWorld!      |
+		| Span               | 20            | 3     | 8      | loWorld!      |
+		| Capacity           | 20            | 3     | 8      | loWorld!      |
+		| Span               | 10            | 3     | 3      | loW           |
+		| Capacity           | 10            | 3     | 3      | loW           |
+		| Span               | 20            | 3     | 3      | loW           |
+		| Capacity           | 20            | 3     | 3      | loW           |
+		| Span               | 10            | 10    | 1      | !             |
+		| Capacity           | 10            | 10    | 1      | !             |
+		| Span               | 20            | 10    | 1      | !             |
+		| Capacity           | 20            | 10    | 1      | !             |
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/AsSpan.feature b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/AsSpan.feature
new file mode 100644
index 0000000..bbc3b3e
--- /dev/null
+++ b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/AsSpan.feature
@@ -0,0 +1,67 @@
+Feature: Retrieve a Span from a ValueStringBuilder
+
+Scenario Outline: Retrieve a Span from a ValueStringBuilder
+    Given a ValueStringBuilder initialized with '<InitializationType>' of length <InitialLength>
+	And I append 'Hello' to the ValueStringBuilder
+	And I append 'World!' to the ValueStringBuilder
+	When I get the Span from the ValueStringBuilder
+	Then the ValueStringBuilder string should be 'HelloWorld!'
+	Examples:
+		| InitializationType | InitialLength |
+		| Span               | 10            |
+		| Capacity           | 10            |
+		| Span               | 11            |
+		| Capacity           | 11            |
+		| Span               | 20            |
+		| Capacity           | 20            |
+
+Scenario Outline: Retrieve a Span with a start position from a ValueStringBuilder
+    Given a ValueStringBuilder initialized with '<InitializationType>' of length <InitialLength>
+	And I append 'Hello' to the ValueStringBuilder
+	And I append 'World!' to the ValueStringBuilder
+	When I get the Span starting at <Start> from the ValueStringBuilder
+	Then the ValueStringBuilder string should be '<ExpectedValue>'
+	Examples:
+		| InitializationType | InitialLength | Start | ExpectedValue |
+		| Span               | 10            | 0     | HelloWorld!   |
+		| Capacity           | 10            | 0     | HelloWorld!   |
+		| Span               | 20            | 0     | HelloWorld!   |
+		| Capacity           | 20            | 0     | HelloWorld!   |
+		| Span               | 10            | 3     | loWorld!      |
+		| Capacity           | 10            | 3     | loWorld!      |
+		| Span               | 20            | 3     | loWorld!      |
+		| Capacity           | 20            | 3     | loWorld!      |
+
+
+Scenario Outline: Retrieve a Span with a start position and length from a ValueStringBuilder
+    Given a ValueStringBuilder initialized with '<InitializationType>' of length <InitialLength>
+	And I append 'Hello' to the ValueStringBuilder
+	And I append 'World!' to the ValueStringBuilder
+	When I get the Span starting at <Start> with length <Length> from the ValueStringBuilder
+	Then the ValueStringBuilder string should be '<ExpectedValue>'
+	Examples:
+		| InitializationType | InitialLength | Start | Length | ExpectedValue |
+		| Span               | 10            | 0     | 11     | HelloWorld!   |
+		| Capacity           | 10            | 0     | 11     | HelloWorld!   |
+		| Span               | 20            | 0     | 11     | HelloWorld!   |
+		| Capacity           | 20            | 0     | 11     | HelloWorld!   |
+		| Span               | 10            | 0     | 0      |               |
+		| Capacity           | 10            | 0     | 0      |               |
+		| Span               | 20            | 0     | 0      |               |
+		| Capacity           | 20            | 0     | 0      |               |
+		| Span               | 10            | 5     | 0      |               |
+		| Capacity           | 10            | 5     | 0      |               |
+		| Span               | 20            | 5     | 0      |               |
+		| Capacity           | 20            | 5     | 0      |               |
+		| Span               | 10            | 3     | 8      | loWorld!      |
+		| Capacity           | 10            | 3     | 8      | loWorld!      |
+		| Span               | 20            | 3     | 8      | loWorld!      |
+		| Capacity           | 20            | 3     | 8      | loWorld!      |
+		| Span               | 10            | 3     | 3      | loW           |
+		| Capacity           | 10            | 3     | 3      | loW           |
+		| Span               | 20            | 3     | 3      | loW           |
+		| Capacity           | 20            | 3     | 3      | loW           |
+		| Span               | 10            | 10    | 1      | !             |
+		| Capacity           | 10            | 10    | 1      | !             |
+		| Span               | 20            | 10    | 1      | !             |
+		| Capacity           | 20            | 10    | 1      | !             |
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs
index 37ff081..362a5f4 100644
--- a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs
+++ b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderStepDefinitions.cs
@@ -66,20 +66,51 @@ public void GivenIAttemptToReplaceWithAtIndexWithCount(
     }
 
     [When("I get the string from the ValueStringBuilder via {string}")]
-    public void WhenIGetTheStringFromTheValueStringBuilderVia(string mechanism)
+    public void WhenIGetTheStringFromTheValueStringBuilderVia(ValueStringBuilderValueFrom mechanism)
     {
-        this.Driver.Execute(valueFromRentedBuffer: mechanism switch
-        {
-            "ToString" => false,
-            "GetRentedBuffer" => true,
-            _ => throw new ArgumentException($"Unknown mechanism {mechanism}"),
-        });
+        this.Driver.Execute(valueFrom: mechanism);
     }
 
     [When("I get the string from the ValueStringBuilder")]
     public void WhenIGetTheStringFromTheValueStringBuilder()
     {
-        this.WhenIGetTheStringFromTheValueStringBuilderVia("ToString");
+        this.WhenIGetTheStringFromTheValueStringBuilderVia(ValueStringBuilderValueFrom.CreateStringAndDispose);
+    }
+
+    [When("I get the Memory starting at {int} with length {int} from the ValueStringBuilder")]
+    public void WhenIGetTheMemoryStartingAtWithLengthFromTheValueStringBuilder(int start, int length)
+    {
+        this.Driver.Execute(ValueStringBuilderValueFrom.Memory, start, length);
+    }
+
+    [When("I get the Memory starting at {int} from the ValueStringBuilder")]
+    public void WhenIGetTheMemoryStartingAtFromTheValueStringBuilder(int start)
+    {
+        this.Driver.Execute(ValueStringBuilderValueFrom.Memory, start);
+    }
+
+    [When("I get the Memory from the ValueStringBuilder")]
+    public void WhenIGetTheMemoryFromTheValueStringBuilder()
+    {
+        this.Driver.Execute(ValueStringBuilderValueFrom.Memory);
+    }
+
+    [When("I get the Span starting at {int} with length {int} from the ValueStringBuilder")]
+    public void WhenIGetTheSpanStartingAtWithLengthFromTheValueStringBuilder(int start, int length)
+    {
+        this.Driver.Execute(ValueStringBuilderValueFrom.Span, start, length);
+    }
+
+    [When("I get the Span starting at {int} from the ValueStringBuilder")]
+    public void WhenIGetTheSpanStartingAtFromTheValueStringBuilder(int start)
+    {
+        this.Driver.Execute(ValueStringBuilderValueFrom.Span, start);
+    }
+
+    [When("I get the Span from the ValueStringBuilder")]
+    public void WhenIGetTheSpanFromTheValueStringBuilder()
+    {
+        this.Driver.Execute(ValueStringBuilderValueFrom.Span);
     }
 
     [Then("the ValueStringBuilder string should be {string}")]
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderTestDriver.cs b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderTestDriver.cs
index 4e128bf..d843abd 100644
--- a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderTestDriver.cs
+++ b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderTestDriver.cs
@@ -30,7 +30,10 @@ public void AddOperation(OperationBase operation)
         this.operations.Add(operation);
     }
 
-    public void Execute(bool valueFromRentedBuffer = false)
+    public void Execute(
+        ValueStringBuilderValueFrom valueFrom = ValueStringBuilderValueFrom.CreateStringAndDispose,
+        int? start = null,
+        int? length = null)
     {
         ValueStringBuilder sb = initType switch
         {
@@ -44,15 +47,62 @@ public void Execute(bool valueFromRentedBuffer = false)
             op.Execute(ref sb);
         }
 
-        if (valueFromRentedBuffer)
+        switch (valueFrom)
         {
-            (char[]? rentedBuffer, int length) = sb.GetRentedBufferAndLengthAndDispose();
-            this.result = rentedBuffer.AsSpan(0, length).ToString();
-            ValueStringBuilder.ReturnRentedBuffer(rentedBuffer);
-        }
-        else
-        {
-            this.result = sb.CreateStringAndDispose();
+            case ValueStringBuilderValueFrom.CreateStringAndDispose:
+                this.result = sb.CreateStringAndDispose();
+                break;
+
+            case ValueStringBuilderValueFrom.RentedBuffer:
+                (char[]? rentedBuffer, int returnedLength) = sb.GetRentedBufferAndLengthAndDispose();
+                this.result = rentedBuffer.AsSpan(0, returnedLength).ToString();
+                ValueStringBuilder.ReturnRentedBuffer(rentedBuffer);
+                break;
+
+            case ValueStringBuilderValueFrom.Memory:
+                if (length.HasValue)
+                {
+                    if (!start.HasValue)
+                    {
+                        throw new ArgumentException("If length is specified, start must also be specified.", nameof(length));
+                    }
+
+                    this.result = sb.AsMemory(start.Value, length.Value).ToString();
+                }
+                else if (start.HasValue)
+                {
+                    this.result = sb.AsMemory(start.Value).ToString();
+                }
+                else
+                {
+                    this.result = sb.AsMemory().ToString();
+                }
+
+                break;
+
+            case ValueStringBuilderValueFrom.Span:
+                if (length.HasValue)
+                {
+                    if (!start.HasValue)
+                    {
+                        throw new ArgumentException("If length is specified, start must also be specified.", nameof(length));
+                    }
+
+                    this.result = sb.AsSpan(start.Value, length.Value).ToString();
+                }
+                else if (start.HasValue)
+                {
+                    this.result = sb.AsSpan(start.Value).ToString();
+                }
+                else
+                {
+                    this.result = sb.AsSpan().ToString();
+                }
+
+                break;
+
+            default:
+                throw new ArgumentOutOfRangeException(nameof(valueFrom), valueFrom, null);
         }
     }
 
diff --git a/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderValueFrom.cs b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderValueFrom.cs
new file mode 100644
index 0000000..16680ff
--- /dev/null
+++ b/Solutions/Corvus.HighPerformance.Specs/ValueStringBuilderFeatures/ValueStringBuilderValueFrom.cs
@@ -0,0 +1,13 @@
+// <copyright file="ValueStringBuilderValueFrom.cs" company="Endjin Limited">
+// Copyright (c) Endjin Limited. All rights reserved.
+// </copyright>
+
+namespace ValueStringBuilderFeatures;
+
+public enum ValueStringBuilderValueFrom
+{
+    RentedBuffer,
+    CreateStringAndDispose,
+    Memory,
+    Span,
+}
\ No newline at end of file

From fd15a7eabaf700d876c1418c577c28749a375f20 Mon Sep 17 00:00:00 2001
From: Ian Griffiths <Ian.Griffiths@endjin.com>
Date: Wed, 2 Jul 2025 12:21:29 +0100
Subject: [PATCH 6/6] Add SHARED_WORKFLOW_KEY bits to build.yml

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 13704a4..f84c513 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,6 +49,7 @@ jobs:
           BUILDVAR_NuGetPublishSource: "${{ startsWith(github.ref, 'refs/tags/') && 'https://api.nuget.org/v3/index.json' || format('https://nuget.pkg.github.com/{0}/index.json', github.repository_owner) }}"
         secretsYaml: |
           NUGET_API_KEY: "${{ startsWith(github.ref, 'refs/tags/') && secrets.NUGET_APIKEY || secrets.BUILD_PUBLISHER_PAT }}"
+        secretsEncryptionKey: ${{ secrets.SHARED_WORKFLOW_KEY }}
 
   build:
     needs: prepareConfig
@@ -73,4 +74,5 @@ jobs:
       # compilePhaseSecrets: ${{ needs.prepareConfig.outputs.RESOLVED_SECRETS }}
       # testPhaseSecrets: ${{ needs.prepareConfig.outputs.RESOLVED_SECRETS }}
       # packagePhaseSecrets: ${{ needs.prepareConfig.outputs.RESOLVED_SECRETS }}
-      publishPhaseSecrets: ${{ needs.prepareConfig.outputs.RESOLVED_SECRETS }}
\ No newline at end of file
+      publishPhaseSecrets: ${{ needs.prepareConfig.outputs.RESOLVED_SECRETS }}
+      secretsEncryptionKey: ${{ secrets.SHARED_WORKFLOW_KEY }}
\ No newline at end of file