C# 10 - Migrate to targeted new

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/[email protected]
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
 
     - name: Restore
       run: dotnet restore

.github/workflows/prbuild.yaml

@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/[email protected]
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
 
     - name: Restore
       run: dotnet restore

Alexa.NET.Tests/Alexa.NET.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 	  <NoWarn>CS0612,CS0618</NoWarn>
   </PropertyGroup>
 

Alexa.NET/Alexa.NET.csproj

@@ -6,7 +6,7 @@
     <VersionPrefix>1.20.0</VersionPrefix>
     <Authors>Tim Heuer, Steven Pears</Authors>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>Alexa.NET</AssemblyName>
+	  <AssemblyName>Alexa.NET</AssemblyName>
     <PackageId>Alexa.NET</PackageId>
     <PackageTags>amazon;alexa;echo;dot;echo dot;skills</PackageTags>
     <PackageReleaseNotes>Adds support for PIN confirmation support . Thanks @stoiveyp</PackageReleaseNotes>
@@ -19,7 +19,7 @@
 	  <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <LangVersion>8</LangVersion>
+    <LangVersion>10</LangVersion>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <DebugType>embedded</DebugType>

Alexa.NET/ConnectionTasks/IConnectionTaskExtensions.cs

@@ -10,7 +10,7 @@ public static class IConnectionTaskExtensions
 
         public static StartConnectionDirective ToConnectionDirective(this IConnectionTask task, string token = null)
         {
-            return new StartConnectionDirective(task, token);
+            return new(task, token);
         }
     }
 }

Alexa.NET/ConnectionTasks/Inputs/PinConfirmation.cs

@@ -13,9 +13,10 @@ public class PinConfirmation:IConnectionTask
 
         [JsonProperty("requestedAuthenticationConfidenceLevel")]
         public AuthenticationConfidenceLevel RequestedAuthenticationConfidenceLevel { get; } =
-            new AuthenticationConfidenceLevel { 
+            new()
+            { 
                 Level = 400, 
-                Custom = new AuthenticationConfidenceLevelCustomPolicy("VOICE_PIN")
+                Custom = new("VOICE_PIN")
 
             };
     }

Alexa.NET/Helpers/MixedDateTimeConverter.cs

@@ -6,7 +6,7 @@ namespace Alexa.NET.Helpers
 {
 	public class MixedDateTimeConverter : Newtonsoft.Json.Converters.DateTimeConverterBase
     {
-		static readonly DateTime UnixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+		static readonly DateTime UnixEpoch = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{

Alexa.NET/Request/IntentSignature.cs

@@ -11,7 +11,7 @@ public sealed class IntentSignature
         public string Action { get; private set; }
         public System.Collections.ObjectModel.ReadOnlyDictionary<string, IntentProperty> Properties { get; private set; }
 
-		private static Regex PropertyFinder = new Regex(@"(\w+?)@(\w+?)\b(\[(\w+)\])*", RegexOptions.Compiled);
+		private static Regex PropertyFinder = new(@"(\w+?)@(\w+?)\b(\[(\w+)\])*", RegexOptions.Compiled);
 
         private IntentSignature(string fullName)
         {
@@ -89,11 +89,11 @@ private static void ParseComplex(string action, IntentSignature name)
             {
                 propertyDictionary.Add(
                     match.Groups[1].Value,
-                    new IntentProperty(match.Groups[2].Value,match.Groups[4].Value)
+                    new(match.Groups[2].Value,match.Groups[4].Value)
                 );
             }
 
-            name.Properties = new System.Collections.ObjectModel.ReadOnlyDictionary<string, IntentProperty>(propertyDictionary);
+            name.Properties = new(propertyDictionary);
         }
     }
 }

Alexa.NET/Request/RequestVerification.cs

@@ -61,14 +61,14 @@ public static async Task<X509Certificate2> GetCertificate(Uri certificatePath)
         {
             var response = await new HttpClient().GetAsync(certificatePath);
             var bytes = await response.Content.ReadAsByteArrayAsync();
-            return new X509Certificate2(bytes);
+            return new(bytes);
         }
 
         public static bool VerifyChain(X509Certificate2 certificate)
         {
             //https://stackoverflow.com/questions/24618798/automated-downloading-of-x509-certificatePath-chain-from-remote-host
 
-            X509Chain certificateChain = new X509Chain();
+            X509Chain certificateChain = new();
             //If you do not provide revokation information, use the following line.
             certificateChain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
             return certificateChain.Build(certificate);

Alexa.NET/Request/Type/ConnectionResponseTypeConverter.cs

@@ -7,7 +7,7 @@ namespace Alexa.NET.Request.Type
 {
     public class ConnectionResponseTypeConverter : IDataDrivenRequestTypeConverter
     {
-        public static List<IConnectionResponseHandler> Handlers = new List<IConnectionResponseHandler>
+        public static List<IConnectionResponseHandler> Handlers = new()
         {
             new AskForRequestHandler()
         };

Alexa.NET/Request/Type/RequestConverter.cs

@@ -9,7 +9,7 @@ namespace Alexa.NET.Request.Type
 {
     public class RequestConverter : JsonConverter
     {
-        public static readonly List<IRequestTypeConverter> RequestConverters = new List<IRequestTypeConverter>(new IRequestTypeConverter[]
+        public static readonly List<IRequestTypeConverter> RequestConverters = new(new IRequestTypeConverter[]
         {
             new DefaultRequestTypeConverter(),
             new AudioPlayerRequestTypeConverter(),

Alexa.NET/Response/AskForPermissionsConsentCard.cs

@@ -15,6 +15,6 @@ public string Type
 
         [JsonProperty("permissions")]
         [JsonRequired]
-        public List<string> Permissions { get; set; } = new List<string>();
+        public List<string> Permissions { get; set; } = new();
     }
 }

Alexa.NET/Response/Converters/CardConverter.cs

@@ -12,7 +12,7 @@ public class CardConverter : JsonConverter
 
         public override bool CanRead => true;
 
-        public static Dictionary<string, Func<ICard>> TypeFactories = new Dictionary<string, Func<ICard>>
+        public static Dictionary<string, Func<ICard>> TypeFactories = new()
         {
             { "Simple", () => new SimpleCard() },
             { "Standard", () => new StandardCard() },
@@ -33,7 +33,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             var hasFactory = TypeFactories.ContainsKey(typeValue);
 
             if (!hasFactory)
-                throw new Exception(
+                throw new(
                     $"unable to deserialize response. " +
                     $"unrecognized card type '{typeValue}'"
                 );

Alexa.NET/Response/Converters/ConnectionTaskConverter.cs

@@ -11,7 +11,7 @@ namespace Alexa.NET.Response.Converters
 {
     public class ConnectionTaskConverter : JsonConverter
     {
-        public static Dictionary<string, Func<IConnectionTask>> TaskFactoryFromUri = new Dictionary<string, Func<IConnectionTask>>
+        public static Dictionary<string, Func<IConnectionTask>> TaskFactoryFromUri = new()
         {
             {"PrintPDFRequest/1",() => new PrintPdfV1() },
             {"PrintImageRequest/1", () => new PrintImageV1() },
@@ -20,7 +20,7 @@ public class ConnectionTaskConverter : JsonConverter
             {"ScheduleFoodEstablishmentReservationRequest/1",() => new ScheduleFoodEstablishmentReservation()}
         };
 
-        public static readonly List<IConnectionTaskConverter> ConnectionTaskConverters = new List<IConnectionTaskConverter>();
+        public static readonly List<IConnectionTaskConverter> ConnectionTaskConverters = new();
 
         public override bool CanRead => true;
         public override bool CanWrite => false;
@@ -49,7 +49,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 // Check task converters
                 var converter = ConnectionTaskConverters.FirstOrDefault(c => c.CanConvert(jsonObject));
                 if(converter is null) 
-                    throw new Exception(
+                    throw new(
                          $"unable to deserialize response. " +
                          $"unrecognized task type '{typeKey}' with version '{versionKey}'"
                      );

Alexa.NET/Response/Converters/DirectiveConverter.cs

@@ -12,7 +12,7 @@ public class DirectiveConverter : JsonConverter
 
         public override bool CanWrite => false;
 
-        public static Dictionary<string, Func<IDirective>> TypeFactories = new Dictionary<string, Func<IDirective>>
+        public static Dictionary<string, Func<IDirective>> TypeFactories = new()
         {
             { "AudioPlayer.Play", () => new AudioPlayerPlayDirective() },
             { "AudioPlayer.ClearQueue", () => new ClearQueueDirective() },
@@ -30,7 +30,7 @@ public class DirectiveConverter : JsonConverter
         };
 
         public static Dictionary<string, Func<JObject, IDirective>> DataDrivenTypeFactory =
-            new Dictionary<string, Func<JObject, IDirective>>
+            new()
             {
                 {"Connections.SendRequest", ConnectionSendRequestFactory.Create}
             };

Alexa.NET/Response/Converters/OutputSpeechConverter.cs

@@ -12,7 +12,7 @@ public class OutputSpeechConverter : JsonConverter
 
         public override bool CanWrite => false;
 
-        public static Dictionary<string, Func<IOutputSpeech>> TypeFactories = new Dictionary<string, Func<IOutputSpeech>>
+        public static Dictionary<string, Func<IOutputSpeech>> TypeFactories = new()
         {
             { "SSML", () => new SsmlOutputSpeech() },
             { "PlainText", () => new PlainTextOutputSpeech() },
@@ -31,7 +31,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             var hasFactory = TypeFactories.ContainsKey(typeValue);
 
             if (!hasFactory)
-                throw new Exception(
+                throw new(
                     $"unable to deserialize response. " +
                     $"unrecognized output speech type '{typeValue}'"
                 );

Alexa.NET/Response/Converters/TemplateConverter.cs

@@ -14,7 +14,7 @@ public class TemplateConverter : JsonConverter
 
         public override bool CanWrite => false;
 
-        public static Dictionary<string, Func<ITemplate>> TypeFactories = new Dictionary<string, Func<ITemplate>>
+        public static Dictionary<string, Func<ITemplate>> TypeFactories = new()
         {
             { "BodyTemplate1", () => new BodyTemplate1() },
             { "BodyTemplate2", () => new BodyTemplate2() },
@@ -38,7 +38,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             var hasFactory = TypeFactories.ContainsKey(typeValue);
 
             if (!hasFactory)
-                throw new Exception(
+                throw new(
                     $"unable to deserialize response. " +
                     $"unrecognized template type '{typeValue}'"
                 );

Alexa.NET/Response/Directive/AskForPermissionDirective.cs

@@ -9,7 +9,7 @@ public AskForPermissionDirective()
 
         public AskForPermissionDirective(string permissionScope)
         {
-            this.Payload = new AskForPermissionPayload(permissionScope);
+            this.Payload = new(permissionScope);
         }
     }
 }

Alexa.NET/Response/Directive/AudioItemMetadata.cs

@@ -12,9 +12,9 @@ public class AudioItemMetadata
 		public string Subtitle { get; set; }
 
 		[JsonProperty("art")]
-		public AudioItemSources Art { get; set; } = new AudioItemSources();
+		public AudioItemSources Art { get; set; } = new();
 
 		[JsonProperty("backgroundImage")]
-		public AudioItemSources BackgroundImage { get; set; } = new AudioItemSources();
+		public AudioItemSources BackgroundImage { get; set; } = new();
     }
 }

Alexa.NET/Response/Directive/AudioItemSources.cs

@@ -6,6 +6,6 @@ namespace Alexa.NET.Response.Directive
     public class AudioItemSources
     {
 		[JsonProperty("sources")]
-		public List<AudioItemSource> Sources { get; set; } = new List<AudioItemSource>();
+		public List<AudioItemSource> Sources { get; set; } = new();
     }
 }

Alexa.NET/Response/Directive/CompleteTaskDirective.cs

@@ -12,7 +12,7 @@ public CompleteTaskDirective() { }
 
         public CompleteTaskDirective(int statusCode, string statusMessage)
         {
-            Status = new ConnectionStatus(statusCode,statusMessage);
+            Status = new(statusCode,statusMessage);
         }
 
         [JsonProperty("type")]

Alexa.NET/Response/Directive/ConnectionsSendRequestFactory.cs

@@ -7,7 +7,7 @@ namespace Alexa.NET.Response.Directive
 {
     public static class ConnectionSendRequestFactory
     {
-        public static List<IConnectionSendRequestHandler> Handlers = new List<IConnectionSendRequestHandler>
+        public static List<IConnectionSendRequestHandler> Handlers = new()
         {
             new AskForPermissionDirectiveHandler()
         };

Alexa.NET/Response/Directive/DialogUpdateDynamicEntities.cs

@@ -13,6 +13,6 @@ public class DialogUpdateDynamicEntities : IDirective
         public UpdateBehavior UpdateBehavior { get; set; }
 
         [JsonProperty("types")]
-        public List<SlotType> Types { get; set; } = new List<SlotType>();
+        public List<SlotType> Types { get; set; } = new();
     }
 }

Alexa.NET/Response/Directive/HintDirective.cs

@@ -11,7 +11,7 @@ public HintDirective()
 
         public HintDirective(string hintText, string textType = TextType.Plain)
         {
-            Hint = new Hint(hintText, textType);
+            Hint = new(hintText, textType);
         }
 
         [JsonProperty("type")]

Alexa.NET/Response/Directive/JsonDirective.cs

@@ -18,6 +18,6 @@ public JsonDirective(string type)
         public string Type { get; }
 
         [JsonExtensionData]
-        public Dictionary<string, object> Properties { get; set; } = new Dictionary<string, object>();
+        public Dictionary<string, object> Properties { get; set; } = new();
     }
 }

Alexa.NET/Response/Directive/Templates/TemplateImage.cs

@@ -9,6 +9,6 @@ public class TemplateImage
         public string ContentDescription { get; set; }
 
         [JsonProperty("sources")]
-        public List<ImageSource> Sources {get;set;} = new List<ImageSource>();
+        public List<ImageSource> Sources {get;set;} = new();
     }
 }

Alexa.NET/Response/Directive/Templates/Types/ListTemplate1.cs

@@ -20,7 +20,7 @@ public class ListTemplate1:IListTemplate
         [JsonProperty("backgroundImage", NullValueHandling = NullValueHandling.Ignore)]
         public TemplateImage BackgroundImage { get; set; }
 
-        public List<ListItem> Items { get; set; } = new List<ListItem>();
+        public List<ListItem> Items { get; set; } = new();
 
         public bool ShouldSerializeItems()
         {

Alexa.NET/Response/Directive/Templates/Types/ListTemplate2.cs

@@ -20,7 +20,7 @@ public class ListTemplate2:IListTemplate
         [JsonProperty("backgroundImage", NullValueHandling = NullValueHandling.Ignore)]
         public TemplateImage BackgroundImage { get; set; }
 
-        public List<ListItem> Items { get; set; } = new List<ListItem>();
+        public List<ListItem> Items { get; set; } = new();
 
         public bool ShouldSerializeItems()
         {

Alexa.NET/Response/Directive/VideoAppDirective.cs

@@ -10,7 +10,7 @@ public VideoAppDirective()
 
         public VideoAppDirective(string source)
         {
-            VideoItem = new VideoItem(source);
+            VideoItem = new(source);
         }
 
         [JsonProperty("type")]

Alexa.NET/Response/ProgressiveResponse.cs

@@ -22,7 +22,7 @@ public static bool IsSupported(SkillRequest request)
         }
 
 
-        public ProgressiveResponse(SkillRequest request) : this(request, new HttpClient())
+        public ProgressiveResponse(SkillRequest request) : this(request, new())
         {
 
         }
@@ -34,7 +34,7 @@ public ProgressiveResponse(SkillRequest request,HttpClient client) : this(
         {
         }
 
-        public ProgressiveResponse(string requestId, string authToken, string baseAddress):this(requestId,authToken,baseAddress,new HttpClient())
+        public ProgressiveResponse(string requestId, string authToken, string baseAddress):this(requestId,authToken,baseAddress,new())
         {
 
         }
@@ -44,17 +44,17 @@ public ProgressiveResponse(string requestId, string authToken,string baseAddress
             Client = client;
             if (!string.IsNullOrWhiteSpace(baseAddress))
             {
-                Client.BaseAddress = new Uri(baseAddress, UriKind.Absolute);
+                Client.BaseAddress = new(baseAddress, UriKind.Absolute);
             }
 
             if (!string.IsNullOrWhiteSpace(authToken))
             {
-                Client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", authToken);
+                Client.DefaultRequestHeaders.Authorization = new("Bearer", authToken);
             }
 
             if (!string.IsNullOrWhiteSpace(requestId))
             {
-                Header = new ProgressiveResponseHeader(requestId);
+                Header = new(requestId);
             }
         }
 

Alexa.NET/Response/Ssml/AmazonDomain.cs

@@ -9,7 +9,7 @@ public class AmazonDomain : ICommonSsml
     {
         public string Name { get; set; }
 
-        public List<ISsml> Elements { get; set; } = new List<ISsml>();
+        public List<ISsml> Elements { get; set; } = new();
 
         public AmazonDomain(string name)
         {