diff --git a/src/ApplicationCore/ApplicationCore.csproj b/src/ApplicationCore/ApplicationCore.csproj
index 3e939d2..260e749 100644
--- a/src/ApplicationCore/ApplicationCore.csproj
+++ b/src/ApplicationCore/ApplicationCore.csproj
@@ -6,9 +6,9 @@
-
-
-
+
+
+
diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj
index 9222276..7d747ce 100644
--- a/src/Infrastructure/Infrastructure.csproj
+++ b/src/Infrastructure/Infrastructure.csproj
@@ -6,11 +6,11 @@
-
+
-
+
diff --git a/src/PublicApi/PublicApi.csproj b/src/PublicApi/PublicApi.csproj
index c8e0952..38bd2c5 100644
--- a/src/PublicApi/PublicApi.csproj
+++ b/src/PublicApi/PublicApi.csproj
@@ -9,10 +9,10 @@
-
-
-
-
+
+
+
+
@@ -30,7 +30,7 @@
-
+
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 88a35e3..f69f30e 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -15,15 +15,15 @@
-
-
-
-
+
+
+
+
-
+
@@ -33,7 +33,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/tests/UnitTests/ApplicationCore/Specifications/CatalogFilterPaginatedSpecification.cs b/tests/UnitTests/ApplicationCore/Specifications/CatalogFilterPaginatedSpecification.cs
index 208593e..c3d3828 100644
--- a/tests/UnitTests/ApplicationCore/Specifications/CatalogFilterPaginatedSpecification.cs
+++ b/tests/UnitTests/ApplicationCore/Specifications/CatalogFilterPaginatedSpecification.cs
@@ -14,7 +14,7 @@ public class CatalogFilterPaginatedSpecification
var result = GetTestCollection()
.AsQueryable()
- .Where(spec.WhereExpressions.FirstOrDefault());
+ .Where(spec.WhereExpressions.FirstOrDefault().Filter);
Assert.NotNull(result);
Assert.Equal(4, result.ToList().Count);
@@ -27,7 +27,7 @@ public class CatalogFilterPaginatedSpecification
var result = GetTestCollection()
.AsQueryable()
- .Where(spec.WhereExpressions.FirstOrDefault());
+ .Where(spec.WhereExpressions.FirstOrDefault().Filter);
Assert.NotNull(result);
Assert.Equal(2, result.ToList().Count);
diff --git a/tests/UnitTests/ApplicationCore/Specifications/CatalogFilterSpecification.cs b/tests/UnitTests/ApplicationCore/Specifications/CatalogFilterSpecification.cs
index f5d01a6..56b1e0d 100644
--- a/tests/UnitTests/ApplicationCore/Specifications/CatalogFilterSpecification.cs
+++ b/tests/UnitTests/ApplicationCore/Specifications/CatalogFilterSpecification.cs
@@ -21,7 +21,7 @@ public class CatalogFilterSpecification
var result = GetTestItemCollection()
.AsQueryable()
- .Where(spec.WhereExpressions.FirstOrDefault());
+ .Where(spec.WhereExpressions.FirstOrDefault().Filter);
Assert.Equal(expectedCount, result.Count());
}
diff --git a/tests/UnitTests/ApplicationCore/Specifications/CatalogItemsSpecification.cs b/tests/UnitTests/ApplicationCore/Specifications/CatalogItemsSpecification.cs
index 84156ce..0085ca7 100644
--- a/tests/UnitTests/ApplicationCore/Specifications/CatalogItemsSpecification.cs
+++ b/tests/UnitTests/ApplicationCore/Specifications/CatalogItemsSpecification.cs
@@ -16,7 +16,7 @@ public class CatalogItemsSpecification
var result = GetTestCollection()
.AsQueryable()
- .Where(spec.WhereExpressions.FirstOrDefault());
+ .Where(spec.WhereExpressions.FirstOrDefault().Filter);
Assert.NotNull(result);
Assert.Single(result.ToList());
@@ -30,7 +30,7 @@ public class CatalogItemsSpecification
var result = GetTestCollection()
.AsQueryable()
- .Where(spec.WhereExpressions.FirstOrDefault());
+ .Where(spec.WhereExpressions.FirstOrDefault().Filter);
Assert.NotNull(result);
Assert.Equal(2, result.ToList().Count);
diff --git a/tests/UnitTests/ApplicationCore/Specifications/CustomerOrdersWithItemsSpecification.cs b/tests/UnitTests/ApplicationCore/Specifications/CustomerOrdersWithItemsSpecification.cs
index f95d3b5..fe3281e 100644
--- a/tests/UnitTests/ApplicationCore/Specifications/CustomerOrdersWithItemsSpecification.cs
+++ b/tests/UnitTests/ApplicationCore/Specifications/CustomerOrdersWithItemsSpecification.cs
@@ -17,7 +17,7 @@ public class CustomerOrdersWithItemsSpecification
var result = GetTestCollection()
.AsQueryable()
- .FirstOrDefault(spec.WhereExpressions.FirstOrDefault());
+ .FirstOrDefault(spec.WhereExpressions.FirstOrDefault().Filter);
Assert.NotNull(result);
Assert.NotNull(result.OrderItems);
@@ -32,7 +32,7 @@ public class CustomerOrdersWithItemsSpecification
var result = GetTestCollection()
.AsQueryable()
- .Where(spec.WhereExpressions.FirstOrDefault())
+ .Where(spec.WhereExpressions.FirstOrDefault().Filter)
.ToList();
Assert.NotNull(result);