Merge pull request Kentico#380 from JosefDvorak/DotnetUpdate

Add GitHub Actions & Upgrade to .NET 8

.github/workflows/dotnet.yml

@@ -0,0 +1,36 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: .NET
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  workflow_dispatch:
+
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 8.0.x
+        node-version: 20.7.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build front-end app
+      run: |
+        cd ./KenticoInspector.WebApplication/ClientApp
+        npm i
+        npm run build
+    - name: Build dotnet app
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal

KenticoInspector.Actions/KenticoInspector.Actions.csproj

@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
+	<LangVersion>9.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.9.2" />
+    <PackageReference Include="Autofac" Version="7.1.0" />
   </ItemGroup>
 
   <ItemGroup>

KenticoInspector.Core.Tests/KenticoInspector.Core.Tests.csproj

@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
-
-    <LangVersion>7.1</LangVersion>
+	<LangVersion>9.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

KenticoInspector.Core/Converters/VersionListConverter.cs

@@ -0,0 +1,28 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System;
+
+namespace KenticoInspector.Core.Converters
+{
+    public class VersionListConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return (objectType == typeof(List<Version>));
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            serializer.Converters.Add(new VersionObjectConverter());
+
+            serializer.Serialize(writer, value);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            serializer.Converters.Add(new VersionObjectConverter());
+
+            return serializer.Deserialize(reader, typeof(Version));
+        }
+    }
+}

KenticoInspector.Core/Converters/VersionObjectConverter.cs

@@ -0,0 +1,26 @@
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using System;
+
+namespace KenticoInspector.Core.Converters
+{
+    public class VersionObjectConverter : JsonConverter<Version>
+    {
+        public override void WriteJson(JsonWriter writer, Version value, JsonSerializer serializer)
+        {
+            JObject jsonVersion = new JObject
+        {
+            { "major", value.Major },
+            { "minor", value.Minor },
+            { "build", value.Build },
+        };
+            jsonVersion.WriteTo(writer);
+        }
+
+        public override Version ReadJson(JsonReader reader, Type objectType, Version existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            JObject jsonVersion = JObject.Load(reader);
+            return new Version((int)jsonVersion["major"], (int)jsonVersion["minor"], (int)jsonVersion["build"]);
+        }
+    }
+}

KenticoInspector.Core/Helpers/DirectoryHelper.cs

@@ -5,18 +5,14 @@ namespace KenticoInspector.Core.Helpers
 {
     public static class DirectoryHelper
     {
-        private const string filePrefix = "file:\\";
-
         /// <summary>
         /// Gets the executing directory of the application.
         /// </summary>
         /// <returns>A string that contains the path of the executing directory, and does not end with a backslash (\).</returns>
         public static string GetExecutingDirectory()
         {
-            var assemblyPath = Assembly.GetExecutingAssembly().CodeBase;
-            var assemblyDirectory = Path.GetDirectoryName(assemblyPath);
-
-            return assemblyDirectory.Substring(filePrefix.Length);
+            var assemblyPath = Assembly.GetExecutingAssembly().Location;
+            return Path.GetDirectoryName(assemblyPath);
         }
     }
 }

KenticoInspector.Core/KenticoInspector.Core.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <LangVersion>7.1</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
+	<LangVersion>9.0</LangVersion>
     <Version />
     <PackageVersion />
     <AssemblyVersion />
@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.9.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
+    <PackageReference Include="Autofac" Version="7.1.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
 
   <ItemGroup>

KenticoInspector.Core/Models/InstanceDetails.cs

@@ -1,4 +1,6 @@
-using System;
+using KenticoInspector.Core.Converters;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 
 namespace KenticoInspector.Core.Models
@@ -7,8 +9,10 @@ public class InstanceDetails
     {
         public Guid Guid { get; set; }
 
+        [JsonConverter(typeof(VersionObjectConverter))]
         public Version AdministrationVersion { get; set; }
 
+        [JsonConverter(typeof(VersionObjectConverter))]
         public Version DatabaseVersion { get; set; }
 
         public IEnumerable<Site> Sites { get; set; }

KenticoInspector.Core/Modules/IModule.cs

@@ -1,16 +1,19 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 
-using KenticoInspector.Core.Models;
+using KenticoInspector.Core.Converters;
 
 namespace KenticoInspector.Core.Modules
 {
     public interface IModule
     {
         string Codename { get; }
 
+        [JsonConverter(typeof(VersionListConverter))]
         IList<Version> CompatibleVersions { get; }
 
+        [JsonConverter(typeof(VersionListConverter))]
         IList<Version> IncompatibleVersions { get; }
 
         IList<string> Tags { get; }

KenticoInspector.Core/Tokens/TokenExpressionResolver.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.Serialization;
+using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 
 namespace KenticoInspector.Core.Tokens
@@ -86,7 +86,7 @@ private static string ResolveTokenExpression(string tokenExpression, IDictionary
             {
                 if (Regex.IsMatch(innerTokenExpression, pattern))
                 {
-                    var expressionObject = FormatterServices.GetUninitializedObject(tokenExpressionType) as ITokenExpression;
+                    var expressionObject = RuntimeHelpers.GetUninitializedObject(tokenExpressionType) as ITokenExpression;
 
                     resolvedExpression = expressionObject.Resolve(innerTokenExpression, tokenDictionary);
 

KenticoInspector.Infrastructure.Tests/KenticoInspector.Infrastructure.Tests.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-
+    <TargetFramework>net8.0</TargetFramework>
+	<LangVersion>9.0</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

KenticoInspector.Infrastructure/KenticoInspector.Infrastructure.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <LangVersion>7.1</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
+	<LangVersion>9.0</LangVersion>
     <Version />
     <PackageVersion />
     <AssemblyVersion />
@@ -11,11 +11,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.9.2" />
+    <PackageReference Include="Autofac" Version="7.1.0" />
     <PackageReference Include="Dapper" Version="1.60.1" />
     <PackageReference Include="Dapper.FluentMap" Version="1.7.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageReference Include="YamlDotNet" Version="6.1.1" />
   </ItemGroup>
 

KenticoInspector.Reports.Tests/KenticoInspector.Reports.Tests.csproj

@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
-
-    <LangVersion>7.1</LangVersion>
+	<LangVersion>9.0</LangVersion>
     <Version />
     <PackageVersion />
     <AssemblyVersion />

KenticoInspector.Reports/KenticoInspector.Reports.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <LangVersion>7.1</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
+	<LangVersion>9.0</LangVersion>
     <Version />
     <PackageVersion />
     <AssemblyVersion />
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.9.2" />
+    <PackageReference Include="Autofac" Version="7.1.0" />
   </ItemGroup>
 
   <ItemGroup>

KenticoInspector.WebApplication/Controllers/ActionsController.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Threading.Tasks;
 
 using KenticoInspector.Core.Models;
 using KenticoInspector.Core.Modules;
@@ -23,20 +24,17 @@ public ActionsController(IModuleService moduleService)
         }
 
         [HttpGet("{instanceGuid}")]
-        public ActionResult<IEnumerable<IAction>> Get(Guid instanceGuid)
+        public Task<IEnumerable<IAction>> Get(Guid instanceGuid)
         {
-            return Ok(moduleService.GetActions(instanceGuid));
+            return Task.FromResult(moduleService.GetActions(instanceGuid));
         }
 
-        // POST api/values
         [HttpPost("{codename}/execute/{instanceGuid}")]
-        public ActionResult<ActionResults> Excecute(string codename, Guid instanceGuid)
+        public async Task<ActionResults> Excecute(string codename, Guid instanceGuid)
         {
-            using (StreamReader reader = new StreamReader(Request.Body, Encoding.UTF8))
-            {
-                var optionsJson = reader.ReadToEnd();
-                return moduleService.ExecuteAction(codename, instanceGuid, optionsJson);
-            }
+            using StreamReader reader = new(Request.Body, Encoding.UTF8);
+            var optionsJson = await reader.ReadToEndAsync();
+            return moduleService.ExecuteAction(codename, instanceGuid, optionsJson);
         }
     }
 }

KenticoInspector.WebApplication/Controllers/InstancesController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 using KenticoInspector.Core.Models;
 using KenticoInspector.Core.Services.Interfaces;
@@ -21,9 +22,9 @@ public InstancesController(IInstanceService instanceService)
         }
 
         [HttpGet("details/{instanceGuid}")]
-        public ActionResult<InstanceDetails> Details(Guid instanceGuid)
+        public Task<InstanceDetails> Details(Guid instanceGuid)
         {
-            return _instanceService.GetInstanceDetails(instanceGuid);
+            return Task.FromResult(_instanceService.GetInstanceDetails(instanceGuid));
         }
 
         [HttpDelete("{instanceGuid}")]
@@ -33,22 +34,22 @@ public void Delete(Guid instanceGuid)
         }
 
         [HttpGet]
-        public ActionResult<IEnumerable<Instance>> Get()
+        public Task<List<Instance>> Get()
         {
             var instances = _instanceService.GetInstances();
-            return instances.ToList();
+            return Task.FromResult(instances.ToList());
         }
 
         [HttpGet("{instanceGuid}")]
-        public ActionResult<Instance> Get(Guid instanceGuid)
+        public Task<Instance> Get(Guid instanceGuid)
         {
-            return _instanceService.GetInstance(instanceGuid);
+            return Task.FromResult(_instanceService.GetInstance(instanceGuid));
         }
 
         [HttpPost]
-        public Instance Post([FromBody] Instance instance)
+        public Task<Instance> Post([FromBody] Instance instance)
         {
-            return _instanceService.UpsertInstance(instance);
+            return Task.FromResult(_instanceService.UpsertInstance(instance));
         }
     }
 }