Merge remote-tracking branch 'origin/main' into main

# Conflicts: # .github/workflows/build.yml
nuages-io · Feb 8, 2022 · 5595f38 · 5595f38
2 parents a226dc8 + e22a780
commit 5595f38
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,3 +1,4 @@
+
 name: .NET Build
 
 on:

diff --git a/Nuages.TaskRunner.Samples.Console/Nuages.TaskRunner.Samples.Console.csproj b/Nuages.TaskRunner.Samples.Console/Nuages.TaskRunner.Samples.Console.csproj
@@ -2,7 +2,8 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Nuages.TaskRunner.Samples.Console/Program.cs b/Nuages.TaskRunner.Samples.Console/Program.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Nuages.TaskRunner.Samples.Console

diff --git a/Nuages.TaskRunner.Samples.Lambda/Function.cs b/Nuages.TaskRunner.Samples.Lambda/Function.cs
@@ -1,7 +1,5 @@
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Amazon.Lambda.Core;
 using Amazon.Lambda.SQSEvents;
 using Microsoft.Extensions.DependencyInjection;
@@ -11,9 +9,8 @@
 // Assembly attribute to enable the Lambda function's JSON input to be converted into a .NET class.
 [assembly: LambdaSerializer(typeof(Amazon.Lambda.Serialization.SystemTextJson.DefaultLambdaJsonSerializer))]
 
-namespace Nuages.TaskRunner.Samples.Lambda
-{
-
+namespace Nuages.TaskRunner.Samples.Lambda;
+
 // ReSharper disable once UnusedType.Global
 [ExcludeFromCodeCoverage]
 // ReSharper disable once ClassNeverInstantiated.Global
@@ -77,5 +74,4 @@ private async Task ProcessMessageAsync(SQSEvent.SQSMessage message, ILambdaConte
         // ReSharper disable once AssignNullToNotNullAttribute
         await taskRunner.ExecuteAsync(t);
     }
-}
-}
+}
diff --git a/Nuages.TaskRunner.Samples.Lambda/Nuages.TaskRunner.Samples.Lambda.csproj b/Nuages.TaskRunner.Samples.Lambda/Nuages.TaskRunner.Samples.Lambda.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
         <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
         <AWSProjectType>Lambda</AWSProjectType>
         <!-- This property makes the build directory similar to a publish directory and helps the AWS .NET Lambda Mock Test Tool find project dependencies. -->

diff --git a/Nuages.TaskRunner.Tests/Nuages.TaskRunner.Tests.csproj b/Nuages.TaskRunner.Tests/Nuages.TaskRunner.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
-
+        <ImplicitUsings>enable</ImplicitUsings>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 

diff --git a/Nuages.TaskRunner.Tests/TaskRunnerTests.cs b/Nuages.TaskRunner.Tests/TaskRunnerTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Moq;
 using Nuages.TaskRunner.Tasks;