Merge pull request #201 from AArnott/warningClean

Fix compiler warnings
dotnet · Mar 14, 2020 · e258751 · e258751
2 parents 0df8367 + 885e190
commit e258751
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/azure-pipelines.client.yml b/azure-pipelines.client.yml
@@ -30,6 +30,8 @@ pool:
 variables: 
   BuildConfiguration: Release
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  TreatWarningsAsErrors: true
+  NUGET_PACKAGES: $(Agent.TempDirectory)/.nuget/packages
 
 steps:
 - task: UseDotNet@2

diff --git a/azure-pipelines.server.yml b/azure-pipelines.server.yml
@@ -30,6 +30,8 @@ pool:
 variables: 
   BuildConfiguration: Release
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  TreatWarningsAsErrors: true
+  NUGET_PACKAGES: $(Agent.TempDirectory)/.nuget/packages
 
 steps:
 - task: UseDotNet@2

diff --git a/src/InstallUtility/OptionalClaims.cs b/src/InstallUtility/OptionalClaims.cs
@@ -4,6 +4,8 @@
 using System.Text;
 using System.Threading.Tasks;
 
+#pragma warning disable IDE1006 // Naming Styles
+
 namespace InstallUtility
 {
     public class OptionalClaims
@@ -17,5 +19,4 @@ public class ClaimInformation
         public string source { get; set; }
         public bool essential { get; set; }
     }
-
 }
diff --git a/src/SignService/Services/AdminService.cs b/src/SignService/Services/AdminService.cs
@@ -326,6 +326,7 @@ static string GetRandomPassword()
             return new string(builder);
         }
 
+#pragma warning disable IDE1006 // Naming Styles
         class OptionalClaims
         {
             public ClaimInformation[] accessToken { get; set; }
@@ -337,6 +338,6 @@ class ClaimInformation
             public string source { get; set; }
             public bool essential { get; set; }
         }
-
+#pragma warning restore IDE1006 // Naming Styles
     }
 }
diff --git a/src/SignService/Utils/CoreContractResolver.cs b/src/SignService/Utils/CoreContractResolver.cs
@@ -1,28 +1,28 @@
-using System;
+using System;
 using Newtonsoft.Json.Serialization;
 
 namespace SignService.Utils
 {
     public sealed class CoreContractResolver : DefaultContractResolver
     {
-        readonly IServiceProvider _provider;
+        readonly IServiceProvider provider;
 
         public CoreContractResolver(IServiceProvider provider)
         {
-            _provider = provider;
+            this.provider = provider;
         }
 
         protected override JsonObjectContract CreateObjectContract(Type objectType)
         {
             var contract = base.CreateObjectContract(objectType);
-            var svc = _provider.GetService(objectType);
+            var svc = provider.GetService(objectType);
             if (svc != null)
             {
-                contract.DefaultCreator = () => _provider.GetService(objectType);
+                contract.DefaultCreator = () => provider.GetService(objectType);
             }
 
             return contract;
         }
 
     }
-}
+}