Merge branch 'main' of https://github.com/Dotnet-Boxed/Templates

RehanSaeed · RehanSaeed · commit 93297edbdeff · 2023-09-14T11:04:31.000+01:00
diff --git a/Source/ApiTemplate/Source/ApiTemplate/ApiTemplate.csproj b/Source/ApiTemplate/Source/ApiTemplate/ApiTemplate.csproj
@@ -45,7 +45,7 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="AspNetCore.HealthChecks.Redis" Version="7.0.0" Condition="'$(Redis)' == 'true'" />
+    <PackageReference Include="AspNetCore.HealthChecks.Redis" Version="7.0.1" Condition="'$(Redis)' == 'true'" />
     <PackageReference Include="Boxed.AspNetCore" Version="8.1.2" />
     <PackageReference Include="Boxed.AspNetCore.Swagger" Version="10.0.0" Condition="'$(Swagger)' == 'true'" />
     <PackageReference Include="Boxed.Mapping" Version="6.0.0" />
diff --git a/Source/ApiTemplate/Source/ApiTemplate/ConfigureOptions/ConfigureRequestLoggingOptions.cs b/Source/ApiTemplate/Source/ApiTemplate/ConfigureOptions/ConfigureRequestLoggingOptions.cs
@@ -56,7 +56,7 @@ private static void EnrichDiagnosticContext(IDiagnosticContext diagnosticContext
     }
 #if HealthCheck
 
-    private static LogEventLevel GetLevel(HttpContext httpContext, double elapsedMilliseconds, Exception exception)
+    private static LogEventLevel GetLevel(HttpContext httpContext, double elapsedMilliseconds, Exception? exception)
     {
         if (exception is null && httpContext.Response.StatusCode <= 499)
         {
diff --git a/Source/ApiTemplate/Source/ApiTemplate/Options/RedisOptions.cs b/Source/ApiTemplate/Source/ApiTemplate/Options/RedisOptions.cs
@@ -12,7 +12,7 @@ public ConfigurationOptions ConfigurationOptions
     {
         get
         {
-            var options = ConfigurationOptions.Parse(this.ConnectionString);
+            var options = ConfigurationOptions.Parse(this.ConnectionString!);
             options.ClientName = AssemblyInformation.Current.Product;
             return options;
         }
diff --git a/Source/GraphQLTemplate/Source/GraphQLTemplate/ConfigureOptions/ConfigureRequestLoggingOptions.cs b/Source/GraphQLTemplate/Source/GraphQLTemplate/ConfigureOptions/ConfigureRequestLoggingOptions.cs
@@ -73,7 +73,7 @@ private static void EnrichDiagnosticContext(IDiagnosticContext diagnosticContext
     }
 #if HealthCheck
 
-    private static LogEventLevel GetLevel(HttpContext httpContext, double elapsedMilliseconds, Exception exception)
+    private static LogEventLevel GetLevel(HttpContext httpContext, double elapsedMilliseconds, Exception? exception)
     {
         if (exception is null && httpContext.Response.StatusCode <= 499)
         {
diff --git a/Source/GraphQLTemplate/Source/GraphQLTemplate/GraphQLTemplate.csproj b/Source/GraphQLTemplate/Source/GraphQLTemplate/GraphQLTemplate.csproj
@@ -44,7 +44,7 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="AspNetCore.HealthChecks.Redis" Version="7.0.0" Condition="'$(Redis)' == 'true'" />
+    <PackageReference Include="AspNetCore.HealthChecks.Redis" Version="7.0.1" Condition="'$(Redis)' == 'true'" />
     <PackageReference Include="Boxed.AspNetCore" Version="8.1.2" />
     <PackageReference Include="Boxed.Mapping" Version="6.0.0" />
     <PackageReference Include="GraphQL.Server.Ui.Playground" Version="7.6.0" />
diff --git a/Source/NuGetTemplate/appveyor.yml b/Source/NuGetTemplate/appveyor.yml
@@ -38,7 +38,7 @@ build_script:
   - pwsh: dotnet cake --target=Test
   - pwsh: dotnet cake --target=Pack
 
-test: off
+test: false
 
 artifacts:
   - name: NuGet Packages
diff --git a/Source/OrleansTemplate/Source/OrleansTemplate.Grains/CounterStatelessGrain.cs b/Source/OrleansTemplate/Source/OrleansTemplate.Grains/CounterStatelessGrain.cs
@@ -24,11 +24,11 @@ public override Task OnActivateAsync(CancellationToken cancellationToken)
     {
         // Timers are stored in-memory so are not resilient to nodes going down. They should be used for short
         // high-frequency timers their period should be measured in seconds.
-        this.RegisterTimer(this.OnTimerTickAsync, null, TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1));
+        this.RegisterTimer(this.OnTimerTickAsync, null!, TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1));
         return base.OnActivateAsync(cancellationToken);
     }
 
-    private async Task OnTimerTickAsync(object arg)
+    private async Task OnTimerTickAsync(object state)
     {
         var count = this.count;
         this.count = 0;
diff --git a/Source/OrleansTemplate/Tests/OrleansTemplate.Server.IntegrationTest/Fixtures/TestSiloConfigurator.cs b/Source/OrleansTemplate/Tests/OrleansTemplate.Server.IntegrationTest/Fixtures/TestSiloConfigurator.cs
@@ -1,4 +1,5 @@
 namespace OrleansTemplate.Server.IntegrationTest.Fixtures;
+
 #if Serilog
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
diff --git a/appveyor.yml b/appveyor.yml
@@ -39,7 +39,7 @@ build_script:
   - pwsh: dotnet cake --target=Test
   - pwsh: dotnet cake --target=Pack
 
-test: off
+test: false
 
 artifacts:
   - name: NuGet Packages

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ private static void EnrichDiagnosticContext(IDiagnosticContext diagnosticContext`
`56`	`56`	`}`
`57`	`57`	`#if HealthCheck`
`58`	`58`
`59`		`- private static LogEventLevel GetLevel(HttpContext httpContext, double elapsedMilliseconds, Exception exception)`
	`59`	`+ private static LogEventLevel GetLevel(HttpContext httpContext, double elapsedMilliseconds, Exception? exception)`
`60`	`60`	`{`
`61`	`61`	`if (exception is null && httpContext.Response.StatusCode <= 499)`
`62`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public ConfigurationOptions ConfigurationOptions`
`12`	`12`	`{`
`13`	`13`	`get`
`14`	`14`	`{`
`15`		`- var options = ConfigurationOptions.Parse(this.ConnectionString);`
	`15`	`+ var options = ConfigurationOptions.Parse(this.ConnectionString!);`
`16`	`16`	`options.ClientName = AssemblyInformation.Current.Product;`
`17`	`17`	`return options;`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ private static void EnrichDiagnosticContext(IDiagnosticContext diagnosticContext`
`73`	`73`	`}`
`74`	`74`	`#if HealthCheck`
`75`	`75`
`76`		`- private static LogEventLevel GetLevel(HttpContext httpContext, double elapsedMilliseconds, Exception exception)`
	`76`	`+ private static LogEventLevel GetLevel(HttpContext httpContext, double elapsedMilliseconds, Exception? exception)`
`77`	`77`	`{`
`78`	`78`	`if (exception is null && httpContext.Response.StatusCode <= 499)`
`79`	`79`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@ public override Task OnActivateAsync(CancellationToken cancellationToken)`
`24`	`24`	`{`
`25`	`25`	`// Timers are stored in-memory so are not resilient to nodes going down. They should be used for short`
`26`	`26`	`// high-frequency timers their period should be measured in seconds.`
`27`		`- this.RegisterTimer(this.OnTimerTickAsync, null, TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1));`
	`27`	`+ this.RegisterTimer(this.OnTimerTickAsync, null!, TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1));`
`28`	`28`	`return base.OnActivateAsync(cancellationToken);`
`29`	`29`	`}`
`30`	`30`
`31`		`- private async Task OnTimerTickAsync(object arg)`
	`31`	`+ private async Task OnTimerTickAsync(object state)`
`32`	`32`	`{`
`33`	`33`	`var count = this.count;`
`34`	`34`	`this.count = 0;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`namespace OrleansTemplate.Server.IntegrationTest.Fixtures;`
	`2`	`+`
`2`	`3`	`#if Serilog`
`3`	`4`	`using Microsoft.Extensions.DependencyInjection;`
`4`	`5`	`using Microsoft.Extensions.Logging;`