Merge remote-tracking branch 'GH_CSharp/Avalonia_Apps'

Author: joecare99

Avalonia_Apps/AA98_AvlnCodeStudio.slnx

@@ -45,6 +45,8 @@
   </Folder>
   <Folder Name="/Workbench.Builder/">
     <Project Path="../CSharpBible/Data/DevOps/DevOps.shproj" />
+    <Project Path="../CSharpBible/Data/Workbench.Builder/Workbench.Builder.Analysis/Workbench.Builder.Analysis.csproj" />
+    <Project Path="../CSharpBible/Data/Workbench.Builder/Workbench.Builder.Cli/Workbench.Builder.Cli.csproj" />
     <Project Path="../CSharpBible/Data/Workbench.Builder/Workbench.Builder.Core.Tests/Workbench.Builder.Core.Tests.csproj" />
     <Project Path="../CSharpBible/Data/Workbench.Builder/Workbench.Builder.Core/Workbench.Builder.Core.csproj" />
     <Project Path="../CSharpBible/Data/Workbench.Builder/Workbench.Builder.Host/Workbench.Builder.Host.csproj" />

Avalonia_Apps/AvlnSamples/Avln_Complex_LayoutTests/Avln_Complex_LayoutTests.csproj

@@ -6,7 +6,7 @@
  <ItemGroup>
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
  <PackageReference Include="MSTest" Version="4.3.0" />
- <PackageReference Include="NSubstitute" Version="5.3.0" />
+ <PackageReference Include="NSubstitute" Version="6.0.0" />
  <PackageReference Include="Avalonia.Headless" Version="12.1.0" />
  </ItemGroup>
  <ItemGroup>

Avalonia_Apps/Libraries/Avln_BaseLibTests/Avln_BaseLibTests.csproj

@@ -28,7 +28,7 @@
 		</PackageReference>
 		<PackageReference Include="FluentAssertions" Version="8.10.0" />
 		<PackageReference Include="Avalonia.Headless" Version="12.1.0" />
-		<PackageReference Include="NSubstitute" Version="5.3.0" />
+		<PackageReference Include="NSubstitute" Version="6.0.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Avln_BaseLib\Avln_BaseLib.csproj" />

Avalonia_Apps/Libraries/Avln_TestConsoleTests/Avln_TestConsoleTests.csproj

@@ -26,7 +26,7 @@
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="8.10.0" />
     <PackageReference Include="Avalonia.Headless" Version="12.1.0" />
-    <PackageReference Include="NSubstitute" Version="5.3.0" />
+    <PackageReference Include="NSubstitute" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avln_TestConsole\Avln_TestConsole.csproj" />

Avalonia_Apps/Libraries/BaseLibTests/BaseLibTests.csproj

@@ -26,7 +26,7 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="NSubstitute" Version="5.3.0" />
+		<PackageReference Include="NSubstitute" Version="6.0.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\BaseLib\BaseLib.csproj" />

Avalonia_Apps/Packages.props

@@ -25,10 +25,8 @@
     <PackageVersion Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
     <PackageVersion Include="Markdown.Avalonia" Version="12.0.0-a" />
     <PackageVersion Include="FontPickerAvalonia" Version="0.10.18.1" />
-
     <PackageVersion Include="Avalonia.Svg.Skia" Version="11.3.0" />
     <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.8" />
-
     <PackageVersion Include="Simplecto.Avalonia.RichTextBox" Version="1.9.3" />
     <PackageVersion Include="MessageBox.Avalonia" Version="12.0.0" />
     <PackageVersion Include="MsBox.Avalonia" Version="3.0.0-rc2" />
@@ -39,9 +37,8 @@
     <PackageVersion Include="System.Drawing.Common" Version="10.0.9" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.9" />
     <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.14" />
-
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
-    <PackageVersion Include="NSubstitute" Version="5.3.0" />
+    <PackageVersion Include="NSubstitute" Version="6.0.0" />
     <PackageVersion Include="MSTest" Version="4.3.0" />
     <PackageVersion Include="FluentAssertions" Version="8.10.0" />
     <PackageVersion Include="coverlet.collector" Version="10.0.1" />