net9-10

Author: Stepami

Directory.Build.props

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

benchmarks/HydraScript.Benchmarks/GeneratedRegexContainer.cs

@@ -6,13 +6,6 @@ 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

@@ -8,7 +8,7 @@
 
 namespace HydraScript.Benchmarks;
 
-[SimpleJob(RuntimeMoniker.Net80)]
+[SimpleJob(RuntimeMoniker.Net90)]
 [SimpleJob(RuntimeMoniker.Net10_0, baseline: true)]
 [MemoryDiagnoser]
 public class InvokeBenchmark

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

@@ -6,59 +6,27 @@ 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)
-    {
-        _declarations[symbol.Id] = declaration;
-#if NET10_0
-#else
-        _keysWithOrder[symbol.Id] = _declarations.Count;
-#endif
-    }
+    public void Save(FunctionSymbol symbol, FunctionDeclaration declaration) => _declarations[symbol.Id] = declaration;
 
     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);
-#if NET10_0
-#else
-        _keysWithOrder.Remove(symbol.Id);
-#endif
-    }
+    public void RemoveIfPresent(FunctionSymbol symbol) => _declarations.Remove(symbol.Id);
 
     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/HydraScript/GeneratedRegexContainer.cs

@@ -6,13 +6,6 @@ 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
 }

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

@@ -5,13 +5,6 @@ namespace HydraScript.UnitTests.Domain.FrontEnd;
 
 public partial class DummyContainer : IGeneratedRegexContainer
 {
-#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
 }