net8-10

Author: Stepami

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Directory.Packages.props

@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="BenchmarkDotNet" Version="0.15.4" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

benchmarks/HydraScript.Benchmarks/GeneratedRegexContainer.cs

@@ -6,6 +6,13 @@ namespace HydraScript.Benchmarks;
 
 internal sealed partial class GeneratedRegexContainer : IGeneratedRegexContainer
 {
+#if NET10_0
     [GeneratedRegex(PatternContainer.Value, RegexOptions.Compiled)]
     public static partial Regex Regex { get; }
+#else
+    [GeneratedRegex(PatternContainer.Value, RegexOptions.Compiled)]
+    public static partial Regex GetRegex();
+
+    public static Regex Regex { get; } = GetRegex();
+#endif
 }

benchmarks/HydraScript.Benchmarks/InvokeBenchmark.cs

@@ -1,20 +1,15 @@
-using System.Diagnostics.CodeAnalysis;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
-using BenchmarkDotNet.Running;
-using HydraScript.Benchmarks;
 using HydraScript.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 
-[assembly: ExcludeFromCodeCoverage]
+namespace HydraScript.Benchmarks;
 
-BenchmarkRunner.Run<InvokeBenchmark>();
-
-[SimpleJob(RuntimeMoniker.Net90)]
-[SimpleJob(RuntimeMoniker.NativeAot90)]
+[SimpleJob(RuntimeMoniker.Net80)]
+[SimpleJob(RuntimeMoniker.Net10_0, baseline: true)]
 [MemoryDiagnoser]
 public class InvokeBenchmark
 {

benchmarks/HydraScript.Benchmarks/Program.cs

@@ -0,0 +1,7 @@
+using System.Diagnostics.CodeAnalysis;
+using BenchmarkDotNet.Running;
+using HydraScript.Benchmarks;
+
+[assembly: ExcludeFromCodeCoverage]
+
+BenchmarkRunner.Run<InvokeBenchmark>();

src/Application/HydraScript.Application.StaticAnalysis/Impl/FunctionWithUndefinedReturnStorage.cs

@@ -6,28 +6,59 @@ namespace HydraScript.Application.StaticAnalysis.Impl;
 
 internal class FunctionWithUndefinedReturnStorage : IFunctionWithUndefinedReturnStorage
 {
+#if NET10_0
     private readonly OrderedDictionary<FunctionSymbolId, FunctionDeclaration> _declarations = [];
+#else
+    private readonly Dictionary<FunctionSymbolId, FunctionDeclaration> _declarations = [];
+    private readonly Dictionary<FunctionSymbolId, int> _keysWithOrder = [];
+#endif
 
-    public void Save(FunctionSymbol symbol, FunctionDeclaration declaration) =>
+    public void Save(FunctionSymbol symbol, FunctionDeclaration declaration)
+    {
         _declarations[symbol.Id] = declaration;
+#if NET10_0
+#else
+        _keysWithOrder[symbol.Id] = _declarations.Count;
+#endif
+    }
 
     public FunctionDeclaration Get(FunctionSymbol symbol)
     {
         if (!_declarations.Remove(symbol.Id, out var declaration))
             throw new InvalidOperationException(message: $"Cannot get {symbol} that has not been saved");
-
+#if NET10_0
+#else
+        _keysWithOrder.Remove(symbol.Id);
+#endif
         return declaration;
     }
 
-    public void RemoveIfPresent(FunctionSymbol symbol) => _declarations.Remove(symbol.Id);
+    public void RemoveIfPresent(FunctionSymbol symbol)
+    {
+        _declarations.Remove(symbol.Id);
+#if NET10_0
+#else
+        _keysWithOrder.Remove(symbol.Id);
+#endif
+    }
 
     public IEnumerable<FunctionDeclaration> Flush()
     {
+#if NET10_0
         IReadOnlyList<FunctionSymbolId> keys = _declarations.Keys;
         while (keys.Count > 0)
         {
             yield return _declarations[keys[0]];
             _declarations.Remove(keys[0]);
         }
+#else
+        return _declarations.OrderBy(kvp => _keysWithOrder[kvp.Key])
+            .Select(x =>
+            {
+                _declarations.Remove(x.Key);
+                _keysWithOrder.Remove(x.Key);
+                return x.Value;
+            });
+#endif
     }
 }

src/Domain/HydraScript.Domain.Constants/HydraScript.Domain.Constants.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>netstandard2.0</TargetFrameworks>
     </PropertyGroup>
 
 </Project>

src/HydraScript/GeneratedRegexContainer.cs

@@ -6,6 +6,13 @@ namespace HydraScript;
 
 public sealed partial class GeneratedRegexContainer : IGeneratedRegexContainer
 {
+#if NET10_0
     [GeneratedRegex(PatternContainer.Value, RegexOptions.Compiled)]
     public static partial Regex Regex { get; }
+#else
+    [GeneratedRegex(PatternContainer.Value, RegexOptions.Compiled)]
+    public static partial Regex GetRegex();
+
+    public static Regex Regex { get; } = GetRegex();
+#endif
 }

src/Infrastructure/HydraScript.Infrastructure.LexerRegexGenerator/HydraScript.Infrastructure.LexerRegexGenerator.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
         <IsRoslynComponent>true</IsRoslynComponent>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>netstandard2.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

tests/HydraScript.UnitTests/Domain/FrontEnd/DummyContainer.cs

@@ -5,6 +5,13 @@ namespace HydraScript.UnitTests.Domain.FrontEnd;
 
 public partial class DummyContainer : IGeneratedRegexContainer
 {
-    [GeneratedRegex(TokenInput.Pattern)]
+#if NET10_0
+    [GeneratedRegex(TokenInput.Pattern, RegexOptions.Compiled)]
     public static partial Regex Regex { get; }
+#else
+    [GeneratedRegex(TokenInput.Pattern, RegexOptions.Compiled)]
+    public static partial Regex GetRegex();
+
+    public static Regex Regex { get; } = GetRegex();
+#endif
 }