Apply security patch for System.Linq.Dynamic.Core

Author: jehhynes

Build/CommonAssemblyInfo.cs

@@ -12,7 +12,7 @@
 //      Minor Version
 //      Build Number
 //      Revision
-[assembly: AssemblyVersion("3.8.2")]
-[assembly: AssemblyFileVersion("3.8.2")]
+[assembly: AssemblyVersion("3.8.3")]
+[assembly: AssemblyFileVersion("3.8.3")]
 // Uncomment the informational version to create a pre-release package
 //[assembly: AssemblyInformationalVersion("3.8.1-rc2")]

Build/Griddly.Core.nuspec

@@ -19,21 +19,21 @@
 				<dependency id="Dapper" version="2.0.90" />
 				<dependency id="EPPlus" version="4.5.3" />
 				<dependency id="Newtonsoft.Json" version="11.0.2" />
-				<dependency id="System.Linq.Dynamic.Core" version="1.3.8" />
+				<dependency id="System.Linq.Dynamic.Core" version="1.6.0.1" />
 			</group>
 			<group targetFramework="netcoreapp3.1">
 				<dependency id="CsvHelper" version="27.1.1" />
 				<dependency id="Dapper" version="2.0.90" />
 				<dependency id="EPPlus" version="4.5.3" />
 				<dependency id="Newtonsoft.Json" version="11.0.2" />
-				<dependency id="System.Linq.Dynamic.Core" version="1.3.8" />
+				<dependency id="System.Linq.Dynamic.Core" version="1.6.0.1" />
 			</group>
 			<group targetFramework="net5.0">
 				<dependency id="CsvHelper" version="27.1.1" />
 				<dependency id="Dapper" version="2.0.90" />
 				<dependency id="EPPlus" version="4.5.3" />
 				<dependency id="Newtonsoft.Json" version="11.0.2" />
-				<dependency id="System.Linq.Dynamic.Core" version="1.3.8" />
+				<dependency id="System.Linq.Dynamic.Core" version="1.6.0.1" />
 			</group>
 		</dependencies>
 	</metadata>

Griddly.Mvc/Griddly.Mvc.csproj

@@ -25,7 +25,7 @@
 	  <PackageReference Include="Dapper" Version="2.0.90" />
 	  <PackageReference Include="EPPlus" Version="4.5.3" />
 	  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-	  <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.8" />
+	  <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -35,13 +35,13 @@
   </ItemGroup>
 
 	<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
-		<Compile Remove="NetCore\**"/>
-		<None Include="NetCore\**"/>
+		<Compile Remove="NetCore\**" />
+		<None Include="NetCore\**" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
-		<Compile Remove="NetFramework\**"/>
-		<None Include="NetFramework\**"/>
+		<Compile Remove="NetFramework\**" />
+		<None Include="NetFramework\**" />
 	</ItemGroup>
 
 </Project>

Griddly.Mvc/Results/QueryableResult.cs

@@ -129,8 +129,7 @@ public override IEnumerable<P> GetAllForProperty<P>(string propertyName, SortFie
 
         if (restriction != null)
         {
-            query = System.Linq.Dynamic.Core.DynamicQueryableExtensions.Where(query, $"@0.Contains({propertyName})", restriction);
-//            query = query.Where($"@0.Contains({propertyName})", restriction);
+            query = query.Where($"@0.Contains({propertyName})", restriction);
         }
 
         query = ApplySortFields(query, sortFields, _finalSortField);

Griddly.NetCore.Razor/Griddly.NetCore.Razor.csproj

@@ -5,6 +5,10 @@
     <OutputType>Library</OutputType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Griddly.Mvc\Griddly.Mvc.csproj" />
   </ItemGroup>

Griddly.NetCore/Griddly.NetCore.csproj

@@ -9,6 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Faker.Net" Version="1.3.77" />
     <PackageReference Include="SyntaxHighlighter" Version="3.0.83" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.1" />
   </ItemGroup>
 
   <ItemGroup>

Griddly.Tests/Griddly.Tests.csproj

@@ -12,6 +12,7 @@
     <PackageReference Include="MSTest" Version="3.6.1" />
     <PackageReference Include="SQLite" Version="3.13.0" />
     <PackageReference Include="System.Data.SQLite" Version="1.0.119" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.1" />
   </ItemGroup>
 
   <ItemGroup>