diff --git a/Directory.Packages.props b/Directory.Packages.props
index 2576caa36..38ef2e34f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,38 +3,39 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <PropertyGroup>
+    <AvaloniaVersion>11.1.3</AvaloniaVersion>
     <MSBuildPackageVersion>17.5.0</MSBuildPackageVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="AdonisUI" Version="1.16.0" />
-    <PackageVersion Include="AdonisUI.ClassicTheme" Version="1.16.0" />
-    <PackageVersion Include="AutomaticGraphLayout.Drawing" Version="1.1.11" />
-    <PackageVersion Include="AutomaticGraphLayout.WpfGraphControl" Version="1.1.11" />
+    <PackageVersion Include="AdonisUI" Version="1.17.1" />
+    <PackageVersion Include="AdonisUI.ClassicTheme" Version="1.17.1" />
+    <PackageVersion Include="AutomaticGraphLayout.Drawing" Version="1.1.12" />
+    <PackageVersion Include="AutomaticGraphLayout.WpfGraphControl" Version="1.1.12" />
     <PackageVersion Include="AvalonEdit" Version="6.3.0.90" />
-    <PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.0.6" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.1.1" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.1.1" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.1.1" />
-    <PackageVersion Include="DiffPlex" Version="1.7.0" />
+    <PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
+    <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="DiffPlex" Version="1.7.2" />
     <PackageVersion Include="DotUtils.MsBuild.BinlogRedactor.SensitiveDataDetector" Version="0.0.8" />
     <PackageVersion Include="DotUtils.StreamUtils.Sources" Version="0.0.7" />
-    <PackageVersion Include="FluentAssertions" Version="6.11.0" />
-    <PackageVersion Include="GuiLabs.Language.Xml" Version="1.2.46" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <PackageVersion Include="GuiLabs.Language.Xml" Version="1.2.93" />
     <PackageVersion Include="HarfBuzzSharp" Version="2.8.2-preview.187" />
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
     <PackageVersion Include="Microsoft.Build" Version="$(MSBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="$(MSBuildPackageVersion)" />
-    <PackageVersion Include="Microsoft.Build.Locator" Version="1.4.1" />
+    <PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
     <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MSBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.DotNet.ILCompiler" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
-    <PackageVersion Include="Mono.Cecil" Version="0.9.6.1" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="Mono.Cecil" Version="0.11.5" />
     <PackageVersion Include="MSBuild.StructuredLogger" Version="2.1.133" />
-    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageVersion Include="NuGet.ProjectModel" Version="6.8.0" />
-    <PackageVersion Include="Nullable" Version="1.2.1" />
+    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.141" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="NuGet.ProjectModel" Version="6.11.0" />
+    <PackageVersion Include="Nullable" Version="1.3.1" />
     <PackageVersion Include="SkiaSharp" Version="2.88.6" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
     <PackageVersion Include="squirrel.windows" Version="1.4.4" />
@@ -43,9 +44,9 @@
     <PackageVersion Include="System.Memory" Version="4.5.5" />
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.4" />
-    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.1" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-    <PackageVersion Include="xunit" Version="2.4.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/MSBuildStructuredLog.Avalonia.sln b/MSBuildStructuredLog.Avalonia.sln
index bc6ac488f..b260e158f 100644
--- a/MSBuildStructuredLog.Avalonia.sln
+++ b/MSBuildStructuredLog.Avalonia.sln
@@ -1,6 +1,7 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2047
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.35219.272
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StructuredLogViewer.Avalonia", "src\StructuredLogViewer.Avalonia\StructuredLogViewer.Avalonia.csproj", "{B8DB3798-1636-417D-B57A-25C51C574F1E}"
 EndProject
@@ -13,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		appveyor.yml = appveyor.yml
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
+		Directory.Packages.props = Directory.Packages.props
 		nuget.config = nuget.config
 		README.md = README.md
 		version.json = version.json
@@ -22,40 +24,43 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskRunner", "src\TaskRunne
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StructuredLogViewer.Core", "src\StructuredLogViewer.Core\StructuredLogViewer.Core.csproj", "{3C655C5D-22C3-4B8D-969C-3FC497294703}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructuredLogger.Utils", "src\StructuredLogger.Utils\StructuredLogger.Utils.csproj", "{087507C9-BAD5-EDBB-ABD5-DE26D3F215F7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StructuredLogger.Utils", "src\StructuredLogger.Utils\StructuredLogger.Utils.csproj", "{BA89AC34-AB49-4BC9-8DD6-29CEEDDC3AD4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|Mixed Platforms = Release|Mixed Platforms
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A939886E-A191-4A46-A84B-21AD670081B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A939886E-A191-4A46-A84B-21AD670081B9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A939886E-A191-4A46-A84B-21AD670081B9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A939886E-A191-4A46-A84B-21AD670081B9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{087507C9-BAD5-EDBB-ABD5-DE26D3F215F7}.Debug|Mixed Platforms.ActiveCfg = Debug|Mixed Platforms
-		{087507C9-BAD5-EDBB-ABD5-DE26D3F215F7}.Debug|Mixed Platforms.Build.0 = Debug|Mixed Platforms
-		{087507C9-BAD5-EDBB-ABD5-DE26D3F215F7}.Release|Mixed Platforms.ActiveCfg = Release|Mixed Platforms
-		{087507C9-BAD5-EDBB-ABD5-DE26D3F215F7}.Release|Mixed Platforms.Build.0 = Release|Mixed Platforms
+		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A939886E-A191-4A46-A84B-21AD670081B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A939886E-A191-4A46-A84B-21AD670081B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A939886E-A191-4A46-A84B-21AD670081B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A939886E-A191-4A46-A84B-21AD670081B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA89AC34-AB49-4BC9-8DD6-29CEEDDC3AD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA89AC34-AB49-4BC9-8DD6-29CEEDDC3AD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA89AC34-AB49-4BC9-8DD6-29CEEDDC3AD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA89AC34-AB49-4BC9-8DD6-29CEEDDC3AD4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {9A9CFBCF-6C45-4FBF-8BF2-A5046AC403D8}
+	EndGlobalSection
 EndGlobal
diff --git a/MSBuildStructuredLog.sln b/MSBuildStructuredLog.sln
index b3f1479e6..9d583cd6b 100644
--- a/MSBuildStructuredLog.sln
+++ b/MSBuildStructuredLog.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.12.35209.166
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StructuredLogViewer", "src\StructuredLogViewer\StructuredLogViewer.csproj", "{FAEE07FD-7384-40D4-B52B-4756D1011BA6}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StructuredLogger", "src\StructuredLogger\StructuredLogger.csproj", "{A939886E-A191-4A46-A84B-21AD670081B9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StructuredLogger.Tests", "src\StructuredLogger.Tests\StructuredLogger.Tests.csproj", "{8A327073-0811-49D6-B1AA-1FB0157E750A}"
@@ -28,52 +26,54 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StructuredLogViewer.Avaloni
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResourcesGenerator", "src\ResourcesGenerator\ResourcesGenerator.csproj", "{B94C5F8A-E55F-4E07-A8BE-D8D3A203FD14}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BinlogTool", "src\BinlogTool\BinlogTool.csproj", "{35F44EA6-7259-43CC-8C17-E058F3EB86D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BinlogTool", "src\BinlogTool\BinlogTool.csproj", "{35F44EA6-7259-43CC-8C17-E058F3EB86D3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StructuredLogger.Utils", "src\StructuredLogger.Utils\StructuredLogger.Utils.csproj", "{AC634B46-D57C-44C5-BF56-480843182F21}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StructuredLogViewer", "src\StructuredLogViewer\StructuredLogViewer.csproj", "{C2E67DD4-F4F7-4CDE-A51A-6D46049A0CCA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Release|Mixed Platforms = Release|Mixed Platforms
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FAEE07FD-7384-40D4-B52B-4756D1011BA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FAEE07FD-7384-40D4-B52B-4756D1011BA6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FAEE07FD-7384-40D4-B52B-4756D1011BA6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{FAEE07FD-7384-40D4-B52B-4756D1011BA6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A939886E-A191-4A46-A84B-21AD670081B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A939886E-A191-4A46-A84B-21AD670081B9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A939886E-A191-4A46-A84B-21AD670081B9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A939886E-A191-4A46-A84B-21AD670081B9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B94C5F8A-E55F-4E07-A8BE-D8D3A203FD14}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B94C5F8A-E55F-4E07-A8BE-D8D3A203FD14}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B94C5F8A-E55F-4E07-A8BE-D8D3A203FD14}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B94C5F8A-E55F-4E07-A8BE-D8D3A203FD14}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{35F44EA6-7259-43CC-8C17-E058F3EB86D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{35F44EA6-7259-43CC-8C17-E058F3EB86D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{35F44EA6-7259-43CC-8C17-E058F3EB86D3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{35F44EA6-7259-43CC-8C17-E058F3EB86D3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AC634B46-D57C-44C5-BF56-480843182F21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AC634B46-D57C-44C5-BF56-480843182F21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AC634B46-D57C-44C5-BF56-480843182F21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AC634B46-D57C-44C5-BF56-480843182F21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A939886E-A191-4A46-A84B-21AD670081B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A939886E-A191-4A46-A84B-21AD670081B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A939886E-A191-4A46-A84B-21AD670081B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A939886E-A191-4A46-A84B-21AD670081B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A327073-0811-49D6-B1AA-1FB0157E750A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8539A63-8D03-4D16-9945-FE7F8489B56D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C655C5D-22C3-4B8D-969C-3FC497294703}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8DB3798-1636-417D-B57A-25C51C574F1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B94C5F8A-E55F-4E07-A8BE-D8D3A203FD14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B94C5F8A-E55F-4E07-A8BE-D8D3A203FD14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B94C5F8A-E55F-4E07-A8BE-D8D3A203FD14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B94C5F8A-E55F-4E07-A8BE-D8D3A203FD14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35F44EA6-7259-43CC-8C17-E058F3EB86D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35F44EA6-7259-43CC-8C17-E058F3EB86D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35F44EA6-7259-43CC-8C17-E058F3EB86D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35F44EA6-7259-43CC-8C17-E058F3EB86D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC634B46-D57C-44C5-BF56-480843182F21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC634B46-D57C-44C5-BF56-480843182F21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC634B46-D57C-44C5-BF56-480843182F21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC634B46-D57C-44C5-BF56-480843182F21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2E67DD4-F4F7-4CDE-A51A-6D46049A0CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2E67DD4-F4F7-4CDE-A51A-6D46049A0CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2E67DD4-F4F7-4CDE-A51A-6D46049A0CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2E67DD4-F4F7-4CDE-A51A-6D46049A0CCA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/StructuredLogger.Tests/AssertEx.cs b/src/StructuredLogger.Tests/AssertEx.cs
index d645d9396..b126d24b6 100644
--- a/src/StructuredLogger.Tests/AssertEx.cs
+++ b/src/StructuredLogger.Tests/AssertEx.cs
@@ -46,7 +46,7 @@ public static void EqualOrDiff(string expected, string actual, string message =
                 messageBuilder.AppendLine(line.Text);
             }
 
-            Assert.True(false, messageBuilder.ToString());
+            Assert.Fail(messageBuilder.ToString());
         }
     }
 }
diff --git a/src/StructuredLogger.Tests/BinaryLoggerTests.cs b/src/StructuredLogger.Tests/BinaryLoggerTests.cs
index d0ff697db..611b23fa0 100644
--- a/src/StructuredLogger.Tests/BinaryLoggerTests.cs
+++ b/src/StructuredLogger.Tests/BinaryLoggerTests.cs
@@ -11,7 +11,11 @@
 using Xunit;
 using Xunit.Abstractions;
 using static StructuredLogger.Tests.TestUtilities;
+using ArchiveFileEventArgs = Microsoft.Build.Logging.StructuredLogger.ArchiveFileEventArgs;
 using BinaryLogger = Microsoft.Build.Logging.StructuredLogger.BinaryLogger;
+using BinaryLogReaderErrorEventArgs = Microsoft.Build.Logging.StructuredLogger.BinaryLogReaderErrorEventArgs;
+using BinaryLogRecordKind = Microsoft.Build.Logging.StructuredLogger.BinaryLogRecordKind;
+using ReaderErrorType = Microsoft.Build.Logging.StructuredLogger.ReaderErrorType;
 
 namespace Microsoft.Build.UnitTests
 {
diff --git a/src/StructuredLogger.Tests/ConditionParserTests.cs b/src/StructuredLogger.Tests/ConditionParserTests.cs
index 57300794f..d1104c326 100644
--- a/src/StructuredLogger.Tests/ConditionParserTests.cs
+++ b/src/StructuredLogger.Tests/ConditionParserTests.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Globalization;
+using System.Linq;
 using System.Threading;
 using StructuredLogViewer;
 using Xunit;
@@ -7,6 +8,12 @@ namespace StructuredLogger.Tests
 {
     public class ConditionParserTests
     {
+        public ConditionParserTests()
+        {
+            CultureInfo.DefaultThreadCurrentCulture = new("en-US");
+            CultureInfo.DefaultThreadCurrentUICulture = new("en-US");
+        }
+
         [Fact]
         public void Empty_Test()
         {