Merge branch 'master' into stef-786-parsed-double-quotes

zzzprojects · Jun 25, 2024 · 6fbf137 · 6fbf137
2 parents ee87a26 + 8cbe295
commit 6fbf137
Show file tree

Hide file tree

Showing 12 changed files with 204 additions and 244 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,10 @@
 name: Build with Tests
 
-on: [push]
+on: 
+ push:
+ workflow_dispatch:
+ pull_request:
+ types: [opened, edited]
 
 jobs:
  build_and_test_Windows:
@@ -13,6 +17,8 @@ jobs:
 
  steps: 
  - uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
 
  - name: Build
  run: |
@@ -38,12 +44,6 @@ jobs:
  distribution: 'temurin' # See 'Supported distributions' for available options
  java-version: '17'
 
- - name: Set JAVA_HOME to JDK 17
- shell: pwsh
- run: |
- $jdkPath = $env:JAVA_HOME_17_X64
- echo "JAVA_HOME=$jdkPath" >> $GITHUB_ENV
-
  - name: Install dotnet tools
  run: |
  dotnet tool install --global dotnet-sonarscanner

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v1.4.2 (25 June 2024)
+- [#824](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/824) - Fixed: Incorrect Handling of Qualifiers in ConstantExpressionHelper contributed by [RenanCarlosPereira](https://github.com/RenanCarlosPereira)
+- [#821](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/821) - Incorrect Handling of Qualifiers in ConstantExpressionHelper [bug]
+
 # v1.4.1 (21 June 2024)
 - [#819](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/819) - Update EntityFramework to version 6.5 to fix CVE [feature] contributed by [StefH](https://github.com/StefH)
 - [#820](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/820) - Use Testcontainers.MsSql for unit tests [test] contributed by [StefH](https://github.com/StefH)

diff --git a/Generate-ReleaseNotes.bat b/Generate-ReleaseNotes.bat
@@ -1,5 +1,5 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=v1.4.1
+SET version=v1.4.2
 
-GitHubReleaseNotes --output CHANGELOG.md --exclude-labels invalid question documentation wontfix --language en --version %version% --token %GH_TOKEN%
+GitHubReleaseNotes --output CHANGELOG.md --exclude-labels invalid question documentation wontfix environment --language en --version %version% --token %GH_TOKEN%
diff --git a/System.Linq.Dynamic.Core.sln b/System.Linq.Dynamic.Core.sln
@@ -17,7 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
  ProjectSection(SolutionItems) = preProject
  .deployment = .deployment
  .editorconfig = .editorconfig
- azure-pipelines.yml = azure-pipelines.yml
  CHANGELOG.md = CHANGELOG.md
  Directory.Build.props = Directory.Build.props
  Generate-ReleaseNotes.bat = Generate-ReleaseNotes.bat
@@ -132,9 +131,6 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp_net6.0_EF6_Sqlite", "src-console\ConsoleAppEF6_Sqlite\ConsoleApp_net6.0_EF6_Sqlite.csproj", "{CA03FD55-9DAB-4827-9A35-A96D3804B311}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src-examples", "src-examples", "{BCA2A024-9032-4E56-A6C4-17A15D921728}"
- ProjectSection(SolutionItems) = preProject
- src-examples\README.md = src-examples\README.md
- EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeFirst.DataAccess", "src-examples\CodeFirst.DataAccess\CodeFirst.DataAccess.csproj", "{E36D1A08-F3ED-48C7-9DBF-8F625974A6C4}"
 EndProject

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/src/System.Linq.Dynamic.Core/Parser/NumberParser.cs b/src/System.Linq.Dynamic.Core/Parser/NumberParser.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Linq.Dynamic.Core.Exceptions;
 using System.Linq.Dynamic.Core.Validation;
 using System.Linq.Expressions;
@@ -161,19 +161,34 @@ public Expression ParseIntegerLiteral(int tokenPosition, string text)
  /// </summary>
  public Expression ParseRealLiteral(string text, char qualifier, bool stripQualifier)
  {
+ if (stripQualifier)
+ {
+ var pos = text.Length - 1;
+ while (pos >= 0 && Qualifiers.Contains(text[pos]))
+ {
+ pos--;
+ }
+
+ if (pos < text.Length - 1)
+ {
+ qualifier = text[pos + 1];
+ text = text.Substring(0, pos + 1);
+ }
+ }
+
  switch (qualifier)
  {
  case 'f':
  case 'F':
- return _constantExpressionHelper.CreateLiteral(ParseNumber(stripQualifier ? text.Substring(0, text.Length - 1) : text, typeof(float))!, text);
+ return _constantExpressionHelper.CreateLiteral(ParseNumber(text, typeof(float))!, text);
 
  case 'm':
  case 'M':
- return _constantExpressionHelper.CreateLiteral(ParseNumber(stripQualifier ? text.Substring(0, text.Length - 1) : text, typeof(decimal))!, text);
+ return _constantExpressionHelper.CreateLiteral(ParseNumber(text, typeof(decimal))!, text);
 
  case 'd':
  case 'D':
- return _constantExpressionHelper.CreateLiteral(ParseNumber(stripQualifier ? text.Substring(0, text.Length - 1) : text, typeof(double))!, text);
+ return _constantExpressionHelper.CreateLiteral(ParseNumber(text, typeof(double))!, text);
 
  default:
  return _constantExpressionHelper.CreateLiteral(ParseNumber(text, typeof(double))!, text);
@@ -298,4 +313,4 @@ private Expression ParseAsBinary(int tokenPosition, string text, bool isNegative
  throw new ParseException(string.Format(_culture, Res.InvalidBinaryIntegerLiteral, text), tokenPosition);
  }
  }
-}
+}
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -1,6 +1,7 @@
 <Project>
  <PropertyGroup>
  <LangVersion>12</LangVersion>
+ <Nullable>enable</Nullable>
 
  <!-- https://github.com/coverlet-coverage/coverlet/issues/1391 -->
  <CollectCoverage>true</CollectCoverage>

diff --git a/test/System.Linq.Dynamic.Core.Tests.Net7/System.Linq.Dynamic.Core.Tests.Net7.csproj b/test/System.Linq.Dynamic.Core.Tests.Net7/System.Linq.Dynamic.Core.Tests.Net7.csproj
@@ -7,7 +7,6 @@
  <SignAssembly>True</SignAssembly>
  <AssemblyOriginatorKeyFile>../../src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.snk</AssemblyOriginatorKeyFile>
  <IsPackable>false</IsPackable>
- <Nullable>enable</Nullable>
  <DefineConstants>$(DefineConstants);NETCOREAPP;EFCORE;EFCORE_3X;NETCOREAPP3_1;AspNetCoreIdentity</DefineConstants>
  </PropertyGroup>
 

diff --git a/...m.Linq.Dynamic.Core.Tests.NetCoreApp31/System.Linq.Dynamic.Core.Tests.NetCoreApp31.csproj b/...m.Linq.Dynamic.Core.Tests.NetCoreApp31/System.Linq.Dynamic.Core.Tests.NetCoreApp31.csproj
@@ -5,7 +5,6 @@
  <AssemblyName>System.Linq.Dynamic.Core.Tests</AssemblyName>
  <DebugType>full</DebugType>
  <SignAssembly>True</SignAssembly>
- <Nullable>enable</Nullable>
  <AssemblyOriginatorKeyFile>../../src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.snk</AssemblyOriginatorKeyFile>
  <ProjectGuid>{7AFC2836-0F6E-4B0D-8BB3-13317A3B6616}</ProjectGuid>
  <DefineConstants>$(DefineConstants);EFCORE;EFCORE_3X;AspNetCoreIdentity</DefineConstants>