Resolve warnings (#207)

+semver:patch
hazzik · Oct 17, 2022 · c53911d · c53911d
1 parent 0d6f563
commit c53911d
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 9 deletions.
diff --git a/src/DelegateDecompiler.EntityFramework.Tests/EfItems/EfTestDbContext.cs b/src/DelegateDecompiler.EntityFramework.Tests/EfItems/EfTestDbContext.cs
@@ -48,7 +48,7 @@ public EfTestDbContext() : base(GetConnectionString()) { }
 #if NETCOREAPP
         static string GetConnectionString()
         {
-            var location = new Uri(typeof(EfTestDbContext).Assembly.EscapedCodeBase).LocalPath;
+            var location = new Uri(typeof(EfTestDbContext).Assembly.Location).LocalPath;
             var configuration = ConfigurationManager.OpenExeConfiguration(location);
             var connectionString = configuration.ConnectionStrings.ConnectionStrings["DelegateDecompilerEfTestDb"]
                 .ConnectionString;

diff --git a/src/DelegateDecompiler.EntityFramework.Tests/EntityTypeConfigurationExtensionsTests.cs b/src/DelegateDecompiler.EntityFramework.Tests/EntityTypeConfigurationExtensionsTests.cs
@@ -58,8 +58,9 @@ public void ComputedShouldThrowExceptionIfUnsupportedMemberInfo()
 
         class TestClass
         {
-            public int Field;
-            public int Property { get { return Field; } }
+            public int Field = 1;
+
+            public int Property => Field;
 
             public int Method()
             {

diff --git a/src/DelegateDecompiler.EntityFramework.Tests/Helpers/MarkupFileHelpers.cs b/src/DelegateDecompiler.EntityFramework.Tests/Helpers/MarkupFileHelpers.cs
@@ -51,7 +51,7 @@ public static string GetMarkupFileDirectory(string alternateTestDir = MarkupDire
         {
             string path;
             if (GetMarkupFileDirectory(Environment.CurrentDirectory, alternateTestDir, out path) ||
-                GetMarkupFileDirectory(Path.GetDirectoryName(new Uri(typeof(MarkupFileHelpers).Assembly.CodeBase).LocalPath), alternateTestDir, out path))
+                GetMarkupFileDirectory(Path.GetDirectoryName(new Uri(typeof(MarkupFileHelpers).Assembly.Location).LocalPath), alternateTestDir, out path))
             {
                 return path;
             }

diff --git a/src/DelegateDecompiler.EntityFrameworkCore.Tests/EntityTypeConfigurationExtensionsTests.cs b/src/DelegateDecompiler.EntityFrameworkCore.Tests/EntityTypeConfigurationExtensionsTests.cs
@@ -59,7 +59,7 @@ public void ComputedShouldThrowExceptionIfUnsupportedMemberInfo()
 
         class TestClass
         {
-            public int Field;
+            public int Field = 1;
             public int Property { get { return Field; } }
 
             public int Method()

diff --git a/src/DelegateDecompiler.EntityFrameworkCore5/AsyncDecompiledQueryProvider.cs b/src/DelegateDecompiler.EntityFrameworkCore5/AsyncDecompiledQueryProvider.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading;
@@ -30,6 +31,7 @@ public virtual TResult ExecuteAsync<TResult>(Expression expression, Cancellation
             return AsyncQueryProvider.ExecuteAsync<TResult>(decompiled, cancellationToken);
         }
 
+        [SuppressMessage("EntityFramework", "EF1001")]
         public override IQueryable<TElement> CreateQuery<TElement>(Expression expression)
         {
             var decompiled = expression.Decompile();

diff --git a/src/DelegateDecompiler.Tests/AbstractMethodTests.cs b/src/DelegateDecompiler.Tests/AbstractMethodTests.cs
@@ -95,7 +95,7 @@ public class C<T> : A
 
         public class D : C<int>
         {
-            public string Me = "C";
+            public new string Me = "C";
 
             public override string M1() => "D";
 
@@ -112,7 +112,7 @@ public class D : C<int>
 
         public abstract class E : C<int>
         {
-            public string Me = "C";
+            public new string Me = "C";
 
             public override string M1() => "E";
 

diff --git a/src/DelegateDecompiler.Tests/BooleanTests.cs b/src/DelegateDecompiler.Tests/BooleanTests.cs
@@ -1,4 +1,5 @@
-using System;
+#pragma warning disable CS0162 // Code is unreachable
+using System;
 using System.Linq.Expressions;
 using NUnit.Framework;
 

diff --git a/src/DelegateDecompiler.Tests/NullTests.cs b/src/DelegateDecompiler.Tests/NullTests.cs
@@ -1,4 +1,6 @@
-using System;
+// ReSharper disable EqualExpressionComparison
+#pragma warning disable CS1718 // Comparison made to same variable
+using System;
 using System.Linq.Expressions;
 using NUnit.Framework;
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -22,6 +22,8 @@
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+
     <ContinuousIntegrationBuild Condition="'$(CI)' != ''">$(CI)</ContinuousIntegrationBuild>
   </PropertyGroup>