Update the project (#9)

* Updated to .NET8, removed older frameworks
Updated code to use RapidApi and reflect some minor changes to the entry response
Removed separate projects for DI registration, assuming that default Microsoft DI is used

* Update build-test_pull-request.yml

* Update build-on-push.yml

* Update package-main.yml

.github/workflows/build-on-push.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core 7
+    - name: Setup .NET Core 8
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Install dependencies
       run: dotnet restore ./source/Lexicala.NET.sln
     - name: Build

.github/workflows/build-test_pull-request.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Install dependencies
       run: dotnet restore ./source/Lexicala.NET.sln
     - name: Build

.github/workflows/package-main.yml

@@ -12,14 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core 6
+    - name: Setup .NET Core 8
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
-    - name: Setup .NET Core 7
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Install dependencies
       run: dotnet restore ./source/Lexicala.NET.sln
     - name: Build

.gitignore

@@ -362,3 +362,4 @@ MigrationBackup/
 
 /source/Lexicala.NET.ConsoleApp/appsettings.json
 /source/Lexicala.NET.ConsoleApp.NET472/App.config
+/source/Visual Studio 2022/Visualizers

source/Lexicala.NET.ConsoleApp/Lexicala.NET.ConsoleApp.csproj

@@ -2,17 +2,18 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
+    <UserSecretsId>83e2368c-8e8a-4e8e-9f3d-c00d575b6393</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Lexicala.NET.MicrosoftDependencyInjection\Lexicala.NET.MicrosoftDependencyInjection.csproj" />
     <ProjectReference Include="..\Lexicala.NET\Lexicala.NET.csproj" />
   </ItemGroup>
 

source/Lexicala.NET.ConsoleApp/Program.cs

@@ -3,8 +3,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Threading.Tasks;
-using Lexicala.NET.MicrosoftDependencyInjection;
 using Lexicala.NET.Request;
+using Microsoft.Extensions.Logging;
 
 namespace Lexicala.NET.ConsoleApp
 {
@@ -16,11 +16,11 @@ public static async Task Main(string[] args)
         {
             IConfiguration configuration = new ConfigurationBuilder()
                 .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
-                .AddEnvironmentVariables()
                 .AddCommandLine(args)
+                // add your own user name and password to the user secrets store
+                .AddUserSecrets<Program>()
                 .Build();
 
-
             try
             {
                 RegisterServices(configuration);
@@ -97,6 +97,7 @@ private static void RegisterServices(IConfiguration configuration)
         {
             IServiceCollection services = new ServiceCollection();
             services.RegisterLexicala(configuration);
+            services.AddLogging(cfg => cfg.AddConsole());
 
             _serviceProvider = services.BuildServiceProvider(true);
         }

source/Lexicala.NET.Tests/Lexicala.NET.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -15,6 +15,7 @@
     <None Remove="Resources\Entry_RDE00032314_1.json" />
     <None Remove="Resources\ES_DE00008087.json" />
     <None Remove="Resources\ES_DE00008088.json" />
+    <None Remove="Resources\ES_DE00010530.json" />
     <None Remove="Resources\ES_DE00019850.json" />
     <None Remove="Resources\languages.json" />
     <None Remove="Resources\me.json" />
@@ -35,6 +36,7 @@
     <EmbeddedResource Include="Resources\Entry_ES_DE00008087.json" />
     <EmbeddedResource Include="Resources\Entry_ES_DE00008088.json" />
     <EmbeddedResource Include="Resources\ES_DE00008087.json" />
+    <EmbeddedResource Include="Resources\ES_DE00010530.json" />
     <EmbeddedResource Include="Resources\ES_DE00019850.json" />
     <EmbeddedResource Include="Resources\ES_DE00008088.json" />
     <EmbeddedResource Include="Resources\languages.json" />
@@ -53,16 +55,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="Moq" Version="4.17.2" />
-    <PackageReference Include="Moq.AutoMock" Version="3.3.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="Moq.AutoMock" Version="3.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Shouldly" Version="4.0.3" />
+    <PackageReference Include="Shouldly" Version="4.2.1" />
   </ItemGroup>
 
   <ItemGroup>