diff --git a/Sources/.editorconfig b/Sources/.editorconfig
index 1bae2e959..116ea2776 100644
--- a/Sources/.editorconfig
+++ b/Sources/.editorconfig
@@ -50,4 +50,14 @@ csharp_new_line_before_catch = true
 csharp_new_line_before_finally = true
 csharp_indent_case_contents = true
 csharp_indent_switch_labels = true
-csharp_preserve_single_line_statements = false
\ No newline at end of file
+csharp_preserve_single_line_statements = false
+[*.cs]
+
+# Default severity for analyzer diagnostics with category 'StyleCop.CSharp.NamingRules'
+dotnet_analyzer_diagnostic.category-StyleCop.CSharp.NamingRules.severity = none
+
+# Default severity for all analyzer diagnostics
+dotnet_analyzer_diagnostic.severity = none
+
+# SA1314: Type parameter names should begin with T
+dotnet_diagnostic.SA1314.severity = none
diff --git a/Sources/Core/Microsoft.StreamProcessing.Provider/Microsoft.StreamProcessing.Provider.csproj b/Sources/Core/Microsoft.StreamProcessing.Provider/Microsoft.StreamProcessing.Provider.csproj
index 1d9de4e69..b38205d12 100644
--- a/Sources/Core/Microsoft.StreamProcessing.Provider/Microsoft.StreamProcessing.Provider.csproj
+++ b/Sources/Core/Microsoft.StreamProcessing.Provider/Microsoft.StreamProcessing.Provider.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net472</TargetFrameworks>
     <Platforms>x64;AnyCPU</Platforms>
   </PropertyGroup>
 
@@ -11,11 +11,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="3.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="4.4.0" />
     <PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
diff --git a/Sources/Core/Microsoft.StreamProcessing/Microsoft.StreamProcessing.csproj b/Sources/Core/Microsoft.StreamProcessing/Microsoft.StreamProcessing.csproj
index b96b07891..1fcb6e2c1 100644
--- a/Sources/Core/Microsoft.StreamProcessing/Microsoft.StreamProcessing.csproj
+++ b/Sources/Core/Microsoft.StreamProcessing/Microsoft.StreamProcessing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net472</TargetFrameworks>
     <Platforms>x64;AnyCPU</Platforms>
   </PropertyGroup>
 
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="3.1.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="4.4.0" />
     <PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
     <PackageReference Include="System.Linq.Expressions" Version="4.3.0" />
diff --git a/Sources/Core/Microsoft.StreamProcessing/Utilities/Native32.cs b/Sources/Core/Microsoft.StreamProcessing/Utilities/Native32.cs
index f2924c0e7..d19a7ca57 100644
--- a/Sources/Core/Microsoft.StreamProcessing/Utilities/Native32.cs
+++ b/Sources/Core/Microsoft.StreamProcessing/Utilities/Native32.cs
@@ -74,8 +74,16 @@ internal static void AffinitizeThread(int processor)
             {
                 if (utid == pt.Id)
                 {
-                    long AffinityMask = 1 << processor;
-                    pt.ProcessorAffinity = (IntPtr)(AffinityMask); // Set affinity for this
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                    {
+                        pt.IdealProcessor = processor;
+                    }
+
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                    {
+                        long AffinityMask = 1 << processor;
+                        pt.ProcessorAffinity = (IntPtr)(AffinityMask); // Set affinity for this
+                    }
                 }
             }
         }
diff --git a/Sources/Test/SimpleTesting/GlobalSuppressions.cs b/Sources/Test/SimpleTesting/GlobalSuppressions.cs
new file mode 100644
index 000000000..c89b555bf
--- /dev/null
+++ b/Sources/Test/SimpleTesting/GlobalSuppressions.cs
@@ -0,0 +1,24 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsColumnar.CheckpointRegressionColumnar")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsColumnar.MaxBug0Columnar")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsColumnar.MaxBug1Columnar")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsColumnar.MaxBug2Columnar")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsColumnarSmallBatch.CheckpointRegressionColumnarSmallBatch")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsColumnarSmallBatch.MaxBug0ColumnarSmallBatch")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsColumnarSmallBatch.MaxBug1ColumnarSmallBatch")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsColumnarSmallBatch.MaxBug2ColumnarSmallBatch")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsRow.CheckpointRegressionRow")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsRow.MaxBug0Row")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsRow.MaxBug1Row")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsRow.MaxBug2Row")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsRowSmallBatch.CheckpointRegressionRowSmallBatch")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsRowSmallBatch.MaxBug0RowSmallBatch")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsRowSmallBatch.MaxBug1RowSmallBatch")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.CheckpointRestoreTestsRowSmallBatch.MaxBug2RowSmallBatch")]
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:Field names should not use Hungarian notation", Justification = "<Pending>", Scope = "member", Target = "~M:SimpleTesting.Extensions.ToEvents``1(System.Collections.Generic.IEnumerable{``0},System.Func{``0,System.Int64},System.Func{``0,System.Int64})~System.Collections.Generic.IEnumerable{Microsoft.StreamProcessing.StreamEvent{``0}}")]
diff --git a/Sources/Test/SimpleTesting/Macros/LeftOuterJoinTests.cs b/Sources/Test/SimpleTesting/Macros/LeftOuterJoinTests.cs
index 6b778f07d..68c8b6593 100644
--- a/Sources/Test/SimpleTesting/Macros/LeftOuterJoinTests.cs
+++ b/Sources/Test/SimpleTesting/Macros/LeftOuterJoinTests.cs
@@ -82,8 +82,8 @@ public void LOJ1Row()
             var query =
             leftStream.LeftOuterJoin(rightStream, e => e.field1, e => e.field3,
                (l, r) => l.field2 != "E",
-                (l) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = tmp1, field4 = tmp2 },
-                (l, r) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = r.field3, field4 = r.field4 });
+               (l) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = tmp1, field4 = tmp2 },
+               (l, r) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = r.field3, field4 = r.field4 });
 
             var result = container.RegisterOutput(query, ReshapingPolicy.CoalesceEndEdges).Where(e => e.IsData);
             var resultAsync = result.ForEachAsync(o => output.Add(o));
@@ -144,8 +144,8 @@ public void LOJ1RowSmallBatch()
             var query =
             leftStream.LeftOuterJoin(rightStream, e => e.field1, e => e.field3,
                (l, r) => l.field2 != "E",
-                (l) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = tmp1, field4 = tmp2 },
-                (l, r) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = r.field3, field4 = r.field4 });
+               (l) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = tmp1, field4 = tmp2 },
+               (l, r) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = r.field3, field4 = r.field4 });
 
             var result = container.RegisterOutput(query, ReshapingPolicy.CoalesceEndEdges).Where(e => e.IsData);
             var resultAsync = result.ForEachAsync(o => output.Add(o));
@@ -205,8 +205,8 @@ public void LOJ1Columnar()
             var query =
             leftStream.LeftOuterJoin(rightStream, e => e.field1, e => e.field3,
                (l, r) => l.field2 != "E",
-                (l) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = tmp1, field4 = tmp2 },
-                (l, r) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = r.field3, field4 = r.field4 });
+               (l) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = tmp1, field4 = tmp2 },
+               (l, r) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = r.field3, field4 = r.field4 });
 
             var result = container.RegisterOutput(query, ReshapingPolicy.CoalesceEndEdges).Where(e => e.IsData);
             var resultAsync = result.ForEachAsync(o => output.Add(o));
@@ -267,8 +267,8 @@ public void LOJ1ColumnarSmallBatch()
             var query =
             leftStream.LeftOuterJoin(rightStream, e => e.field1, e => e.field3,
                (l, r) => l.field2 != "E",
-                (l) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = tmp1, field4 = tmp2 },
-                (l, r) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = r.field3, field4 = r.field4 });
+               (l) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = tmp1, field4 = tmp2 },
+               (l, r) => new MyData3 { field1 = l.field1, field2 = l.field2, field3 = r.field3, field4 = r.field4 });
 
             var result = container.RegisterOutput(query, ReshapingPolicy.CoalesceEndEdges).Where(e => e.IsData);
             var resultAsync = result.ForEachAsync(o => output.Add(o));
diff --git a/Sources/Test/SimpleTesting/SimpleTesting.csproj b/Sources/Test/SimpleTesting/SimpleTesting.csproj
index 6e35f0351..9b97824ad 100644
--- a/Sources/Test/SimpleTesting/SimpleTesting.csproj
+++ b/Sources/Test/SimpleTesting/SimpleTesting.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;net472</TargetFrameworks>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="System.Reactive" Version="5.0.0" />
     <PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
   <!--
@@ -160,6 +160,13 @@
       <DependentUpon>ShuffleStreamableTests.tt</DependentUpon>
     </Compile>
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
   
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(MSBuildAssemblyVersion)\TextTemplating\Microsoft.TextTemplating.targets" />
 
diff --git a/Sources/Test/SimpleTesting/Streamables/AfaTests.cs b/Sources/Test/SimpleTesting/Streamables/AfaTests.cs
index 68aa36026..a48bd6fdd 100644
--- a/Sources/Test/SimpleTesting/Streamables/AfaTests.cs
+++ b/Sources/Test/SimpleTesting/Streamables/AfaTests.cs
@@ -845,15 +845,15 @@ public void GroupedAfa()
             var source = new StreamEvent<Tuple<string, int>>[]
             {
                 StreamEvent.CreateStart(0, new Tuple<string, int>("A", 1)),
-                    StreamEvent.CreateStart(1, new Tuple<string, int>("A", 2)),
-                    StreamEvent.CreateStart(2, new Tuple<string, int>("B", 2)),
+                StreamEvent.CreateStart(1, new Tuple<string, int>("A", 2)),
+                StreamEvent.CreateStart(2, new Tuple<string, int>("B", 2)),
                 StreamEvent.CreateStart(3, new Tuple<string, int>("A", 1)),
                 StreamEvent.CreateStart(4, new Tuple<string, int>("B", 1)),
-                    StreamEvent.CreateStart(5, new Tuple<string, int>("B", 2)),
+                StreamEvent.CreateStart(5, new Tuple<string, int>("B", 2)),
                 StreamEvent.CreateStart(6, new Tuple<string, int>("B", 1)),
                 StreamEvent.CreateStart(7, new Tuple<string, int>("C", 1)),
-                    StreamEvent.CreateStart(8, new Tuple<string, int>("B", 2)),
-                    StreamEvent.CreateStart(9, new Tuple<string, int>("A", 2)),
+                StreamEvent.CreateStart(8, new Tuple<string, int>("B", 2)),
+                StreamEvent.CreateStart(9, new Tuple<string, int>("A", 2)),
             }.ToObservable()
                 .ToStreamable()
                 .AlterEventDuration(7);
@@ -893,18 +893,18 @@ public void GroupedAfa_IsSyncTimeSimultaneityFree()
             var source = new StreamEvent<Tuple<string, int>>[]
             {
                 StreamEvent.CreateStart(0, new Tuple<string, int>("A", 1)),
-                    StreamEvent.CreateStart(1, new Tuple<string, int>("A", 2)),
-                    StreamEvent.CreateStart(1, new Tuple<string, int>("B", 2)),
+                StreamEvent.CreateStart(1, new Tuple<string, int>("A", 2)),
+                StreamEvent.CreateStart(1, new Tuple<string, int>("B", 2)),
                 StreamEvent.CreateStart(3, new Tuple<string, int>("A", 1)),
 
                 StreamEvent.CreatePunctuation<Tuple<string, int>>(4),
 
                 StreamEvent.CreateStart(4, new Tuple<string, int>("B", 1)),
-                    StreamEvent.CreateStart(4, new Tuple<string, int>("B", 2)),
+                StreamEvent.CreateStart(4, new Tuple<string, int>("B", 2)),
                 StreamEvent.CreateStart(5, new Tuple<string, int>("B", 1)),
                 StreamEvent.CreateStart(5, new Tuple<string, int>("C", 1)),
-                    StreamEvent.CreateStart(6, new Tuple<string, int>("B", 2)),
-                    StreamEvent.CreateStart(7, new Tuple<string, int>("A", 2)),
+                StreamEvent.CreateStart(6, new Tuple<string, int>("B", 2)),
+                StreamEvent.CreateStart(7, new Tuple<string, int>("A", 2)),
 
                 StreamEvent.CreatePunctuation<Tuple<string, int>>(7),
             }.ToObservable()
@@ -959,23 +959,23 @@ public void PartitionedAfa()
             var source = new PartitionedStreamEvent<int, string>[]
             {
                 PartitionedStreamEvent.CreateStart(1, 0, "A"),
-                            PartitionedStreamEvent.CreateStart(2, 0, "A"),
+                PartitionedStreamEvent.CreateStart(2, 0, "A"),
                 PartitionedStreamEvent.CreateStart(1, 1, "B"),
                 PartitionedStreamEvent.CreateStart(1, 2, "B"),
-                            PartitionedStreamEvent.CreateStart(2, 2, "B"),
+                PartitionedStreamEvent.CreateStart(2, 2, "B"),
                 PartitionedStreamEvent.CreateStart(1, 3, "A"),
                 PartitionedStreamEvent.CreateStart(1, 4, "C"),
-                            PartitionedStreamEvent.CreateStart(2, 3, "C"),
-                            PartitionedStreamEvent.CreateStart(2, 4, "A"),
+                PartitionedStreamEvent.CreateStart(2, 3, "C"),
+                PartitionedStreamEvent.CreateStart(2, 4, "A"),
                 PartitionedStreamEvent.CreateStart(1, 5, "A"),
                 PartitionedStreamEvent.CreateStart(1, 6, "B"),
-                            PartitionedStreamEvent.CreateStart(2, 5, "B"),
+                PartitionedStreamEvent.CreateStart(2, 5, "B"),
                 PartitionedStreamEvent.CreateStart(1, 7, "B"),
-                            PartitionedStreamEvent.CreateStart(2, 6, "B"),
+                PartitionedStreamEvent.CreateStart(2, 6, "B"),
                 PartitionedStreamEvent.CreateStart(1, 8, "B"),
                 PartitionedStreamEvent.CreateStart(1, 9, "A"),
-                            PartitionedStreamEvent.CreateStart(2, 7, "A"),
-                            PartitionedStreamEvent.CreateStart(2, 8, "B")
+                PartitionedStreamEvent.CreateStart(2, 7, "A"),
+                PartitionedStreamEvent.CreateStart(2, 8, "B")
             }.ToObservable()
                 .ToStreamable()
                 .AlterEventDuration(7);
@@ -1016,23 +1016,23 @@ public void PartitionedAfa_IsSyncTimeSimultaneityFree()
             var source = new PartitionedStreamEvent<int, string>[]
             {
                 PartitionedStreamEvent.CreateStart(1, 0, "A"),
-                            PartitionedStreamEvent.CreateStart(2, 0, "A"),
+                PartitionedStreamEvent.CreateStart(2, 0, "A"),
                 PartitionedStreamEvent.CreateStart(1, 1, "B"),
                 PartitionedStreamEvent.CreateStart(1, 1, "B"),
-                            PartitionedStreamEvent.CreateStart(2, 0, "B"),
+                PartitionedStreamEvent.CreateStart(2, 0, "B"),
                 PartitionedStreamEvent.CreateStart(1, 3, "A"),
                 PartitionedStreamEvent.CreateStart(1, 4, "C"),
-                            PartitionedStreamEvent.CreateStart(2, 3, "C"),
-                            PartitionedStreamEvent.CreateStart(2, 4, "A"),
+                PartitionedStreamEvent.CreateStart(2, 3, "C"),
+                PartitionedStreamEvent.CreateStart(2, 4, "A"),
                 PartitionedStreamEvent.CreateStart(1, 5, "A"),
                 PartitionedStreamEvent.CreateStart(1, 6, "B"),
-                            PartitionedStreamEvent.CreateStart(2, 4, "B"),
+                PartitionedStreamEvent.CreateStart(2, 4, "B"),
                 PartitionedStreamEvent.CreateStart(1, 7, "B"),
-                            PartitionedStreamEvent.CreateStart(2, 6, "B"),
+                PartitionedStreamEvent.CreateStart(2, 6, "B"),
                 PartitionedStreamEvent.CreateStart(1, 8, "B"),
                 PartitionedStreamEvent.CreateStart(1, 9, "A"),
-                            PartitionedStreamEvent.CreateStart(2, 7, "A"),
-                            PartitionedStreamEvent.CreateStart(2, 8, "B")
+                PartitionedStreamEvent.CreateStart(2, 7, "A"),
+                PartitionedStreamEvent.CreateStart(2, 8, "B")
             }.ToObservable()
                 .ToStreamable()
                 .AlterEventDuration(7);
diff --git a/Sources/Test/SimpleTesting/Streamables/JoinTests.cs b/Sources/Test/SimpleTesting/Streamables/JoinTests.cs
index ca4ecb8c2..b5c2fe2e4 100644
--- a/Sources/Test/SimpleTesting/Streamables/JoinTests.cs
+++ b/Sources/Test/SimpleTesting/Streamables/JoinTests.cs
@@ -83,7 +83,7 @@ public void IOOEJ2RowMultiString()
                     input2,
                     e => e.field1,
                     e => e,
-                (l, r) => new GameData() { EventType = l.field1, GameId = r, });
+                    (l, r) => new GameData() { EventType = l.field1, GameId = r, });
             var result = query
                 .ToPayloadEnumerable()
                 .ToArray();
@@ -446,7 +446,7 @@ public void IOOEJ2RowRegularString()
                     input2,
                     e => e.field1,
                     e => e,
-                (l, r) => new GameData() { EventType = l.field1, GameId = r, });
+                    (l, r) => new GameData() { EventType = l.field1, GameId = r, });
             var result = query
                 .ToPayloadEnumerable()
                 .ToArray();
@@ -810,7 +810,7 @@ public void IOOEJ2RowSmallBatchMultiString()
                     input2,
                     e => e.field1,
                     e => e,
-                (l, r) => new GameData() { EventType = l.field1, GameId = r, });
+                    (l, r) => new GameData() { EventType = l.field1, GameId = r, });
             var result = query
                 .ToPayloadEnumerable()
                 .ToArray();
@@ -1174,7 +1174,7 @@ public void IOOEJ2RowSmallBatchRegularString()
                     input2,
                     e => e.field1,
                     e => e,
-                (l, r) => new GameData() { EventType = l.field1, GameId = r, });
+                    (l, r) => new GameData() { EventType = l.field1, GameId = r, });
             var result = query
                 .ToPayloadEnumerable()
                 .ToArray();
@@ -1537,7 +1537,7 @@ public void IOOEJ2ColumnarMultiString()
                     input2,
                     e => e.field1,
                     e => e,
-                (l, r) => new GameData() { EventType = l.field1, GameId = r, });
+                    (l, r) => new GameData() { EventType = l.field1, GameId = r, });
             var result = query
                 .ToPayloadEnumerable()
                 .ToArray();
@@ -1900,7 +1900,7 @@ public void IOOEJ2ColumnarRegularString()
                     input2,
                     e => e.field1,
                     e => e,
-                (l, r) => new GameData() { EventType = l.field1, GameId = r, });
+                    (l, r) => new GameData() { EventType = l.field1, GameId = r, });
             var result = query
                 .ToPayloadEnumerable()
                 .ToArray();
@@ -2264,7 +2264,7 @@ public void IOOEJ2ColumnarSmallBatchMultiString()
                     input2,
                     e => e.field1,
                     e => e,
-                (l, r) => new GameData() { EventType = l.field1, GameId = r, });
+                    (l, r) => new GameData() { EventType = l.field1, GameId = r, });
             var result = query
                 .ToPayloadEnumerable()
                 .ToArray();
@@ -2628,7 +2628,7 @@ public void IOOEJ2ColumnarSmallBatchRegularString()
                     input2,
                     e => e.field1,
                     e => e,
-                (l, r) => new GameData() { EventType = l.field1, GameId = r, });
+                    (l, r) => new GameData() { EventType = l.field1, GameId = r, });
             var result = query
                 .ToPayloadEnumerable()
                 .ToArray();
diff --git a/Sources/Test/TrillPerf/PerformanceTesting.csproj b/Sources/Test/TrillPerf/PerformanceTesting.csproj
index e7aae4a51..3df5caec3 100644
--- a/Sources/Test/TrillPerf/PerformanceTesting.csproj
+++ b/Sources/Test/TrillPerf/PerformanceTesting.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;net472</TargetFrameworks>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="System.Reactive" Version="5.0.0" />
     <PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
   <PropertyGroup>