Updating NuGet packages to comply with security policy (#91)

src/Microsoft.Azure.Batch.SoftwareEntitlement.Common/CertificateStore.cs

@@ -82,7 +82,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Common
         /// <param name="storeName">Name of the store to search within.</param>
         /// <param name="storeLocation">Location within the store to check.</param>
         /// <returns>Sequence of certificates (possibly empty).</returns>
-        private IList<X509Certificate2> FindAll(StoreName storeName, StoreLocation storeLocation)
+        private static IList<X509Certificate2> FindAll(StoreName storeName, StoreLocation storeLocation)
         {
             using (var store = new X509Store(storeName, storeLocation))
             {

src/Microsoft.Azure.Batch.SoftwareEntitlement.Common/Errorable.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -72,9 +72,9 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Common
         /// Add an error
         /// </summary>
         /// <remarks>Will abandon any wrapped value if this is the first error encountered.</remarks>
-        /// <param name="error">Error to record.</param>
+        /// <param name="message">Error to record.</param>
         /// <returns>A new instance with the error included.</returns>
-        public abstract Errorable<T> AddError(string error);
+        public abstract Errorable<T> AddError(string message);
 
         /// <summary>
         /// Add a sequence of errors
@@ -130,9 +130,9 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Common
 
             public override ImmutableHashSet<string> Errors => ImmutableHashSet<string>.Empty;
 
-            public override Errorable<T> AddError(string error)
+            public override Errorable<T> AddError(string message)
             {
-                var errors = ImmutableHashSet<string>.Empty.Add(error);
+                var errors = ImmutableHashSet<string>.Empty.Add(message);
                 return new FailureImplementation(errors);
             }
 
@@ -176,9 +176,9 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Common
 
             public override ImmutableHashSet<string> Errors { get; }
 
-            public override Errorable<T> AddError(string error)
+            public override Errorable<T> AddError(string message)
             {
-                return new FailureImplementation(Errors.Add(error));
+                return new FailureImplementation(Errors.Add(message));
             }
 
             /// <summary>

src/Microsoft.Azure.Batch.SoftwareEntitlement.Common/ErrorableExtensions.cs

@@ -294,7 +294,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Common
             }
 
             return errorable.Match(
-                async t => Errorable.Success(await transform(t.Item1, t.Item2, t.Item3, t.Item4)),
+                async t => Errorable.Success(await transform(t.Item1, t.Item2, t.Item3, t.Item4).ConfigureAwait(false)),
                 e => Task.FromResult(Errorable.Failure<R>(e)));
         }
 

src/Microsoft.Azure.Batch.SoftwareEntitlement.Common/Microsoft.Azure.Batch.SoftwareEntitlement.Common.csproj

@@ -6,15 +6,16 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AnalyzerPowerPack" Version="1.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="Roslynator.Analyzers" Version="1.5.0" />
+    <PackageReference Include="Roslynator.Analyzers" Version="1.6.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
     <PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.1.4" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.1.5" />
     <PackageReference Include="System.Runtime.Analyzers" Version="1.1.0" />
-    <PackageReference Include="Serilog" Version="2.5.0" />
+    <PackageReference Include="Serilog" Version="2.6.0" />
     <PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />

src/Microsoft.Azure.Batch.SoftwareEntitlement.Common/TimestampParser.cs

@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 
 namespace Microsoft.Azure.Batch.SoftwareEntitlement.Common
@@ -19,6 +20,10 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Common
         /// <param name="name">Name to use for the value if there is an error.</param>
         /// <returns>A succesfully parsed <see cref="DateTimeOffset"/> or errors detailing what
         /// went wrong.</returns>
+        [SuppressMessage(
+            "Performance",
+            "CA1822:Mark members as static",
+            Justification = "This method should not be static.")]
         public Errorable<DateTimeOffset> TryParse(string value, string name)
         {
             if (DateTimeOffset.TryParseExact(

src/Microsoft.Azure.Batch.SoftwareEntitlement.Common/UnpackingExceptionLogProvider.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using Microsoft.Extensions.Logging;
 
@@ -8,7 +8,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Common
     /// A log provider that unpacks all of the diagnostics that may be in an exception
     /// </summary>
     /// <remarks>Works as a wrapper around an existing provider.</remarks>
-    public class UnpackingExceptionLogProvider : ILoggerProvider
+    public sealed class UnpackingExceptionLogProvider : ILoggerProvider
     {
         // Reference to our wrapped provider
         private readonly ILoggerProvider _innerProvider;

src/Microsoft.Azure.Batch.SoftwareEntitlement.Server/Controllers/SoftwareEntitlementsController.cs

@@ -189,12 +189,12 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Server.Controllers
                    || apiVersion.Equals(ApiVersion201709, StringComparison.Ordinal);
         }
 
-        private bool ApiSupportsVirtualMachineId(string apiVersion)
+        private static bool ApiSupportsVirtualMachineId(string apiVersion)
         {
             return string.Equals(apiVersion, ApiVersion201705, StringComparison.Ordinal);
         }
 
-        private bool ApiSupportsExpiryTimestamp(string apiVersion)
+        private static bool ApiSupportsExpiryTimestamp(string apiVersion)
         {
             return string.Equals(apiVersion, ApiVersion201709, StringComparison.Ordinal);
         }

src/Microsoft.Azure.Batch.SoftwareEntitlement.Server/GlobalSuppressions.cs

@@ -6,6 +6,11 @@
 
 using System.Diagnostics.CodeAnalysis;
 
+[assembly: SuppressMessage(
+    "Design",
+    "CA1034:Nested types should not be visible",
+    Justification = "This project uses nested public classes for scoping.")]
+
 [assembly: SuppressMessage(
     "Performance",
     "RCS1096:Use bitwise operation instead of calling 'HasFlag'.",

src/Microsoft.Azure.Batch.SoftwareEntitlement.Server/Microsoft.Azure.Batch.SoftwareEntitlement.Server.csproj

@@ -23,13 +23,14 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AnalyzerPowerPack" Version="1.1.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="Roslynator.Analyzers" Version="1.5.0" />
+    <PackageReference Include="Roslynator.Analyzers" Version="1.6.0" />
     <PackageReference Include="System.Runtime.Analyzers" Version="1.1.0" />
   </ItemGroup>
   <ItemGroup>

src/Microsoft.Azure.Batch.SoftwareEntitlement.Server/Startup.cs

@@ -26,6 +26,10 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Server
 
         public IConfigurationRoot Configuration { get; }
 
+        [SuppressMessage(
+            "Performance",
+            "CA1822: Member ConfigureServices does not access instance data and can be marked as static",
+            Justification = "Must be non-static to be called by the ASP.NET Runtime.")]
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {

src/Microsoft.Azure.Batch.SoftwareEntitlement/Microsoft.Azure.Batch.SoftwareEntitlement.csproj

@@ -6,13 +6,14 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AnalyzerPowerPack" Version="1.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="psake" Version="4.6.0" />
-    <PackageReference Include="Roslynator.Analyzers" Version="1.5.0" />
+    <PackageReference Include="psake" Version="4.7.0" />
+    <PackageReference Include="Roslynator.Analyzers" Version="1.6.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
     <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.1.4" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.1.5" />
     <PackageReference Include="System.Runtime.Analyzers" Version="1.1.0" />
   </ItemGroup>
 

src/Microsoft.Azure.Batch.SoftwareEntitlement/TokenGenerator.cs

@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using Microsoft.Azure.Batch.SoftwareEntitlement.Common;
@@ -56,10 +57,10 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
 
             _logger.LogDebug(
                 "Not Before: {NotBefore}",
-                entitlements.NotBefore.ToString(TimestampParser.ExpectedFormat));
+                entitlements.NotBefore.ToString(TimestampParser.ExpectedFormat, CultureInfo.InvariantCulture));
             _logger.LogDebug(
                 "Not After: {NotAfter}",
-                entitlements.NotAfter.ToString(TimestampParser.ExpectedFormat));
+                entitlements.NotAfter.ToString(TimestampParser.ExpectedFormat, CultureInfo.InvariantCulture));
 
             if (SigningCredentials != null)
             {

src/Microsoft.Azure.Batch.SoftwareEntitlement/TokenVerifier.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.IdentityModel.Tokens.Jwt;
 using System.Linq;
 using System.Net;
@@ -168,7 +169,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
         /// <param name="principal">Principal from the decoded token.</param>
         /// <param name="application">Application that desires to use the entitlement.</param>
         /// <returns>True if the entitlement specifies the passed application, false otherwise.</returns>
-        private bool VerifyApplication(ClaimsPrincipal principal, string application)
+        private static bool VerifyApplication(ClaimsPrincipal principal, string application)
         {
             var applicationsClaim = principal.FindAll(Claims.Application);
             if (!applicationsClaim.Any(c => string.Equals(c.Value, application, StringComparison.OrdinalIgnoreCase)))
@@ -187,7 +188,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
         /// <param name="address">IpAddress requesting verification of the token.</param>
         /// <returns>True if the entitlement was issued to the specified IP address, false
         /// otherwise.</returns>
-        private bool VerifyIpAddress(ClaimsPrincipal principal, IPAddress address)
+        private static bool VerifyIpAddress(ClaimsPrincipal principal, IPAddress address)
         {
             var ipAddressClaims = principal.FindAll(Claims.IpAddress).ToList();
             foreach (var ipClaim in ipAddressClaims)
@@ -210,13 +211,13 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
 
         private static Errorable<NodeEntitlements> TokenNotYetValidError(DateTime notBefore)
         {
-            var timestamp = notBefore.ToString(TimestampParser.ExpectedFormat);
+            var timestamp = notBefore.ToString(TimestampParser.ExpectedFormat, CultureInfo.InvariantCulture);
             return Errorable.Failure<NodeEntitlements>($"Token will not be valid until {timestamp}");
         }
 
         private static Errorable<NodeEntitlements> TokenExpiredError(DateTime expires)
         {
-            var timestamp = expires.ToString(TimestampParser.ExpectedFormat);
+            var timestamp = expires.ToString(TimestampParser.ExpectedFormat, CultureInfo.InvariantCulture);
             return Errorable.Failure<NodeEntitlements>($"Token expired at {timestamp}");
         }
 
@@ -226,19 +227,19 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
                 $"Invalid token ({reason})");
         }
 
-        private Errorable<NodeEntitlements> ApplicationNotEntitledError(string application)
+        private static Errorable<NodeEntitlements> ApplicationNotEntitledError(string application)
         {
             return Errorable.Failure<NodeEntitlements>(
                 $"Token does not grant entitlement for {application}");
         }
 
-        private Errorable<NodeEntitlements> MachineNotEntitledError(IPAddress address)
+        private static Errorable<NodeEntitlements> MachineNotEntitledError(IPAddress address)
         {
             return Errorable.Failure<NodeEntitlements>(
                 $"Token does not grant entitlement for {address}");
         }
 
-        private Errorable<NodeEntitlements> IdentifierNotPresentError()
+        private static Errorable<NodeEntitlements> IdentifierNotPresentError()
         {
             return Errorable.Failure<NodeEntitlements>(
                 "Entitlement identifier missing from entitlement token.");

src/sestest/ListCertificatesCommand.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
@@ -69,8 +70,8 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
                 cert.SubjectName.Name,
                 cert.FriendlyName,
                 cert.Thumbprint,
-                cert.NotBefore.ToString(dateFormat),
-                cert.NotAfter.ToString(dateFormat),
+                cert.NotBefore.ToString(dateFormat, CultureInfo.InvariantCulture),
+                cert.NotAfter.ToString(dateFormat, CultureInfo.InvariantCulture),
                 status
             };
         }

src/sestest/Program.cs

@@ -38,7 +38,8 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
                     (ListCertificatesCommandLine commandLine) => RunCommand(ListCertificates, commandLine),
                     (FindCertificateCommandLine commandLine) => RunCommand(FindCertificate, commandLine),
                     (VerifyCommandLine commandLine) => RunCommand(Submit, commandLine),
-                    errors => Task.FromResult(ResultCodes.Failed));
+                    errors => Task.FromResult(ResultCodes.Failed))
+                    .ConfigureAwait(false);
 
                 if (Debugger.IsAttached)
                 {
@@ -76,7 +77,8 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
                 {
                     _logger.LogErrors(errors);
                     return Task.FromResult(ResultCodes.Failed);
-                });
+                })
+                .ConfigureAwait(false);
         }
 
         private static Task<int> RunServer(ServerOptions options)
@@ -177,7 +179,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
         {
             try
             {
-                return await command(commandLine);
+                return await command(commandLine).ConfigureAwait(false);
             }
             catch (Exception ex)
             {

src/sestest/ServerCommandLine.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using CommandLine;
 
 namespace Microsoft.Azure.Batch.SoftwareEntitlement
@@ -20,6 +21,10 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
         public string ConnectionCertificateThumbprint { get; set; }
 
         [Option("url", HelpText = "The URL at which the server should process requests (defaults to '" + DefaultServerUrl + "'; must start with 'https:').")]
+        [SuppressMessage(
+            "Design",
+            "CA1056:Uri properties should not be strings",
+            Justification = "Must be a string to support our commandline.")]
         public string ServerUrl { get; set; }
 
         [Option("audience", HelpText = "[Internal] Audience to which all tokens must be addressed (optional).")]

src/sestest/VerifyCommand.cs

@@ -35,8 +35,11 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
             Errorable<string> app = FindApplication(commandLine);
             Errorable<string> api = FindApiVersion(commandLine);
 
-            Errorable<string> result = await server.With(token).With(app).With(api)
-                .MapAsync(SubmitToken);
+            Errorable<string> result = await server.With(token)
+                .With(app)
+                .With(api)
+                .MapAsync(SubmitToken)
+                .ConfigureAwait(false);
             return result.Match(response =>
                 {
                     Logger.LogJson(response);
@@ -72,7 +75,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
                 var result = await client.PostAsync(uri, content).ConfigureAwait(false);
                 Logger.LogInformation($"Status Code: {result.StatusCode} ({(int) result.StatusCode})");
 
-                return await result.Content.ReadAsStringAsync();
+                return await result.Content.ReadAsStringAsync().ConfigureAwait(false);
             }
         }
 
@@ -93,7 +96,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
             return Errorable.Success(token);
         }
 
-        private Errorable<string> FindApplication(VerifyCommandLine commandLine)
+        private static Errorable<string> FindApplication(VerifyCommandLine commandLine)
         {
             var application = commandLine.Application;
             if (string.IsNullOrEmpty(application))
@@ -128,7 +131,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
             }
         }
 
-        private Errorable<string> FindApiVersion(VerifyCommandLine commandLine)
+        private static Errorable<string> FindApiVersion(VerifyCommandLine commandLine)
         {
             var version = commandLine.ApiVersion;
             if (string.IsNullOrEmpty(version))
@@ -150,7 +153,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement
             return result;
         }
 
-        private string CreateParameters(params (string name, string value)[] parameters)
+        private static string CreateParameters(params (string name, string value)[] parameters)
         {
             var query = HttpUtility.ParseQueryString(string.Empty);
             foreach (var p in parameters)

src/sestest/sestest.csproj

@@ -8,16 +8,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.1.1-beta" />
-    <PackageReference Include="Desktop.Analyzers" Version="1.1.0" />
+    <PackageReference Include="CommandLineParser" Version="2.2.1" />
     <PackageReference Include="dotnet-test-nunit" Version="3.4.0-beta-3" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="psake" Version="4.6.0" />
-    <PackageReference Include="Roslynator.Analyzers" Version="1.5.0" />
-    <PackageReference Include="Serilog" Version="2.5.0" />
+    <PackageReference Include="psake" Version="4.7.0" />
+    <PackageReference Include="Roslynator.Analyzers" Version="1.6.0" />
+    <PackageReference Include="Serilog" Version="2.6.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
     <PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />

tests/Microsoft.Azure.Batch.SoftwareEntitlement.Common.Tests/Fakes/CollectingLogger.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Logging;
@@ -56,6 +56,10 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Common.Tests.Fakes
         }
     }
 
+    [SuppressMessage(
+        "Performance",
+        "CA1815: Should override Equals.",
+        Justification = "This class doesn't need equality.")]
     public struct LogEvent
     {
         public LogLevel Level { get; }

tests/Microsoft.Azure.Batch.SoftwareEntitlement.Common.Tests/GlobalSuppressions.cs

@@ -6,12 +6,34 @@
 
 using System.Diagnostics.CodeAnalysis;
 
+[assembly: SuppressMessage(
+    "Design",
+    "CA1034:Nested types should not be visible",
+    Justification = "This project uses nested public classes to group related tests.")]
+
 [assembly:SuppressMessage(
     "Design",
     "CA1052",
     Justification = "Grouping tests in nested private classes for structure.")]
 
+[assembly: SuppressMessage(
+    "Globalization",
+    "CA1308:Normalize strings to uppercase",
+    Justification = "We don't round trip values, just transform for display.")]
+
+[assembly:SuppressMessage(
+    "Naming",
+    "CA1707: Remove the underscores from member names",
+    Justification = "This project uses '_' to separate parts of test names.")]
+
+[assembly: SuppressMessage(
+    "Performance",
+    "CA1822:Mark members as static",
+    Justification = "Some tests don't share intiialization but still need to be non-static")]
+
 [assembly: SuppressMessage(
     "Redundancy",
     "RCS1163:Unused parameter.",
     Justification = "Empty implementations used for testing.")]
+
+

tests/Microsoft.Azure.Batch.SoftwareEntitlement.Common.Tests/Microsoft.Azure.Batch.SoftwareEntitlement.Common.Tests.csproj

@@ -8,14 +8,15 @@
     <PackageReference Include="Castle.Core" Version="4.2.1" />
     <PackageReference Include="FluentAssertions" Version="4.19.4" />
     <PackageReference Include="Microsoft.AnalyzerPowerPack" Version="1.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="15.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="15.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="NSubstitute" Version="3.1.0" />
     <PackageReference Include="OpenCover" Version="4.6.519" />
-    <PackageReference Include="ReportGenerator" Version="3.0.2" />
-    <PackageReference Include="Roslynator.Analyzers" Version="1.5.0" />
+    <PackageReference Include="ReportGenerator" Version="3.1.2" />
+    <PackageReference Include="Roslynator.Analyzers" Version="1.6.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
     <PackageReference Include="System.Runtime.Analyzers" Version="1.1.0" />
     <PackageReference Include="xunit" Version="2.3.1" />

tests/Microsoft.Azure.Batch.SoftwareEntitlement.Common.Tests/SpecifiableTests.cs

@@ -9,7 +9,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Common.Tests
 
         // Values to specify
         private readonly string _thisStringValue = "this";
-        private readonly string _nullStringValue;
+        private readonly string _nullStringValue = null;
 
         public class Construction : SpecifiableTests
         {

tests/Microsoft.Azure.Batch.SoftwareEntitlement.Common.Tests/StringExtensionsTests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using FluentAssertions;
 using Xunit;

tests/Microsoft.Azure.Batch.SoftwareEntitlement.Common.Tests/TimestampParserTests.cs

@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Globalization;
 using FluentAssertions;
 using Xunit;
 
@@ -43,7 +44,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Common.Tests
             [Fact]
             public void GivenTimestampInExpectedFormat_ReturnsExpectedValue()
             {
-                var valueToParse = _timestamp.ToString(TimestampParser.ExpectedFormat);
+                var valueToParse = _timestamp.ToString(TimestampParser.ExpectedFormat, CultureInfo.InvariantCulture);
                 var result = _parser.TryParse(valueToParse, _name);
                 result.HasValue.Should().BeTrue();
                 result.Value.Should().Be(_timestamp);
@@ -52,7 +53,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Common.Tests
             [Fact]
             public void GivenTimestampInDifferentFormat_ReturnsExpectedValue()
             {
-                var valueToParse = _timestamp.ToString("G");
+                var valueToParse = _timestamp.ToString("G", CultureInfo.InvariantCulture);
                 var result = _parser.TryParse(valueToParse, _name);
                 result.HasValue.Should().BeTrue();
                 result.Value.Should().Be(_timestamp);

tests/Microsoft.Azure.Batch.SoftwareEntitlement.Common.Tests/UnpackingExceptionLoggerTests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
@@ -85,7 +85,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Common.Tests
                 yield return new object[] { invalidOperationException, 1 };
 
                 // Another single exception, different type
-                var argumentException = new ArgumentException();
+                var argumentException = new ArgumentException("arg");
                 yield return new object[] { argumentException, 1 };
 
                 // Parent and child

tests/Microsoft.Azure.Batch.SoftwareEntitlement.Tests/GlobalSuppressions.cs

@@ -1,4 +1,4 @@
-
+
 // This file is used by Code Analysis to maintain SuppressMessage 
 // attributes that are applied to this project.
 // Project-level suppressions either have no target or are given 
@@ -6,6 +6,26 @@
 
 using System.Diagnostics.CodeAnalysis;
 
+[assembly: SuppressMessage(
+    "Design",
+    "CA1034:Nested types should not be visible",
+    Justification = "This project uses nested public classes to group related tests.")]
+
+[assembly: SuppressMessage(
+    "Design",
+    "CA1052",
+    Justification = "Grouping tests in nested private classes for structure.")]
+
+[assembly: SuppressMessage(
+    "Naming",
+    "CA1707: Remove the underscores from member names",
+    Justification = "This project uses '_' to separate parts of test names.")]
+
+[assembly: SuppressMessage(
+    "Performance",
+    "CA1822:Mark members as static",
+    Justification = "Some tests don't share intiialization but still need to be non-static")]
+
 [assembly: SuppressMessage(
     "Performance",
     "RCS1096:Use bitwise operation instead of calling 'HasFlag'.",

tests/Microsoft.Azure.Batch.SoftwareEntitlement.Tests/Microsoft.Azure.Batch.SoftwareEntitlement.Tests.csproj

@@ -8,12 +8,13 @@
     <PackageReference Include="Castle.Core" Version="4.2.1" />
     <PackageReference Include="FluentAssertions" Version="4.19.4" />
     <PackageReference Include="Microsoft.AnalyzerPowerPack" Version="1.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="NSubstitute" Version="3.1.0" />
     <PackageReference Include="OpenCover" Version="4.6.519" />
-    <PackageReference Include="ReportGenerator" Version="3.0.2" />
-    <PackageReference Include="Roslynator.Analyzers" Version="1.5.0" />
+    <PackageReference Include="ReportGenerator" Version="3.1.2" />
+    <PackageReference Include="Roslynator.Analyzers" Version="1.6.0" />
     <PackageReference Include="System.Runtime.Analyzers" Version="1.1.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

tests/Microsoft.Azure.Batch.SoftwareEntitlement.Tests/NodeEntitlementsBuilderTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Net;
 using FluentAssertions;
 using Microsoft.Azure.Batch.SoftwareEntitlement.Common;
@@ -81,7 +82,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Tests
         public class NotBeforeProperty : NodeEntitlementsBuilderTests
         {
             private readonly string _validNotBefore =
-                DateTimeOffset.Now.ToString(TimestampParser.ExpectedFormat);
+                DateTimeOffset.Now.ToString(TimestampParser.ExpectedFormat, CultureInfo.InvariantCulture);
 
             [Fact]
             public void WhenMissing_BuildStillReturnsValue()
@@ -113,7 +114,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Tests
                 _commandLine.NotBefore = _validNotBefore;
                 var entitlement = NodeEntitlementsBuilder.Build(_commandLine);
                 // Compare as formatted strings to avoid issues with extra seconds we don't care about
-                entitlement.Value.NotBefore.ToString(TimestampParser.ExpectedFormat)
+                entitlement.Value.NotBefore.ToString(TimestampParser.ExpectedFormat, CultureInfo.InvariantCulture)
                     .Should().Be(_validNotBefore);
             }
         }
@@ -121,7 +122,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Tests
         public class NotAfterProperty : NodeEntitlementsBuilderTests
         {
             private readonly string _validNotAfter =
-                DateTimeOffset.Now.AddDays(7).ToString(TimestampParser.ExpectedFormat);
+                DateTimeOffset.Now.AddDays(7).ToString(TimestampParser.ExpectedFormat, CultureInfo.InvariantCulture);
 
             [Fact]
             public void WhenMissing_BuildStillReturnsValue()
@@ -153,7 +154,7 @@ namespace Microsoft.Azure.Batch.SoftwareEntitlement.Tests
                 _commandLine.NotAfter = _validNotAfter;
                 var entitlement = NodeEntitlementsBuilder.Build(_commandLine);
                 // Compare as formatted strings to avoid issues with extra seconds we don't care about
-                entitlement.Value.NotAfter.ToString(TimestampParser.ExpectedFormat)
+                entitlement.Value.NotAfter.ToString(TimestampParser.ExpectedFormat, CultureInfo.InvariantCulture)
                     .Should().Be(_validNotAfter);
             }
         }