Upgrade to net7 and fix compile errors (DevBetterCom#964)

DevBetterWeb.sln

@@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		efscripts.txt = efscripts.txt
+		global.json = global.json
 		README.md = README.md
 	EndProjectSection
 EndProject

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "7.0.100",
     "rollForward": "latestFeature"
   }
 }

src/DevBetterWeb.Core/DevBetterWeb.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>DevBetterWeb.Core</AssemblyName>
     <PackageId>DevBetterWeb.Core</PackageId>
     <LangVersion>latest</LangVersion>

src/DevBetterWeb.Infrastructure/DevBetterWeb.Infrastructure.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>DevBetterWeb.Infrastructure</AssemblyName>
     <PackageId>DevBetterWeb.Infrastructure</PackageId>
     <LangVersion>latest</LangVersion>

src/DevBetterWeb.Infrastructure/Handlers/NotifyOnNewMemberCreatedAndProfileUpdatedHandler.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using DevBetterWeb.Core;
 using DevBetterWeb.Core.Events;
+using DevBetterWeb.Core.Exceptions;
 using DevBetterWeb.Core.Interfaces;
 using DevBetterWeb.Infrastructure.Identity.Data;
 using Microsoft.AspNetCore.Identity;
@@ -25,7 +26,8 @@ public async Task Handle(NewMemberCreatedAndProfileUpdatedEvent domainEvent)
     var usersInAdminRole = await _userManager.GetUsersInRoleAsync(AuthConstants.Roles.ADMINISTRATORS);
 
     var newMemberUser = await _userManager.FindByIdAsync(domainEvent.Member.UserId);
-    string newMemberEmail = await _userManager.GetEmailAsync(newMemberUser);
+		if (newMemberUser is null) throw new UserNotFoundException(domainEvent.Member.UserId);
+    string? newMemberEmail = await _userManager.GetEmailAsync(newMemberUser!);
 
     foreach (var emailAddress in usersInAdminRole.Select(user => user.Email))
     {
@@ -38,7 +40,7 @@ public async Task Handle(NewMemberCreatedAndProfileUpdatedEvent domainEvent)
         message = message + $"\n    {subscription.Dates.StartDate} to {subscription.Dates.EndDate}";
       }
       message = message + $"\nView {domainEvent.Member.FirstName}'s profile at: https://devbetter.com/User/Details/ {domainEvent.Member.UserId}";
-      await _emailService.SendEmailAsync(emailAddress, subject, message);
+      await _emailService.SendEmailAsync(emailAddress!, subject, message);
     }
   }
 }

src/DevBetterWeb.Infrastructure/Handlers/NotifyOnNewMemberCreatedHandler.cs

@@ -27,8 +27,8 @@ public async Task Handle(NewMemberCreatedEvent domainEvent)
     foreach (var emailAddress in usersInAdminRole.Select(user => user.Email))
     {
       string subject = $"[devBetter] New Member {domainEvent.Member.UserFullName()}";
-      string message = $"A new Member with id {domainEvent.Member.UserId} has signed up and added their membership profile.";
-      await _emailService.SendEmailAsync(emailAddress, subject, message);
+      string message = $"A new Member with id {domainEvent.Member.UserId} and email address {emailAddress!} has signed up and added their membership profile.";
+      await _emailService.SendEmailAsync(emailAddress!, subject, message);
     }
   }
 }

src/DevBetterWeb.Infrastructure/Identity/Data/AppIdentityDbContextSeed.cs

@@ -30,6 +30,7 @@ private static async Task<ApplicationUser> CreateUser(UserManager<ApplicationUse
   {
     var user = new ApplicationUser { UserName = userName, Email = userName, EmailConfirmed = true, DateCreated = DateTime.UtcNow };
     await userManager.CreateAsync(user, AuthConstants.DEFAULT_PASSWORD);
-    return await userManager.FindByNameAsync(userName);
+		var newUser = await userManager.FindByNameAsync(userName!);
+		return newUser!;
   }
 }

src/DevBetterWeb.Infrastructure/Services/AspNetCoreIdentityUserEmailConfirmationService.cs

@@ -30,7 +30,7 @@ public async Task UpdateUserEmailConfirmationAsync(string userId, bool isEmailCo
 
     await _userManager.UpdateAsync(user);
 
-    var userEmailConfirmedChangedEvent = new UserEmailConfirmedChangedEvent(user.Email, isEmailConfirmed);
+    var userEmailConfirmedChangedEvent = new UserEmailConfirmedChangedEvent(user!.Email!, isEmailConfirmed);
     await _dispatcher.Dispatch(userEmailConfirmedChangedEvent);
   }
 }

src/DevBetterWeb.Infrastructure/Services/AspNetCoreIdentityUserRoleMembershipService.cs

@@ -34,15 +34,16 @@ public async Task AddUserToRoleAsync(string userId, string roleId)
     var role = await _roleManager.Roles.FirstOrDefaultAsync(x => x.Id == roleId);
     if (role == null) throw new RoleNotFoundException(roleId);
 
-    await _userManager.AddToRoleAsync(user, role.Name);
+    await _userManager.AddToRoleAsync(user, role.Name!);
 
-    var userAddedToRoleEvent = new UserAddedToRoleEvent(user.Email, role.Name);
+    var userAddedToRoleEvent = new UserAddedToRoleEvent(user!.Email!, role.Name!);
     await _dispatcher.Dispatch(userAddedToRoleEvent);
   }
 
   public async Task AddUserToRoleByRoleNameAsync(string userId, string roleName)
   {
     var role = await _roleManager.FindByNameAsync(roleName);
+		if (role is null) throw new RoleNotFoundException(roleName);
     var roleId = role.Id;
 
     await AddUserToRoleAsync(userId, roleId);
@@ -57,11 +58,11 @@ public async Task RemoveUserFromRoleAsync(string userId, string roleId)
     if (role == null) throw new RoleNotFoundException(roleId);
 
     // check if user is in role?
-    if (await _userManager.IsInRoleAsync(user, role.Name))
+    if (await _userManager.IsInRoleAsync(user, role.Name!))
     {
-      await _userManager.RemoveFromRoleAsync(user, role.Name);
+      await _userManager.RemoveFromRoleAsync(user, role!.Name!);
 
-      var userRemovedFromRoleEvent = new UserRemovedFromRoleEvent(user.Email, role.Name);
+      var userRemovedFromRoleEvent = new UserRemovedFromRoleEvent(user!.Email!, role.Name!);
       await _dispatcher.Dispatch(userRemovedFromRoleEvent);
     }
     else
@@ -73,6 +74,7 @@ public async Task RemoveUserFromRoleAsync(string userId, string roleId)
   public async Task RemoveUserFromRoleByRoleNameAsync(string userId, string roleName)
   {
     var role = await _roleManager.FindByNameAsync(roleName);
+		if (role is null) throw new RoleNotFoundException(roleName);
     var roleId = role.Id;
 
     await RemoveUserFromRoleAsync(userId, roleId);

src/DevBetterWeb.Infrastructure/Services/DailyCheckPingService.cs

@@ -117,7 +117,7 @@ public async Task PingAdminsAboutAlmostAlumsIfNeeded(AppendOnlyStringList messag
 
       foreach (var user in usersInAdminRole)
       {
-        await _emailService.SendEmailAsync(user.Email, "Upcoming DevBetter Graduation", $"Ensure that the following member(s)'s subscriptions are not renewed, as they will graduate to alumni status in {DAYS_BEFORE_GRADUATION_TO_PING} days:\n {listOfMembersToPingAdminsAbout}");
+        await _emailService.SendEmailAsync(user.Email!, "Upcoming DevBetter Graduation", $"Ensure that the following member(s)'s subscriptions are not renewed, as they will graduate to alumni status in {DAYS_BEFORE_GRADUATION_TO_PING} days:\n {listOfMembersToPingAdminsAbout}");
       }
 
       messages.Append($"Admins have been reminded not to renew the subscriptions of the following members about to graduate: {listOfMembersToPingAdminsAbout}");
@@ -202,7 +202,7 @@ private async Task<string> SendAdminPing(List<Invitation> invitations)
 
     foreach (var user in usersInAdminRole)
     {
-      await _emailService.SendEmailAsync(user.Email, emailSubject, emailBody);
+      await _emailService.SendEmailAsync(user!.Email!, emailSubject, emailBody);
       listOfEmailsAdminsWereRemindedAbout += $"{user.Email}\n";
     }
 

src/DevBetterWeb.Infrastructure/Services/DefaultUserRoleManagerService.cs

@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using DevBetterWeb.Core;
+using DevBetterWeb.Core.Exceptions;
 using DevBetterWeb.Core.Interfaces;
 using DevBetterWeb.Infrastructure.Identity.Data;
 using Microsoft.AspNetCore.Identity;
@@ -18,6 +19,7 @@ public DefaultUserRoleManagerService(UserManager<ApplicationUser> userManager)
   public async Task AddUserToRoleAsync(string userId, string roleName)
   {
     var user = await _userManager.FindByIdAsync(userId);
+		if (user is null) throw new UserNotFoundException(userId);
     await _userManager.AddToRoleAsync(user, Constants.ALUMNI_ROLE_NAME);
   }
 }

src/DevBetterWeb.Infrastructure/Services/GraduationCommunicationsService.cs

@@ -34,7 +34,7 @@ public async Task SendGraduationCommunications(Member member)
 
     foreach (var emailAddress in usersInAdminRole.Select(user => user.Email))
     {
-      await _emailService.SendEmailAsync(emailAddress, adminSubject, adminText);
+      await _emailService.SendEmailAsync(emailAddress!, adminSubject, adminText);
     }
   }
 }

src/DevBetterWeb.Infrastructure/Services/MemberSubscriptionEndedAdminEmailService.cs

@@ -36,7 +36,7 @@ public async Task SendMemberSubscriptionEndedEmailAsync(string customerEmail, Me
 
     foreach (var emailAddress in usersInAdminRole.Select(user => user.Email))
     {
-      await _emailService.SendEmailAsync(emailAddress, subject, message);
+      await _emailService.SendEmailAsync(emailAddress!, subject, message);
     }
   }
 

src/DevBetterWeb.Vimeo/DevBetterWeb.Vimeo.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/DevBetterWeb.Web/DevBetterWeb.Web.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>DevBetterWeb.Web</AssemblyName>
     <OutputType>Exe</OutputType>

tests/DevBetterWeb.FunctionalTests/DevBetterWeb.FunctionalTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>

tests/DevBetterWeb.Tests/DevBetterWeb.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>

tests/DevBetterWeb.UnitTests/DevBetterWeb.UnitTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

tests/DevBetterWeb.Vimeo.Tests/DevBetterWeb.Vimeo.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>