VIH-10125 upgrade dotnet 8 (#1384)

* upgrade .net 8 * disable central package management * move away from obsolete notification api methods
hmcts · May 22, 2024 · 6c0d965 · 6c0d965
1 parent 3cf94e8
commit 6c0d965
Show file tree

Hide file tree

Showing 115 changed files with 2,668 additions and 6,006 deletions.
diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/packages.lock.json b/AdminWebsite/AdminWebsite.AcceptanceTests/packages.lock.json
diff --git a/AdminWebsite/AdminWebsite.IntegrationTests/AdminWebsite.IntegrationTests.csproj b/AdminWebsite/AdminWebsite.IntegrationTests/AdminWebsite.IntegrationTests.csproj
@@ -1,14 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <ProjectGuid>F1B76C25-C9A2-4A2E-B946-514C44ECF4CD</ProjectGuid>
-    <LangVersion>latestmajor</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,19 +25,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="3.2.0">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Faker.NETCore" Version="1.0.2" />
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.11" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Moq" Version="4.16.0" />
-    <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.54.0.64047">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="nunit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.25.0.90414">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/AdminWebsite/AdminWebsite.IntegrationTests/GlobalUsings.cs b/AdminWebsite/AdminWebsite.IntegrationTests/GlobalUsings.cs
@@ -0,0 +1,5 @@
+// Global using directives
+
+global using System;
+global using NUnit.Framework;
+global using NUnit.Framework.Legacy;
diff --git a/AdminWebsite/AdminWebsite.IntegrationTests/Helper/ApiUriFactory.cs b/AdminWebsite/AdminWebsite.IntegrationTests/Helper/ApiUriFactory.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Testing.Common
+namespace Testing.Common
 {
     public class ApiUriFactory
     {

diff --git a/AdminWebsite/AdminWebsite.IntegrationTests/Helper/BearerTokenBuilder.cs b/AdminWebsite/AdminWebsite.IntegrationTests/Helper/BearerTokenBuilder.cs
@@ -1,5 +1,4 @@
 using Microsoft.IdentityModel.Tokens;
-using System;
 using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;

diff --git a/AdminWebsite/AdminWebsite.IntegrationTests/Helper/MockBackchannel.cs b/AdminWebsite/AdminWebsite.IntegrationTests/Helper/MockBackchannel.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Net.Http;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 

diff --git a/AdminWebsite/AdminWebsite.IntegrationTests/Services/ApplicationLoggerTests.cs b/AdminWebsite/AdminWebsite.IntegrationTests/Services/ApplicationLoggerTests.cs
@@ -1,8 +1,6 @@
-using System;
 using System.Collections.Generic;
 using System.Security.Claims;
 using AdminWebsite.Services;
-using NUnit.Framework;
 
 namespace AdminWebsite.IntegrationTests.Services
 {
@@ -19,15 +17,15 @@ public class ApplicationLoggerTests
         public void Should_trace_without_failure()
         {
             ApplicationLogger.Trace("Category", "Title", "Information");
-            Assert.IsTrue(true);
+            ClassicAssert.IsTrue(true);
         }
 
         [Test]
         public void Should_trace_without_or_without_properties()
         {
             ApplicationLogger.TraceWithProperties("Category", "Title", "User", null);
             ApplicationLogger.TraceWithProperties("Category", "Title", "User", new Dictionary<string, string>{ {"property", "value"} });
-            Assert.IsTrue(true);
+            ClassicAssert.IsTrue(true);
         }
 
         [Test]
@@ -39,13 +37,13 @@ public void Should_trace_without_or_without_object()
                 Property = "value"
             };
             ApplicationLogger.TraceWithObject("Category", "Title", "User", someObject);
-            Assert.IsTrue(true);
+            ClassicAssert.IsTrue(true);
         }
 
         [Test]
         public void Should_throw_exception_if_trying_to_trace_null_exception()
         {
-            Assert.Throws<ArgumentNullException>(
+            ClassicAssert.Throws<ArgumentNullException>(
                 () => ApplicationLogger.TraceException("Category", "Title", null, null));
         }
 
@@ -59,7 +57,7 @@ public void Should_trace_exception()
             ApplicationLogger.TraceException("Category", "Title", exception, null, null);
             ApplicationLogger.TraceException("Category", "Title", exception, null, properties);
             ApplicationLogger.TraceException("Category", "Title", exception, null);
-            Assert.IsTrue(true);
+            ClassicAssert.IsTrue(true);
         }
 
         [Test]
@@ -68,14 +66,14 @@ public void Should_trace_event()
             var properties = new Dictionary<string, string> {{"property", "value"}};
             ApplicationLogger.TraceEvent("Title", properties);
             ApplicationLogger.TraceEvent("Title", null);
-            Assert.IsTrue(true);
+            ClassicAssert.IsTrue(true);
         }
 
         [Test]
         public void Should_trace_result()
         {
             ApplicationLogger.TraceRequest("Operation", DateTimeOffset.Now, TimeSpan.FromSeconds(2), "200", true);
-            Assert.IsTrue(true);
+            ClassicAssert.IsTrue(true);
         }
     }
 }
diff --git a/AdminWebsite/AdminWebsite.IntegrationTests/Services/UkPublicHolidayRetrieverTests.cs b/AdminWebsite/AdminWebsite.IntegrationTests/Services/UkPublicHolidayRetrieverTests.cs
@@ -1,11 +1,9 @@
-using System;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using AdminWebsite.Services;
 using FluentAssertions;
 using Microsoft.Extensions.Caching.Memory;
-using NUnit.Framework;
 
 namespace AdminWebsite.IntegrationTests.Services
 {
@@ -32,7 +30,7 @@ public async Task should_return_upcoming_holidays()
         {
             var result = await _sut.RetrieveUpcomingHolidays();
 
-            result.Any(x => x.Date < DateTime.Today).Should().BeFalse();
+            result.Exists(x => x.Date < DateTime.Today).Should().BeFalse();
         }
     }
 }
diff --git a/AdminWebsite/AdminWebsite.IntegrationTests/Services/UserAccountServiceTests.cs b/AdminWebsite/AdminWebsite.IntegrationTests/Services/UserAccountServiceTests.cs
@@ -1,7 +1,6 @@
 using AdminWebsite.Services;
 using FluentAssertions;
 using Moq;
-using NUnit.Framework;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using BookingsApi.Client;