Merge pull request #3 from xin9le/feature/modernize

Modernize to .NET 8
xin9le · Apr 7, 2024 · ee7b494 · ee7b494
2 parents db6ade7 + 814b0cc
commit ee7b494
Show file tree

Hide file tree

Showing 29 changed files with 226 additions and 4,203 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,17 +13,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target-framework: [ 'net6.0' ]
+        tfm: [ net6, net8 ]
+        include:
+          - tfm: net6
+            dotnet-version: 6.0.x 
+          - tfm: net8
+            dotnet-version: 8.0.x 
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: ${{ matrix.dotnet-version }}
       - name: Display dotnet version
         run: dotnet --version
       - name: Build
-        run: dotnet build --configuration Release --framework ${{ matrix.target-framework }} ./src/QLimitive/QLimitive.csproj
+        run: dotnet build --configuration Release --framework ${{ matrix.tfm }} ./src/QLimitive/QLimitive.csproj
       - name: Test
-        run: dotnet test --verbosity normal --configuration Release --framework ${{ matrix.target-framework }} ./src/UnitTests/UnitTests.csproj
+        run: dotnet test --verbosity normal --configuration Release --framework ${{ matrix.tfm }} ./src/UnitTests/UnitTests.csproj
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
-*.rsuser
 *.suo
 *.user
 *.userosscache
@@ -13,23 +12,17 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
-# Mono auto generated files
-mono_crash.*
-
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
 x64/
 x86/
-[Aa][Rr][Mm]/
-[Aa][Rr][Mm]64/
 bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
-[Ll]ogs/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -43,10 +36,9 @@ Generated\ Files/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUnit
+# NUNIT
 *.VisualState.xml
 TestResult.xml
-nunit-*.xml
 
 # Build Results of an ATL Project
 [Dd]ebugPS/
@@ -60,14 +52,15 @@ BenchmarkDotNet.Artifacts/
 project.lock.json
 project.fragment.lock.json
 artifacts/
+**/Properties/launchSettings.json
 
 # StyleCop
 StyleCopReport.xml
 
 # Files built by Visual Studio
 *_i.c
 *_p.c
-*_h.h
+*_i.h
 *.ilk
 *.meta
 *.obj
@@ -84,7 +77,6 @@ StyleCopReport.xml
 *.tlh
 *.tmp
 *.tmp_proj
-*_wpftmp.csproj
 *.log
 *.vspscc
 *.vssscc
@@ -127,6 +119,9 @@ _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
+# JustCode is a .NET coding add-in
+.JustCode
+
 # TeamCity is a build add-in
 _TeamCity*
 
@@ -184,8 +179,6 @@ PublishScripts/
 
 # NuGet Packages
 *.nupkg
-# NuGet Symbol Packages
-*.snupkg
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
@@ -210,14 +203,12 @@ BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
 *.appx
-*.appxbundle
-*.appxupload
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
-!?*.[Cc]ache/
+!*.[Cc]ache/
 
 # Others
 ClientBin/
@@ -230,7 +221,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk
+# Including strong name files can present a security risk 
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -261,9 +252,6 @@ ServiceFabricBackup/
 *.bim.layout
 *.bim_*.settings
 *.rptproj.rsuser
-*- [Bb]ackup.rdl
-*- [Bb]ackup ([0-9]).rdl
-*- [Bb]ackup ([0-9][0-9]).rdl
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -299,8 +287,12 @@ paket-files/
 # FAKE - F# Make
 .fake/
 
-# CodeRush personal settings
-.cr/personal
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
@@ -325,7 +317,7 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output
+# Azure Stream Analytics local run output 
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -334,17 +326,5 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder
+# MFractors (Xamarin productivity tool) working folder 
 .mfractor/
-
-# Local History for Visual Studio
-.localhistory/
-
-# BeatPulse healthcheck temp database
-healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
-
-# Ionide (cross platform F# VS Code tools) working folder
-.ionide/
diff --git a/src/.editorconfig b/src/.editorconfig
@@ -39,9 +39,39 @@ indent_size = 4
 dotnet_code_quality_unused_parameters = all:silent
 dotnet_code_quality.ca1822.api_surface = private
 
-dotnet_diagnostic.CA1848.severity = silent
+dotnet_diagnostic.CA1304.severity = error
+dotnet_diagnostic.CA1305.severity = error
+dotnet_diagnostic.CA1307.severity = error
+dotnet_diagnostic.CA1310.severity = error
+dotnet_diagnostic.CA1848.severity = error
+dotnet_diagnostic.CA2016.severity = error
 dotnet_diagnostic.CA2254.severity = error
+dotnet_diagnostic.CS9124.severity = error
+dotnet_diagnostic.IDE0004.severity = error
+dotnet_diagnostic.IDE0005.severity = warning
+dotnet_diagnostic.IDE0009.severity = error
+dotnet_diagnostic.IDE0028.severity = error
+dotnet_diagnostic.IDE0034.severity = error
+dotnet_diagnostic.IDE0041.severity = error
+dotnet_diagnostic.IDE0044.severity = error
 dotnet_diagnostic.IDE0052.severity = warning
+dotnet_diagnostic.IDE0079.severity = error
+dotnet_diagnostic.IDE0080.severity = error
+dotnet_diagnostic.IDE0082.severity = error
+dotnet_diagnostic.IDE0090.severity = error
+dotnet_diagnostic.IDE0100.severity = error
+dotnet_diagnostic.IDE0120.severity = error
+dotnet_diagnostic.IDE0161.severity = error
+dotnet_diagnostic.IDE0161.severity = error
+dotnet_diagnostic.IDE0170.severity = silent
+dotnet_diagnostic.IDE0230.severity = error
+dotnet_diagnostic.IDE0240.severity = error
+dotnet_diagnostic.IDE0241.severity = error
+dotnet_diagnostic.IDE0250.severity = error
+dotnet_diagnostic.IDE0251.severity = error
+dotnet_diagnostic.IDE0270.severity = silent
+dotnet_diagnostic.IDE0290.severity = silent
+dotnet_diagnostic.IDE0300.severity = error
 
 dotnet_sort_system_directives_first = true
 dotnet_style_qualification_for_field = true

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,10 @@
+<Project>
+
+    <PropertyGroup>
+        <TargetFrameworks>net6;net8</TargetFrameworks>
+        <LangVersion>12.0</LangVersion>
+        <Nullable>enable</Nullable>
+        <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
+    </PropertyGroup>
+
+</Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -0,0 +1,12 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="FastMember" Version="1.5.0" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <PackageVersion Include="MSTest" Version="3.3.1" />
+    <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
+    <PackageVersion Include="ZString" Version="2.6.0" />
+  </ItemGroup>
+</Project>
diff --git a/src/NuGet.config b/src/NuGet.config
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <clear />
+        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    </packageSources>
+    <packageSourceMapping>
+        <packageSource key="nuget.org">
+            <package pattern="*" />
+        </packageSource>
+    </packageSourceMapping>
+</configuration>
diff --git a/src/QLimitive/Commands/Insert.cs b/src/QLimitive/Commands/Insert.cs
@@ -91,7 +91,7 @@ public void Build(ref Utf16ValueStringBuilder builder, ref BindParameterCollecti
             builder.Append(x.MemberName);
             builder.Append(',');
 
-            parameters ??= new BindParameterCollection();
+            parameters ??= [];
             parameters.Add(x.MemberName, null);
         }
         builder.Advance(-1);

diff --git a/src/QLimitive/Commands/OrderBy.cs b/src/QLimitive/Commands/OrderBy.cs
@@ -52,8 +52,11 @@ public OrderBy(DbDialect dialect, Expression<Func<T, object>> member, bool isAsc
     public void Build(ref Utf16ValueStringBuilder builder, ref BindParameterCollection? parameters)
     {
         var memberName = ExpressionHelper.GetMemberName(this.Member);
+        if (memberName is null)
+            throw new InvalidOperationException();
+
         var table = TableMappingInfo.Get<T>();
-        var columnName = table.ColumnByMemberNameInternal[memberName].ColumnName;
+        var columnName = table.ColumnByMemberName[memberName].ColumnName;
         var bracket = this.Dialect.KeywordBracket;
 
         if (builder.Length > 0)

diff --git a/src/QLimitive/Commands/ThenBy.cs b/src/QLimitive/Commands/ThenBy.cs
@@ -52,8 +52,11 @@ public ThenBy(DbDialect dialect, Expression<Func<T, object>> member, bool isAsce
     public void Build(ref Utf16ValueStringBuilder builder, ref BindParameterCollection? parameters)
     {
         var memberName = ExpressionHelper.GetMemberName(this.Member);
+        if (memberName is null)
+            throw new InvalidOperationException();
+
         var table = TableMappingInfo.Get<T>();
-        var columnName = table.ColumnByMemberNameInternal[memberName].ColumnName;
+        var columnName = table.ColumnByMemberName[memberName].ColumnName;
         var bracket = this.Dialect.KeywordBracket;
 
         if (builder.Length > 0)

diff --git a/src/QLimitive/Commands/Update.cs b/src/QLimitive/Commands/Update.cs
@@ -91,7 +91,7 @@ public void Build(ref Utf16ValueStringBuilder builder, ref BindParameterCollecti
                     builder.Append(x.MemberName);
                     builder.Append(',');
 
-                    parameters ??= new BindParameterCollection();
+                    parameters ??= [];
                     parameters.Add(x.MemberName, null);
                 }
             }

diff --git a/src/QLimitive/Commands/Where.cs b/src/QLimitive/Commands/Where.cs
@@ -178,7 +178,7 @@ protected override Expression VisitMethodCall(MethodCallExpression expression)
                 {
                     this.BuildInClause(expression, true);
                 }
-                else if (t?.Namespace?.StartsWith("System.Collections") ?? false)
+                else if (t?.Namespace?.AsSpan().StartsWith("System.Collections") ?? false)
                 {
                     this.BuildInClause(expression, false);
                 }
@@ -250,7 +250,7 @@ private void BuildBinary(Operator @operator, string memberName, object? value)
 
             //--- Build sql
             var bracket = this._dialect.KeywordBracket;
-            var columnName = this._table.ColumnByMemberNameInternal[memberName].ColumnName;
+            var columnName = this._table.ColumnByMemberName[memberName].ColumnName;
             builder.Append(bracket.Begin);
             builder.Append(columnName);
             builder.Append(bracket.End);
@@ -300,7 +300,7 @@ private void BuildBinary(Operator @operator, string memberName, object? value)
             }
 
             //--- Cache parameter
-            bindParameters ??= new BindParameterCollection();
+            bindParameters ??= [];
             var name = $"p{bindParameters.Count + 1}";
             bindParameters.Add(name, value);
             builder.Append(this._dialect.BindParameterPrefix);

diff --git a/src/QLimitive/DbDialect.cs b/src/QLimitive/DbDialect.cs
@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using QLimitive.Internals;
+using System.Collections.Frozen;
+using System.Collections.Generic;
 
 namespace QLimitive;
 
@@ -61,14 +61,13 @@ private DbDialect(DbKind database, char bindParameterPrefix, in BracketPair keyw
     /// </summary>
     static DbDialect()
     {
-        All = new[]
-        {
+        All = [
             SqlServer,
             MySql,
             Sqlite,
             PostgreSql,
             Oracle,
-        };
+        ];
         ByDatabase = All.ToFrozenDictionary(static x => x.Database);
     }
     #endregion
@@ -84,7 +83,7 @@ static DbDialect()
     /// <summary>
     /// Gets all database dialects by <see cref="DbKind"/>.
     /// </summary>
-    public static IReadOnlyDictionary<DbKind, DbDialect> ByDatabase { get; }
+    public static FrozenDictionary<DbKind, DbDialect> ByDatabase { get; }
 
 
     /// <summary>