update Newtonsoft.Json, fix obsolete methods

Kentico · Jan 16, 2024 · 597bd22 · 597bd22
1 parent 268dfaf
commit 597bd22
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/KenticoInspector.Core/Helpers/DirectoryHelper.cs b/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);
         }
     }
 }
diff --git a/KenticoInspector.Core/KenticoInspector.Core.csproj b/KenticoInspector.Core/KenticoInspector.Core.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac" Version="7.1.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
 

diff --git a/KenticoInspector.Core/Tokens/TokenExpressionResolver.cs b/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);
 

diff --git a/KenticoInspector.Infrastructure/KenticoInspector.Infrastructure.csproj b/KenticoInspector.Infrastructure/KenticoInspector.Infrastructure.csproj
@@ -14,7 +14,7 @@
     <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="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageReference Include="YamlDotNet" Version="6.1.1" />
   </ItemGroup>

diff --git a/KenticoInspector.WebApplication/KenticoInspector.WebApplication.csproj b/KenticoInspector.WebApplication/KenticoInspector.WebApplication.csproj
@@ -15,9 +15,7 @@
   <ItemGroup>
     <PackageReference Include="Autofac" Version="7.1.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageReference Include="VueCliMiddleware" Version="2.2.0" />

diff --git a/KenticoInspector.WebApplication/Startup.cs b/KenticoInspector.WebApplication/Startup.cs
@@ -37,7 +37,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             return ConfigureAutofac(services);
         }
 
-        private IServiceProvider ConfigureAutofac(IServiceCollection services)
+        private AutofacServiceProvider ConfigureAutofac(IServiceCollection services)
         {
             var containerBuilder = new ContainerBuilder();