sync

Avalonia_Apps/Libraries/BaseLib/BaseLib.csproj

@@ -2,8 +2,7 @@
 	<Import Project="..\Libraries.props" />
 	<PropertyGroup>
 		<OutputType>Library</OutputType>
-		<TargetFrameworks>net481;net48;net472;net462</TargetFrameworks>
-		<UseWindowsForms>true</UseWindowsForms>
+    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net481;net48;net472;net462</TargetFrameworks>
 		<SignAssembly>True</SignAssembly>
 	</PropertyGroup>
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />

Avalonia_Apps/Libraries/BaseLib/Helper/IoC.cs

@@ -19,11 +19,6 @@
 /// </summary>
 namespace BaseLib.Helper;
 
-/// <summary>
-/// Class IoC.
-/// Implements the <see cref="MarkupExtension" />
-/// </summary>
-/// <seealso cref="MarkupExtension" />
 public class IoC
 {
     /// <summary>

Avalonia_Apps/Libraries/BaseLibTests/BaseLibTests.csproj

@@ -1,8 +1,8 @@
 <Project>
 	<Import Project="..\Libraries.props" />
 	<PropertyGroup>
-		<TargetFrameworks>net481;net48;net472;net462</TargetFrameworks>
-		<IsPackable>false</IsPackable>
+    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net481;net48;net472;net462</TargetFrameworks>
+    <IsPackable>false</IsPackable>
 	</PropertyGroup>
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />

Avalonia_Apps/Libraries/BaseLibTests/BaseLib_netTests.csproj

@@ -1,7 +1,7 @@
 <Project>
 	<Import Project="..\Libraries_net.props" />
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net481-windows;net48-windows;net472-windows;net462-windows</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net481;net48;net472;net462</TargetFrameworks>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
@@ -19,7 +19,7 @@
 		</PackageReference>
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\BaseLib\BaseLib_net.csproj" />
+		<ProjectReference Include="..\BaseLib\BaseLib.csproj" />
 	</ItemGroup>
 
 </Project>

CSharpBible/AboutEx/AboutEx.csproj

@@ -1,7 +1,7 @@
 <Project>
 	<Import Project="..\Solution_net.props" />
 	<PropertyGroup>
-		<TargetFrameworks>net9.0-windows</TargetFrameworks>
+		<TargetFrameworks>net4.8.1-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
 		<OutputType>WinExe</OutputType>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<UseWindowsForms>true</UseWindowsForms>

CSharpBible/AboutExTests/AboutExTests.csproj

@@ -1,22 +1,26 @@
-<Project>
+<Project>
   <Import Project="..\Solution_net.props" />
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <RootNamespace>CSharpBible.AboutExTests</RootNamespace>
     <AssemblyName>AboutExTests</AssemblyName>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFrameworks>net4.8.1-windows;net9.0-windows</TargetFrameworks>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="MSTest" Version="3.7.3" />
-    <PackageReference Include="coverlet.collector" Version="6.0.3">
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\AboutEx\AboutEx.csproj" />
+  </ItemGroup>
 
 </Project>

CSharpBible/AboutExTests/Visual/FrmAboutTests.cs

@@ -13,6 +13,7 @@
 // ***********************************************************************
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Threading;
+using System.Windows.Forms;
 
 namespace CSharpBible.AboutEx.Visual.Tests
 {

CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template.csproj

@@ -2,7 +2,7 @@
 	<Import Project="..\C#-Basics.props" />
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net462;net472;net48;net481</TargetFrameworks>
+		<TargetFrameworks>net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
@@ -15,16 +15,19 @@
 	  <ProjectReference Include="$(UpDir)\Libraries\ConsoleDisplay\ConsoleDisplay.csproj" />
 	  <ProjectReference Include="$(UpDir)\Libraries\BaseLib\BaseLib.csproj" />
 	</ItemGroup>
+  <ItemGroup>
+	  <PackageReference Condition="!$(TargetFramework.StartsWith(net4))" Include="System.Configuration.ConfigurationManager" Version="9.0.1" />
+	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">
 			<DesignTime>True</DesignTime>
 			<AutoGen>True</AutoGen>
 			<DependentUpon>Resources.resx</DependentUpon>
 		</Compile>
 		<Compile Update="Properties\Settings.Designer.cs">
-			<DesignTimeSharedInput>True</DesignTimeSharedInput>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>Settings.settings</DependentUpon>
+		  <DesignTimeSharedInput>True</DesignTimeSharedInput>
+		  <AutoGen>True</AutoGen>
+		  <DependentUpon>Settings.settings</DependentUpon>
 		</Compile>
 	</ItemGroup>
 	<ItemGroup>
@@ -34,9 +37,9 @@
 		</EmbeddedResource>
 	</ItemGroup>
 	<ItemGroup>
-		<None Update="Properties\Settings.settings">
-			<Generator>PublicSettingsSingleFileGenerator</Generator>
-			<LastGenOutput>Settings.Designer.cs</LastGenOutput>
-		</None>
+	  <None Update="Properties\Settings.settings">
+	    <Generator>PublicSettingsSingleFileGenerator</Generator>
+	    <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+	  </None>
 	</ItemGroup>
 </Project>

CSharpBible/Basics/Basic_Del00_Template/Basic_Del00_Template_net.csproj

@@ -15,8 +15,7 @@
 	  <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.1" />
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="$(UpDir)\Libraries\ConsoleDisplay\ConsoleDisplay_net.csproj" />
-		<ProjectReference Include="$(UpDir)\Libraries\BaseLib\BaseLib_net.csproj" />
+	  <ProjectReference Include="..\..\Libraries\BaseLib\BaseLib.csproj" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">

CSharpBible/Basics/Basic_Del00_Template/Views/MainView.cs

@@ -2,6 +2,7 @@
 using System.Windows.Input;
 using ConsoleDisplay.View;
 using Basic_Del00_Template.ViewModels;
+using BaseLib.Interfaces;
 
 namespace Basic_Del00_Template.Views
 {

CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_TemplateTests.csproj

@@ -1,7 +1,7 @@
 <Project>
 	<Import Project="..\C#-Basics.props" />
 	<PropertyGroup>
-		<TargetFrameworks>net462;net472;net48;net481</TargetFrameworks>
+		<TargetFrameworks>net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
 		<IsTestProject>true</IsTestProject>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
@@ -15,7 +15,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="MSTest" Version="3.7.3" />
-		<PackageReference Include="coverlet.collector" Version="6.0.3">
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

CSharpBible/Basics/Basic_Del00_TemplateTests/Basic_Del00_Template_netTests.csproj

@@ -15,14 +15,14 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="MSTest" Version="3.7.3" />
-		<PackageReference Include="coverlet.collector" Version="6.0.3">
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="$(UpDir)\Libraries\ConsoleDisplay\ConsoleDisplay_net.csproj" />
-		<ProjectReference Include="..\Basic_Del00_Template\Basic_Del00_Template_net.csproj" />
-		<ProjectReference Include="$(UpDir)\Libraries\BaseLibTests\BaseLib_netTests.csproj" />
-	</ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Basic_Del00_Template\Basic_Del00_Template_net.csproj" />
+    <ProjectReference Include="$(UpDir)\Libraries\ConsoleDisplay\ConsoleDisplay.csproj" />
+    <ProjectReference Include="$(UpDir)\Libraries\BaseLibTests\BaseLibTests.csproj" />
+  </ItemGroup>
 </Project>

CSharpBible/Basics/Basic_Del00_TemplateTests/Views/TestConsole.cs

@@ -11,7 +11,8 @@
 // </copyright>
 // <summary></summary>
 // ***********************************************************************
-using ConsoleDisplay.View;
+using BaseLib.Helper;
+using BaseLib.Interfaces;
 using System;
 
 namespace Basic_Del00_Template.Views.Tests

CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action.csproj

@@ -2,7 +2,7 @@
 	<Import Project="..\C#-Basics.props" />
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net462;net472;net48;net481</TargetFrameworks>
+		<TargetFrameworks>net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
@@ -18,7 +18,10 @@
 	  <ProjectReference Include="$(UpDir)\Libraries\ConsoleDisplay\ConsoleDisplay.csproj" />
 	  <ProjectReference Include="$(UpDir)\Libraries\BaseLib\BaseLib.csproj" />
 	</ItemGroup>
-	<ItemGroup>
+  <ItemGroup>
+    <PackageReference Condition="!$(TargetFramework.StartsWith(net4))" Include="System.Configuration.ConfigurationManager" Version="9.0.1" />
+  </ItemGroup>
+  <ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">
 			<DesignTime>True</DesignTime>
 			<AutoGen>True</AutoGen>

CSharpBible/Basics/Basic_Del01_Action/Basic_Del01_Action_net.csproj

@@ -15,9 +15,9 @@
 	  <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.1" />
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="$(UpDir)\Libraries\ConsoleDisplay\ConsoleDisplay_net.csproj" />
-		<ProjectReference Include="$(UpDir)\Libraries\BaseLib\BaseLib_net.csproj" />
-	</ItemGroup>
+    <ProjectReference Include="$(UpDir)\Libraries\ConsoleDisplay\ConsoleDisplay.csproj" />
+    <ProjectReference Include="$(UpDir)\Libraries\BaseLib\BaseLib.csproj" />
+  </ItemGroup>
 	<ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">
 			<DesignTime>True</DesignTime>

CSharpBible/Basics/Basic_Del01_Action/Views/MainView.cs

@@ -2,6 +2,7 @@
 using System.Windows.Input;
 using ConsoleDisplay.View;
 using Basic_Del01_Action.ViewModels;
+using BaseLib.Interfaces;
 
 namespace Basic_Del01_Action.Views
 {

CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_ActionTests.csproj

@@ -1,7 +1,7 @@
 <Project>
 	<Import Project="..\C#-Basics.props" />
 	<PropertyGroup>
-		<TargetFrameworks>net462;net472;net48;net481</TargetFrameworks>
+		<TargetFrameworks>net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
 		<IsTestProject>true</IsTestProject>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
@@ -15,7 +15,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="MSTest" Version="3.7.3" />
-		<PackageReference Include="coverlet.collector" Version="6.0.3">
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

CSharpBible/Basics/Basic_Del01_ActionTests/Basic_Del01_Action_netTests.csproj

@@ -15,14 +15,14 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="MSTest" Version="3.7.3" />
-		<PackageReference Include="coverlet.collector" Version="6.0.3">
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="$(UpDir)\Libraries\ConsoleDisplay\ConsoleDisplay_net.csproj" />
 		<ProjectReference Include="..\Basic_Del01_Action\Basic_Del01_Action_net.csproj" />
-		<ProjectReference Include="$(UpDir)\Libraries\BaseLibTests\BaseLib_netTests.csproj" />
-	</ItemGroup>
+    <ProjectReference Include="$(UpDir)\Libraries\ConsoleDisplay\ConsoleDisplay.csproj" />
+    <ProjectReference Include="$(UpDir)\Libraries\BaseLibTests\BaseLibTests.csproj" />
+  </ItemGroup>
 </Project>

CSharpBible/Basics/Basic_Del01_ActionTests/Views/TestConsole.cs

@@ -11,7 +11,7 @@
 // </copyright>
 // <summary></summary>
 // ***********************************************************************
-using ConsoleDisplay.View;
+using BaseLib.Interfaces;
 using System;
 
 namespace Basic_Del01_Action.Views.Tests

CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter.csproj

@@ -2,7 +2,7 @@
 	<Import Project="..\C#-Basics.props" />
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net462;net472;net48;net481</TargetFrameworks>
+		<TargetFrameworks>net462;net472;net48;net481;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 	<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
@@ -18,7 +18,10 @@
 	  <ProjectReference Include="$(UpDir)\Libraries\ConsoleDisplay\ConsoleDisplay.csproj" />
 	  <ProjectReference Include="$(UpDir)\Libraries\BaseLib\BaseLib.csproj" />
 	</ItemGroup>
-	<ItemGroup>
+  <ItemGroup>
+    <PackageReference Condition="!$(TargetFramework.StartsWith(net4))" Include="System.Configuration.ConfigurationManager" Version="9.0.1" />
+  </ItemGroup>
+  <ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">
 			<DesignTime>True</DesignTime>
 			<AutoGen>True</AutoGen>

CSharpBible/Basics/Basic_Del02_Filter/Basic_Del02_Filter_net.csproj

@@ -14,11 +14,11 @@
 	<ItemGroup>
 	  <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.1" />
 	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="$(UpDir)\Libraries\ConsoleDisplay\ConsoleDisplay_net.csproj" />
-		<ProjectReference Include="$(UpDir)\Libraries\BaseLib\BaseLib_net.csproj" />
-	</ItemGroup>
-	<ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(UpDir)\Libraries\ConsoleDisplay\ConsoleDisplay.csproj" />
+    <ProjectReference Include="$(UpDir)\Libraries\BaseLib\BaseLib.csproj" />
+  </ItemGroup>
+  <ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">
 			<DesignTime>True</DesignTime>
 			<AutoGen>True</AutoGen>