Fix some warnings

dotnet · Jun 7, 2021 · 7372826 · 7372826
1 parent be9dadc
commit 7372826
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/.editorconfig b/src/.editorconfig
@@ -37,3 +37,6 @@ dotnet_diagnostic.IDE0083.severity = silent
 
 # IDE0010: Add missing cases
 dotnet_diagnostic.IDE0010.severity = silent
+
+# CA1031: Do not catch general exception types
+dotnet_diagnostic.CA1031.severity = silent
diff --git a/src/DataGridExtensions/DataGridExtensions.csproj b/src/DataGridExtensions/DataGridExtensions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp3.0;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp3.1;net5.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -36,7 +36,7 @@ The current version supports the following features:
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Throttle.Fody" Version="1.7.0" PrivateAssets="All" />
-    <PackageReference Include="TomsToolbox.Wpf" Version="2.5.3" />
+    <PackageReference Include="TomsToolbox.Wpf" Version="2.5.5" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Icon.png" Link="Icon.png" Pack="true" PackagePath="\" />

diff --git a/src/DataGridExtensions/DataGridFilterColumnControl.cs b/src/DataGridExtensions/DataGridFilterColumnControl.cs
@@ -362,9 +362,7 @@ internal bool Matches(DataGrid dataGrid, object? item)
                         return property.GetValue(item);
                     }
                 }
-#pragma warning disable CA1031 // Do not catch general exception types
                 catch
-#pragma warning restore CA1031 // Do not catch general exception types
                 {
                     // not a plain property, fall-back to binding...
                 }

diff --git a/src/DataGridExtensionsSample/DataGridExtensionsSample.csproj b/src/DataGridExtensionsSample/DataGridExtensionsSample.csproj
@@ -24,11 +24,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="PropertyChanged.Fody" Version="3.3.3" PrivateAssets="All" />
-    <PackageReference Include="TomsToolbox.Composition.Ninject" Version="2.5.3" />
-    <PackageReference Include="TomsToolbox.Wpf.Composition" Version="2.5.3" />
-    <PackageReference Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.5.3" />
-    <PackageReference Include="TomsToolbox.Wpf.Styles" Version="2.5.3" />
+    <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" PrivateAssets="All" />
+    <PackageReference Include="TomsToolbox.Composition.Ninject" Version="2.5.5" />
+    <PackageReference Include="TomsToolbox.Wpf.Composition" Version="2.5.5" />
+    <PackageReference Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.5.5" />
+    <PackageReference Include="TomsToolbox.Wpf.Styles" Version="2.5.5" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />