.NET 7 Support (#29)

DominiqueBlomsma · web-flow · commit 92e86dace7a0 · 2023-01-02T15:02:39.000+01:00
* Updated project files to support .NET 7

* Code cleanup and warning fixes

* Updated dotnet-version of workflows

* Removed duplicate `PackageVersion` property
diff --git a/.github/workflows/dotnet.pr.yml b/.github/workflows/dotnet.pr.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Build XUMM.NET.SDK
       run: dotnet build --configuration Release ./src/XUMM.NET.SDK/XUMM.NET.SDK.csproj
     - name: Build XUMM.NET.SDK.Webhooks
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - uses: nuget/setup-nuget@v1
       with:
         nuget-api-key: ${{ secrets.NUGET_APIKEY }}
diff --git a/examples/XUMM.NET.WebApp/Pages/Error.cshtml.cs b/examples/XUMM.NET.WebApp/Pages/Error.cshtml.cs
@@ -1,28 +1,16 @@
+using System.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace XUMM.NET.WebApp.Pages
 {
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     public class ErrorModel : PageModel
     {
-        public string RequestId { get; set; }
+        public string RequestId { get; set; } = default!;
 
         public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 
-        private readonly ILogger<ErrorModel> _logger;
-
-        public ErrorModel(ILogger<ErrorModel> logger)
-        {
-            _logger = logger;
-        }
-
         public void OnGet()
         {
             RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
diff --git a/examples/XUMM.NET.WebApp/Pages/Index.cshtml.cs b/examples/XUMM.NET.WebApp/Pages/Index.cshtml.cs
@@ -1,16 +1,8 @@
 ﻿using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.Extensions.Logging;
 
 namespace XUMM.NET.WebApp.Pages
 {
     public class IndexModel : PageModel
     {
-        public IndexModel()
-        {
-        }
-
-        public void OnGet()
-        {
-        }
     }
 }
diff --git a/examples/XUMM.NET.WebApp/Pages/PingPong.cshtml.cs b/examples/XUMM.NET.WebApp/Pages/PingPong.cshtml.cs
@@ -1,7 +1,7 @@
-﻿using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-using System;
+﻿using System;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using XUMM.NET.SDK;
 using XUMM.NET.SDK.Clients.Interfaces;
 using XUMM.NET.SDK.Models.Misc;
@@ -10,13 +10,13 @@ namespace XUMM.NET.WebApp.Pages
 {
     public class PingPongModel : PageModel
     {
-        public XummPong Pong { get; set; }
+        public XummPong? Pong { get; set; }
 
         [BindProperty]
-        public string ApiKey { get; set; }
+        public string ApiKey { get; set; } = default!;
 
         [BindProperty]
-        public string ApiSecret { get; set; }
+        public string ApiSecret { get; set; } = default!;
 
         public string? ErrorMessage { get; set; }
 
diff --git a/examples/XUMM.NET.WebApp/Program.cs b/examples/XUMM.NET.WebApp/Program.cs
@@ -1,11 +1,5 @@
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace XUMM.NET.WebApp
 {
diff --git a/examples/XUMM.NET.WebApp/XUMM.NET.WebApp.csproj b/examples/XUMM.NET.WebApp/XUMM.NET.WebApp.csproj
@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
+	<ItemGroup>
     <ProjectReference Include="..\..\src\XUMM.NET.SDK.Webhooks\XUMM.NET.SDK.Webhooks.csproj" />
     <ProjectReference Include="..\..\src\XUMM.NET.SDK\XUMM.NET.SDK.csproj" />
   </ItemGroup>
diff --git a/examples/XUMM.Net.ServerApp/XUMM.Net.ServerApp.csproj b/examples/XUMM.Net.ServerApp/XUMM.Net.ServerApp.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <LangVersion>10.0</LangVersion>
+    <TargetFramework>net7.0</TargetFramework>
+    <LangVersion>11.0</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/src/XUMM.NET.SDK.Tests/XUMM.NET.SDK.Tests.csproj b/src/XUMM.NET.SDK.Tests/XUMM.NET.SDK.Tests.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <LangVersion>10.0</LangVersion>
+    <TargetFramework>net7.0</TargetFramework>
+    <LangVersion>11.0</LangVersion>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -80,11 +80,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/XUMM.NET.SDK.Webhooks.Tests/XUMM.NET.SDK.Webhooks.Tests.csproj b/src/XUMM.NET.SDK.Webhooks.Tests/XUMM.NET.SDK.Webhooks.Tests.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <LangVersion>10.0</LangVersion>
+    <TargetFramework>net7.0</TargetFramework>
+    <LangVersion>11.0</LangVersion>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/XUMM.NET.SDK.Webhooks/XUMM.NET.SDK.Webhooks.csproj b/src/XUMM.NET.SDK.Webhooks/XUMM.NET.SDK.Webhooks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
-    <LangVersion>10.0</LangVersion>
+    <TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+    <LangVersion>11.0</LangVersion>
     <Nullable>enable</Nullable>
     <Authors>Dominique Blomsma</Authors>
     <Description>XUMM .NET SDK Wehooks - Receive webhooks the easy way</Description>
@@ -18,7 +18,6 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <PackageProjectUrl>https://github.com/XRPL-Labs/XUMM.NET.SDK</PackageProjectUrl>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageVersion>$(PackageVersion)</PackageVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageReadmeFile>README_WEBHOOKS.md</PackageReadmeFile>
     <PackageVersion>$(PackageVersion)</PackageVersion>
@@ -40,7 +39,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.8" />
+	  <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
 </Project>
diff --git a/src/XUMM.NET.SDK/Models/Payload/XRPL/XrplPaymentTransaction.cs b/src/XUMM.NET.SDK/Models/Payload/XRPL/XrplPaymentTransaction.cs
@@ -34,7 +34,7 @@ public XrplPaymentTransaction()
     /// <summary>
     /// The unique address of the account receiving the payment.
     /// </summary>
-    public string Destination { get; set; }
+    public string Destination { get; set; } = default!;
 
     /// <summary>
     /// (Optional) Arbitrary tag that identifies the reason for the payment to the destination, or a hosted recipient to pay.
diff --git a/src/XUMM.NET.SDK/Models/Payload/XRPL/XrplTransaction.cs b/src/XUMM.NET.SDK/Models/Payload/XRPL/XrplTransaction.cs
@@ -9,10 +9,10 @@ public class XrplTransaction
     public string? Account { get; set; }
 
     [JsonPropertyName("TransactionType")]
-    public string TransactionType { get; set; }
+    public string TransactionType { get; set; } = default!;
 
     [JsonPropertyName("Fee")]
-    public string Fee { get; set; }
+    public string Fee { get; set; } = default!;
 
     [JsonPropertyName("Sequence")]
     public int? Sequence { get; set; }
diff --git a/src/XUMM.NET.SDK/Models/XApp/XummXAppEventRequest.cs b/src/XUMM.NET.SDK/Models/XApp/XummXAppEventRequest.cs
@@ -2,7 +2,7 @@
 
 namespace XUMM.NET.SDK.Models.XApp;
 
-public  class XummXAppEventRequest : XummXAppPushRequest
+public class XummXAppEventRequest : XummXAppPushRequest
 {
     /// <summary>
     /// Only create the event in the user's Event list, don't send a push notification
diff --git a/src/XUMM.NET.SDK/Models/XApp/XummXAppOttResponse.cs b/src/XUMM.NET.SDK/Models/XApp/XummXAppOttResponse.cs
@@ -32,7 +32,7 @@ public class XummXAppOttResponse
     public XummXAppUserDeviceDataResponse? UserDevice { get; set; }
 
     [JsonPropertyName("account_info")]
-    public XummXAppAccountInfoResponse AccountInfo { get; set; }
+    public XummXAppAccountInfoResponse AccountInfo { get; set; } = default!;
 
     [JsonPropertyName("nodetype")]
     public string? NodeType { get; set; }
diff --git a/src/XUMM.NET.SDK/XUMM.NET.SDK.csproj b/src/XUMM.NET.SDK/XUMM.NET.SDK.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
-    <LangVersion>10.0</LangVersion>
+    <TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+    <LangVersion>11.0</LangVersion>
     <Nullable>enable</Nullable>
     <Authors>Dominique Blomsma</Authors>
     <Description>XUMM .NET SDK - Interact with the XUMM Developer API the easy way</Description>
@@ -19,7 +19,8 @@
     <PackageProjectUrl>https://github.com/XRPL-Labs/XUMM.NET.SDK</PackageProjectUrl>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ComponentsPackageVersion>3.1.23</ComponentsPackageVersion>
-    <ComponentsPackageVersion Condition="'$(TargetFramework)' == 'net6.0' ">6.0.0</ComponentsPackageVersion>
+	<ComponentsPackageVersion Condition="'$(TargetFramework)' == 'net7.0' ">7.0.0</ComponentsPackageVersion>
+	<ComponentsPackageVersion Condition="'$(TargetFramework)' == 'net6.0' ">6.0.0</ComponentsPackageVersion>
     <ComponentsPackageVersion Condition="'$(TargetFramework)' == 'net5.0' ">5.0.0</ComponentsPackageVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageReadmeFile>README.md</PackageReadmeFile>

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,8 @@`
`1`	`1`	`using Microsoft.AspNetCore.Mvc.RazorPages;`
`2`		`-using Microsoft.Extensions.Logging;`
`3`	`2`
`4`	`3`	`namespace XUMM.NET.WebApp.Pages`
`5`	`4`	`{`
`6`	`5`	`public class IndexModel : PageModel`
`7`	`6`	`{`
`8`		`- public IndexModel()`
`9`		`- {`
`10`		`- }`
`11`		`-`
`12`		`- public void OnGet()`
`13`		`- {`
`14`		`- }`
`15`	`7`	`}`
`16`	`8`	`}`