Merge pull request #6 from nd1012/dev

+ Updated references
nd1012 · Sep 9, 2024 · 5993a4e · 5993a4e
2 parents d18f02a + 6f8d39e
commit 5993a4e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/src/wan24-CLI Tests/A_Initialization.cs b/src/wan24-CLI Tests/A_Initialization.cs
@@ -1,21 +1,9 @@
-using Microsoft.Extensions.Logging;
-using wan24.Core;
-
-namespace wan24_CLI_Tests
+namespace wan24_CLI_Tests
 {
     [TestClass]
     public class A_Initialization
     {
-        public static ILoggerFactory LoggerFactory { get; private set; } = null!;
-
         [AssemblyInitialize]
-        public static void Init(TestContext tc)
-        {
-            if (File.Exists("tests.log")) File.Delete("tests.log");
-            if (File.Exists("demo.log")) File.Delete("demo.log");
-            Logging.Logger = new ConsoleLogger(LogLevel.Trace, next: FileLogger.CreateAsync("tests.log", LogLevel.Trace).Result);
-            Logging.WriteInfo("wan24-CLI Tests initialized");
-            Bootstrap.Async().Wait();
-        }
+        public static void Init(TestContext tc) => wan24.Tests.TestsInitialization.Init(tc);
     }
 }
diff --git a/src/wan24-CLI Tests/CliDemo_Tests.cs b/src/wan24-CLI Tests/CliDemo_Tests.cs
@@ -1,9 +1,10 @@
 using wan24.Core;
+using wan24.Tests;
 
 namespace wan24_CLI_Tests
 {
     [TestClass]
-    public class CliDemo_Tests
+    public class CliDemo_Tests : TestBase
     {
         [TestMethod, Timeout(10000)]
         public void General_Tests()

diff --git a/src/wan24-CLI Tests/wan24-CLI Tests.csproj b/src/wan24-CLI Tests/wan24-CLI Tests.csproj
@@ -13,13 +13,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.5.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.5.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="wan24-Tests" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/wan24-CLI/wan24-CLI.csproj b/src/wan24-CLI/wan24-CLI.csproj
@@ -9,7 +9,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <PackageId>wan24-CLI</PackageId>
     <Title>wan24-CLI</Title>
-    <Version>1.5.0</Version>
+    <Version>1.6.0</Version>
     <Authors>nd1012</Authors>
     <Company>Andreas Zimmermann, wan24.de</Company>
     <Product>wan24-CLI</Product>
@@ -33,9 +33,9 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="ObjectValidation" Version="2.6.0" Condition="'$(Configuration)' != 'Trunk'" />
+    <PackageReference Include="ObjectValidation" Version="2.7.0" Condition="'$(Configuration)' != 'Trunk'" />
     <PackageReference Include="Spectre.Console" Version="0.49.1" />
-    <PackageReference Include="wan24-Core" Version="2.34.0" Condition="'$(Configuration)' != 'Trunk'" />
+    <PackageReference Include="wan24-Core" Version="2.36.0" Condition="'$(Configuration)' != 'Trunk'" />
 	<ProjectReference Include="..\..\..\wan24-Core\src\Wan24-Core\Wan24-Core.csproj" Condition="'$(Configuration)' == 'Trunk'" />
 	<ProjectReference Include="..\..\..\ObjectValidation\src\ObjectValidation\ObjectValidation.csproj" Condition="'$(Configuration)' == 'Trunk'" />
   </ItemGroup>