influxdata · bednar · Apr 27, 2023 · Apr 27, 2023 · Apr 27, 2023 · Apr 27, 2023
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -146,6 +146,12 @@ jobs:
       - image: *default-dotnet-image
     steps:
       - checkout
+      - run: |
+          sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'net7.0'<\/TargetFramework>' Client.Core.Test/Client.Core.Test.csproj
+          sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'net7.0'<\/TargetFramework>' Client.Test/Client.Test.csproj
+          sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'net7.0'<\/TargetFramework>' Client.Legacy.Test/Client.Legacy.Test.csproj
+          sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'net7.0'<\/TargetFramework>' Client.Linq.Test/Client.Linq.Test.csproj
+          sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0<\/TargetFrameworks>/c\<TargetFramework>'net7.0'<\/TargetFramework>' Examples/Examples.csproj
       - run:
           name: Check compilation warnings
           command: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## 4.12.0 [unreleased]
 
+### Bug Fixes
+- [#510](https://github.com/influxdata/influxdb-client-csharp/pull/510): Passing aggregation function to AggregateWindow for LINQ queries
+
 ### Dependencies
 Update dependencies:
 

diff --git a/Client.Linq.Test/InfluxDBQueryVisitorTest.cs b/Client.Linq.Test/InfluxDBQueryVisitorTest.cs
@@ -1039,6 +1039,22 @@ where s.Timestamp.AggregateWindow(TimeSpan.FromSeconds(20), TimeSpan.FromSeconds
             Assert.AreEqual("mean", (fnAssignment.Init as Identifier)?.Name);
         }
 
+        [Test]
+        public void AggregateWindowCustomFunction()
+        {
+            var query = from s in InfluxDBQueryable<Sensor>.Queryable("my-bucket", "my-org", _queryApi)
+                where s.Timestamp.AggregateWindow(TimeSpan.FromSeconds(20), TimeSpan.FromSeconds(40), "min")
+                where s.Value == 5
+                select s;
+
+            var visitor = BuildQueryVisitor(query);
+            var ast = visitor.BuildFluxAST();
+
+            var fnAssignment = ((OptionStatement)ast.Body[4]).Assignment as VariableAssignment;
+            Assert.AreEqual("p5", fnAssignment?.Id.Name);
+            Assert.AreEqual("min", (fnAssignment.Init as Identifier)?.Name);
+        }
+
         [Test]
         public void AggregateWindowFluxQuery()
         {

diff --git a/Client.Linq/Internal/QueryExpressionTreeVisitor.cs b/Client.Linq/Internal/QueryExpressionTreeVisitor.cs
@@ -180,7 +180,7 @@ protected override Expression VisitMethodCall(MethodCallExpression expression)
                 //
                 var fn = ((ConstantExpression)expression.Arguments[3]).Value as string;
                 Arguments.CheckNonEmptyString(fn, "fn");
-                var fnVariable = _context.Variables.AddNamedVariable(new Identifier("Identifier", "mean"));
+                var fnVariable = _context.Variables.AddNamedVariable(new Identifier("Identifier", fn));
 
                 _context.QueryAggregator.AddAggregateWindow(everyVariable, periodVariable, fnVariable);