Dothanhl/feature/dotnetformat (#715)

Format

src/Abstractions/ExecutionContext/BaseExecutionContext.cs

@@ -40,7 +40,7 @@ public BaseExecutionContext(IHostEnvironment? hostEnvironment = null)
 			BuildVersion = GetBuildVersion();
 
 			ClusterIpAddress = GetIpAddress(MachineName);
-			
+
 			RegionName = GetVariable(RegionNameVariableName) ?? DefaultEmptyValue;
 			RegionShortName = GetVariable(RegionShortNameVariableName) ?? DefaultEmptyValue;
 			DeploymentSlice = GetVariable(SliceNameVariableName) ?? DefaultEmptyValue;

src/Diagnostics.HealthChecks/CertificatesValidityHealthCheck.cs

@@ -71,7 +71,6 @@ public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, Canc
 
 	private void ValidateCertificate(X509Certificate2? certificate, string certName, StringBuilder message, HealthCheckContext context, ref HealthStatus healthStatus)
 	{
-
 		string errorMessage = string.Empty;
 		DateTime localNow = DateTime.Now;
 

src/Diagnostics.HealthChecks/DependencyInjection/OmexHealthCheckServiceCollectionExtensions.cs

@@ -46,7 +46,7 @@ public static IOmexHealthChecksBuilder AddOmexHealthChecks(this IServiceCollecti
 	/// <param name="predicate"></param>
 	public static bool TryRemoveServiceByPredicate(this IServiceCollection @this, Func<ServiceDescriptor, bool> predicate)
 	{
-		var descriptorToRemove = @this.SingleOrDefault(predicate);
+		ServiceDescriptor? descriptorToRemove = @this.SingleOrDefault(predicate);
 		if (descriptorToRemove != null)
 		{
 			return @this.Remove(descriptorToRemove);

src/Diagnostics.HealthChecks/DependencyInjection/OmexHealthChecksBuilderDelegateExtensions.cs

@@ -58,7 +58,7 @@ public static IOmexHealthChecksBuilder AddCheck(
 			return (IOmexHealthChecksBuilder)HealthChecksBuilderDelegateExtensions.AddCheck(builder, name, check, tags, timeout);
 		}
 
-		var instance = new DelegateHealthCheck((ct) => new ValueTask<HealthCheckResult>(check()));
+		DelegateHealthCheck instance = new((ct) => new ValueTask<HealthCheckResult>(check()));
 		return builder.Add(new HealthCheckRegistration(name, instance, failureStatus: default, tags, timeout), parameters);
 	}
 
@@ -101,7 +101,7 @@ public static IOmexHealthChecksBuilder AddCheck(
 			return (IOmexHealthChecksBuilder)HealthChecksBuilderDelegateExtensions.AddCheck(builder, name, check, tags, timeout);
 		}
 
-		var instance = new DelegateHealthCheck((ct) => new ValueTask<HealthCheckResult>(check(ct)));
+		DelegateHealthCheck instance = new((ct) => new ValueTask<HealthCheckResult>(check(ct)));
 		return builder.Add(new HealthCheckRegistration(name, instance, failureStatus: default, tags, timeout), parameters);
 	}
 
@@ -144,7 +144,7 @@ public static IOmexHealthChecksBuilder AddAsyncCheck(
 			return (IOmexHealthChecksBuilder)HealthChecksBuilderDelegateExtensions.AddAsyncCheck(builder, name, check().AsTask, tags, timeout);
 		}
 
-		var instance = new DelegateHealthCheck((ct) => check());
+		DelegateHealthCheck instance = new((ct) => check());
 		return builder.Add(new HealthCheckRegistration(name, instance, failureStatus: default, tags, timeout), parameters);
 	}
 
@@ -185,10 +185,9 @@ public static IOmexHealthChecksBuilder AddAsyncCheck(
 		if (parameters == null)
 		{
 			return (IOmexHealthChecksBuilder)HealthChecksBuilderDelegateExtensions.AddAsyncCheck(builder, name, ct => check(ct).AsTask(), tags, timeout);
-			;
 		}
 
-		var instance = new DelegateHealthCheck((ct) => check(ct));
+		DelegateHealthCheck instance = new((ct) => check(ct));
 		return builder.Add(new HealthCheckRegistration(name, instance, failureStatus: default, tags, timeout), parameters);
 	}
 }

src/Diagnostics.HealthChecks/Internal/HttpEndpointHealthCheck.cs

@@ -82,7 +82,7 @@ private static HttpRequestMessage CloneRequestMessage(HttpRequestMessage message
 				clone.Headers.TryAddWithoutValidation(header.Key, header.Value);
 			}
 
-			clone.VersionPolicy =  message.VersionPolicy;
+			clone.VersionPolicy = message.VersionPolicy;
 
 			foreach (KeyValuePair<string, object?> option in message.Options)
 			{

src/Diagnostics.HealthChecks/Internal/NonCapturingTimer.cs

@@ -23,7 +23,7 @@ public static Timer Create(TimerCallback callback, object? state, TimeSpan dueTi
 		}
 
 		// Don't capture the current ExecutionContext and its AsyncLocals onto the timer
-		var restoreFlow = false;
+		bool restoreFlow = false;
 		try
 		{
 			if (!ExecutionContext.IsFlowSuppressed())

src/Diagnostics.HealthChecks/Internal/ServiceContextHealthStatusSender.cs

@@ -3,12 +3,12 @@
 
 using System;
 using System.Fabric;
+using System.Fabric.Health;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Omex.Extensions.Abstractions;
-using System.Fabric.Health;
 
 namespace Microsoft.Omex.Extensions.Diagnostics.HealthChecks
 {

src/Diagnostics.HealthChecks/Internal/ValueStopwatch.cs

@@ -34,9 +34,9 @@ public TimeSpan GetElapsedTime()
 			throw new InvalidOperationException("An uninitialized, or 'default', ValueStopwatch cannot be used to get elapsed time.");
 		}
 
-		var end = Stopwatch.GetTimestamp();
-		var timestampDelta = end - _startTimestamp;
-		var ticks = (long)(TimestampToTicks * timestampDelta);
+		long end = Stopwatch.GetTimestamp();
+		long timestampDelta = end - _startTimestamp;
+		long ticks = (long)(TimestampToTicks * timestampDelta);
 		return new TimeSpan(ticks);
 	}
 }

src/Diagnostics.HealthChecks/OmexHealthCheckPublisherHostedService.cs

@@ -88,7 +88,7 @@ public OmexHealthCheckPublisherHostedService(
 		// actually tries to **run** health checks would be real baaaaad.
 		ValidateRegistrations(_healthCheckServiceOptions.Value.Registrations);
 
-		_defaultTimerOptions =  (_healthCheckPublisherOptions.Value.Delay, _healthCheckPublisherOptions.Value.Period, _healthCheckPublisherOptions.Value.Timeout);
+		_defaultTimerOptions = (_healthCheckPublisherOptions.Value.Delay, _healthCheckPublisherOptions.Value.Period, _healthCheckPublisherOptions.Value.Timeout);
 
 		// Group healthcheck registrations by Delay, Period and Timeout, to build a Dictionary<(TimeSpan, TimeSpan, TimeSpan), List<HealthCheckRegistration>>
 		// For HCs with no Delay, Period or Timeout, we default to the publisher values
@@ -97,7 +97,7 @@ public OmexHealthCheckPublisherHostedService(
 
 	private (TimeSpan Delay, TimeSpan Period, TimeSpan Timeout) GetTimerOptionsOrDefault(string registrationName)
 	{
-		_healthCheckRegistrationOptions.Value.RegistrationParameters.TryGetValue(registrationName, out var registrationParameters);
+		_healthCheckRegistrationOptions.Value.RegistrationParameters.TryGetValue(registrationName, out HealthCheckRegistrationParameters? registrationParameters);
 
 		return (registrationParameters?.Delay ?? _healthCheckPublisherOptions.Value.Delay, registrationParameters?.Period ?? _healthCheckPublisherOptions.Value.Period, registrationParameters?.Timeout ?? _healthCheckPublisherOptions.Value.Timeout);
 	}
@@ -138,7 +138,7 @@ public Task StopAsync(CancellationToken cancellationToken = default)
 
 		if (_timersByOptions != null)
 		{
-			foreach (var timer in _timersByOptions.Values)
+			foreach (Timer timer in _timersByOptions.Values)
 			{
 				timer.Dispose();
 			}
@@ -180,13 +180,13 @@ internal async Task RunAsync((TimeSpan Delay, TimeSpan Period, TimeSpan Timeout)
 	{
 		timerOptions ??= _defaultTimerOptions;
 
-		var duration = ValueStopwatch.StartNew();
+		ValueStopwatch duration = ValueStopwatch.StartNew();
 		Logger.HealthCheckPublisherProcessingBegin(_logger);
 
 		CancellationTokenSource? cancellation = null;
 		try
 		{
-			var timeout = timerOptions.Value.Timeout;
+			TimeSpan timeout = timerOptions.Value.Timeout;
 
 			cancellation = CancellationTokenSource.CreateLinkedTokenSource(_stopping.Token);
 			_runTokenSource = cancellation;
@@ -218,18 +218,18 @@ private async Task RunAsyncCore((TimeSpan Delay, TimeSpan Period, TimeSpan Timeo
 		await Task.Yield();
 
 		// Concatenate predicates - we only run HCs at the set delay, period and timeout, and that are enabled
-		var withOptionsPredicate = (HealthCheckRegistration r) =>
+		Func<HealthCheckRegistration, bool> withOptionsPredicate = (HealthCheckRegistration r) =>
 		{
 			// Check whether the current timer options correspond to the ones of the HC registration
-			var rOptions = GetTimerOptionsOrDefault(r.Name);
-			var hasOptions = rOptions == timerOptions;
+			(TimeSpan Delay, TimeSpan Period, TimeSpan Timeout) rOptions = GetTimerOptionsOrDefault(r.Name);
+			bool hasOptions = rOptions == timerOptions;
 			if (!hasOptions)
 			{
 				return false;
 			}
 
 			// Check if HC is enabled
-			if (_healthCheckRegistrationOptions.Value.RegistrationParameters.TryGetValue(r.Name, out var hcrParams) && !hcrParams.IsEnabled)
+			if (_healthCheckRegistrationOptions.Value.RegistrationParameters.TryGetValue(r.Name, out HealthCheckRegistrationParameters? hcrParams) && !hcrParams.IsEnabled)
 			{
 				return false;
 			}
@@ -244,11 +244,11 @@ private async Task RunAsyncCore((TimeSpan Delay, TimeSpan Period, TimeSpan Timeo
 		};
 
 		// The health checks service does it's own logging, and doesn't throw exceptions.
-		var report = await _healthCheckService.CheckHealthAsync(withOptionsPredicate, cancellationToken).ConfigureAwait(false);
+		HealthReport report = await _healthCheckService.CheckHealthAsync(withOptionsPredicate, cancellationToken).ConfigureAwait(false);
 
-		var publishers = _publishers;
-		var tasks = new Task[publishers.Length];
-		for (var i = 0; i < publishers.Length; i++)
+		IHealthCheckPublisher[] publishers = _publishers;
+		Task[] tasks = new Task[publishers.Length];
+		for (int i = 0; i < publishers.Length; i++)
 		{
 			tasks[i] = RunPublisherAsync(publishers[i], report, cancellationToken);
 		}
@@ -258,7 +258,7 @@ private async Task RunAsyncCore((TimeSpan Delay, TimeSpan Period, TimeSpan Timeo
 
 	private async Task RunPublisherAsync(IHealthCheckPublisher publisher, HealthReport report, CancellationToken cancellationToken)
 	{
-		var duration = ValueStopwatch.StartNew();
+		ValueStopwatch duration = ValueStopwatch.StartNew();
 
 		try
 		{
@@ -289,9 +289,9 @@ private static void ValidateRegistrations(IEnumerable<HealthCheckRegistration> r
 		// Scan the list for duplicate names to provide a better error if there are duplicates.
 
 		StringBuilder? builder = null;
-		var distinctRegistrations = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+		HashSet<string> distinctRegistrations = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
-		foreach (var registration in registrations)
+		foreach (HealthCheckRegistration registration in registrations)
 		{
 			if (!distinctRegistrations.Add(registration.Name))
 			{

src/Hosting.Services.Web/ApplicationBuilderExtensions.cs

@@ -75,7 +75,7 @@ public static IApplicationBuilder UseObsoleteCorrelationHeadersMiddleware(this I
 		/// </summary>
 		public static IApplicationBuilder UseOmexExceptionHandler(this IApplicationBuilder builder, IHostEnvironment environment) =>
 			builder.UseOmexExceptionHandler(environment.IsDevelopment());
-		
+
 		/// <summary>
 		/// Adds the default exception handling logic that will display a developer exception page in develop and a short message during deployment
 		/// </summary>

tests/Abstractions.UnitTests/TagTests.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
 using Microsoft.Extensions.Logging;
@@ -29,7 +29,7 @@ public void Create_HasProperValues()
 		private static void AssertTagNames(string expectedTag, string? actualTag, string message)
 		{
 #if DEBUG
-			StringAssert.EndsWith(actualTag?.Replace('\\','/'), expectedTag, message);
+			StringAssert.EndsWith(actualTag?.Replace('\\', '/'), expectedTag, message);
 #else
 			Assert.AreEqual(expectedTag, actualTag, message);
 #endif

tests/Activities.UnitTests/Internal/ActivityMetricsSenderTests.cs

@@ -192,7 +192,7 @@ public void SendActivityMetric_WithSendParentName_ProducesMetricPointWithParentN
 			// 3. Assert
 			MeasurementResult result = listener.Results.First(m => environment.EnvironmentName.Equals(m.Tags[s_environmentTagName]));
 
-			if(expectParentNameToBeEmitted)
+			if (expectParentNameToBeEmitted)
 			{
 				AssertTag(result, "ParentName", nameof(parentName));
 			}

tests/Activities.UnitTests/Internal/DefaultActivityListenerConfiguratorTests.cs

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Diagnostics;
-using Moq;
 using Microsoft.Extensions.Options;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
 
 namespace Microsoft.Omex.Extensions.Activities.UnitTests
 {

tests/Diagnostics.HealthChecks.UnitTests/Extensions/TaskExtensions.cs

@@ -8,8 +8,8 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace Microsoft.Omex.Extensions.Diagnostics.HealthChecks.UnitTests.Extensions
 {