Update to .NET 10 & C# 14 + cleanup

Author: scorteanucosmin

src/Common/Constants.cs

@@ -1,7 +1,6 @@
 using Microsoft.CodeAnalysis.Emit;
 using Microsoft.Extensions.Logging;
 using Serilog.Core;
-using Serilog.Events;
 
 namespace Oxide.CompilerServices.Common;
 
@@ -13,7 +12,7 @@ public static class Constants
     public static readonly EventId CommandEventId = new(3, "Command");
     public static readonly EventId CompileEventId = new(4, "Compile");
 
-    public static readonly EmitOptions PdbEmitOptions = new(debugInformationFormat: DebugInformationFormat.Embedded);
+    public static readonly EmitOptions PdbEmitOptions = new(debugInformationFormat: DebugInformationFormat.PortablePdb);
 
     public static readonly Dictionary<string, string> SwitchMappings = new(StringComparer.InvariantCultureIgnoreCase)
     {

src/Common/DependencyInjection.cs

@@ -4,50 +4,47 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Oxide.CompilerServices.Interfaces;
-using Oxide.CompilerServices.Models.Configuration;
 using Oxide.CompilerServices.Services;
+using Oxide.CompilerServices.Types.Configuration;
 using Serilog;
 
 namespace Oxide.CompilerServices.Common;
 
 public static class DependencyInjection
 {
-    public static void AddServices(this IServiceCollection services, IConfiguration configuration, string[] args)
+    public static void AddServices(this IServiceCollection services, ConfigurationManager configuration, string[] args)
     {
         services.Configure<HostOptions>(service =>
         {
             service.ServicesStartConcurrently = true;
             service.ServicesStopConcurrently = true;
         });
 
-        ConfigurationBuilder configurationBuilder = new();
 
-        configurationBuilder.AddCommandLine(args, Constants.SwitchMappings);
-        configurationBuilder.AddJsonFile(Path.Combine(Constants.RootPath, "oxide.compiler.json"), true);
-        configurationBuilder.AddEnvironmentVariables("Oxide_");
+        configuration.AddCommandLine(args, Constants.SwitchMappings);
+        configuration.AddJsonFile(Path.Combine(Constants.RootPath, "oxide.compiler.json"), true);
+        configuration.AddEnvironmentVariables("Oxide_");
 
-        IConfigurationRoot configurationRoot = configurationBuilder.Build();
-
-        string mode = configurationRoot.GetValue<string>("Mode", "release");
+        string mode = configuration.GetValue<string>("Mode", "release");
         if (mode == "test")
         {
-            string? sourcePath = configurationRoot.GetValue<string>("Source");
+            string? sourcePath = configuration.GetValue<string>("Source");
             //return CompileTestFilesAsync(sourcePath, outputPath, application.ServiceProvider);
         }
 
-        services.Configure<CompilerConfiguration>(configurationRoot.GetSection("Compiler"));
-        services.Configure<DirectoryConfiguration>(configurationRoot.GetSection("Path"));
-        services.Configure<LoggingConfiguration>(configurationRoot.GetSection("Logging"));
+        services.Configure<CompilerConfiguration>(configuration.GetSection("Compiler"));
+        services.Configure<DirectoryConfiguration>(configuration.GetSection("Path"));
+        services.Configure<LoggingConfiguration>(configuration.GetSection("Logging"));
 
 
         services.AddLogging(loggingBuilder =>
         {
-            IConfigurationSection logSettings = configurationRoot.GetSection("Logging");
+            IConfigurationSection logSettings = configuration.GetSection("Logging");
             string filePath = logSettings.GetValue("FileName", "oxide.compiler.log");
 
             if (filePath.Equals("oxide.compiler.log"))
             {
-                IConfigurationSection pathSettings = configurationRoot.GetSection("Path");
+                IConfigurationSection pathSettings = configuration.GetSection("Path");
                 string startDirectory = pathSettings.GetValue("Logging", Environment.CurrentDirectory);
                 filePath = Path.Combine(startDirectory, filePath);
             }
@@ -60,19 +57,18 @@ public static void AddServices(this IServiceCollection services, IConfiguration
 #if DEBUG
             loggingBuilder.AddDebug();
 #endif
-            if (!configurationRoot.GetSection("Compiler").GetValue("EnableMessageStream", false))
+            if (!configuration.GetSection("Compiler").GetValue("EnableMessageStream", false))
             {
                 loggingBuilder.AddSimpleConsole();
             }
         });
 
 
-        services.AddSingleton(configurationRoot);
+        services.AddSingleton<IConfigurationRoot>(configuration);
         services.AddSingleton<AppConfiguration>();
         services.AddSingleton<ICompilationService, CompilationService>();
         services.AddTransient<MetadataReferenceResolver, OxideResolver>();
         services.AddSingleton<MessageBrokerService>();
-        services.AddSingleton<ISerializer, Serializer>();
         services.AddSingleton<IEntryPointService, EntryPointService>();
         services.AddHostedService<AppHostService>();
     }

src/Common/ExtensionMethods.cs

@@ -1,7 +1,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.Logging;
-using Oxide.CompilerServices.Enums;
-using Oxide.CompilerServices.Models.Compiler;
+using Oxide.CompilerServices.Types.Compilation;
 
 namespace Oxide.CompilerServices.Common;
 
@@ -49,7 +48,9 @@ public static Microsoft.CodeAnalysis.CSharp.LanguageVersion GetLanguageVersion(t
     {
         return data.Version switch
         {
+            CompilerLanguageVersion.Latest => Microsoft.CodeAnalysis.CSharp.LanguageVersion.Latest,
             CompilerLanguageVersion.Preview => Microsoft.CodeAnalysis.CSharp.LanguageVersion.Preview,
+            CompilerLanguageVersion.V14 => Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp14,
             CompilerLanguageVersion.V13 => Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp13,
             CompilerLanguageVersion.V12 => Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp12,
             CompilerLanguageVersion.V11 => Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp11,

src/Common/OxideResolver.cs

@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.Logging;
-using Oxide.CompilerServices.Models.Configuration;
+using Oxide.CompilerServices.Types.Configuration;
 
 namespace Oxide.CompilerServices.Common;
 

src/Common/Serializer.cs

@@ -1,4 +1,4 @@
-using Oxide.CompilerServices.Models.Compiler;
+using Oxide.CompilerServices.Types.Compilation;
 
 namespace Oxide.CompilerServices.Interfaces;