EHD-457: Upgrade .Net: Remove unused imports & redundant type qualifiers

cabinetoffice · Dec 4, 2024 · b2d4806 · b2d4806
1 parent c38ee84
commit b2d4806
Show file tree

Hide file tree

Showing 349 changed files with 430 additions and 997 deletions.
diff --git a/GenderPayGap.Core/Classes/Logger/CustomLogger.cs b/GenderPayGap.Core/Classes/Logger/CustomLogger.cs
@@ -1,5 +1,4 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Serilog;
 
 namespace GenderPayGap.Core.Classes.Logger

diff --git a/GenderPayGap.Core/Enums.cs b/GenderPayGap.Core/Enums.cs
@@ -1,5 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 using System.Reflection;
 
 namespace GenderPayGap.Core

diff --git a/GenderPayGap.Core/Extensions/AspNetCore/Config.cs b/GenderPayGap.Core/Extensions/AspNetCore/Config.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Globalization;
-using System.Linq;
 using Microsoft.Extensions.Configuration;
 
 namespace GenderPayGap.Extensions.AspNetCore

diff --git a/GenderPayGap.Core/Extensions/Encryption.cs b/GenderPayGap.Core/Extensions/Encryption.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Diagnostics;
-using System.IO;
+using System.Diagnostics;
 using System.IO.Compression;
-using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using GenderPayGap.Core;

diff --git a/GenderPayGap.Core/Extensions/VirtualDateTime.cs b/GenderPayGap.Core/Extensions/VirtualDateTime.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace GenderPayGap.Extensions
+namespace GenderPayGap.Extensions
 {
     public static class VirtualDateTime
     {

diff --git a/GenderPayGap.Core/Global.cs b/GenderPayGap.Core/Global.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using GenderPayGap.Extensions.AspNetCore;
+using GenderPayGap.Extensions.AspNetCore;
 using Newtonsoft.Json;
 
 namespace GenderPayGap.Core

diff --git a/GenderPayGap.Core/Helpers/ReportingYearsHelper.cs b/GenderPayGap.Core/Helpers/ReportingYearsHelper.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using GenderPayGap.Extensions;
+using GenderPayGap.Extensions;
 
 namespace GenderPayGap.Core.Helpers
 {

diff --git a/GenderPayGap.Database/Backup/AllData.cs b/GenderPayGap.Database/Backup/AllData.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using GenderPayGap.Database.Models;
+using GenderPayGap.Database.Models;
 using Newtonsoft.Json;
 
 namespace GenderPayGap.Database.Backup

diff --git a/GenderPayGap.Database/GpgDatabaseContext.cs b/GenderPayGap.Database/GpgDatabaseContext.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 using GenderPayGap.Database.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;

diff --git a/GenderPayGap.Database/Models/AuditLog.cs b/GenderPayGap.Database/Models/AuditLog.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using GenderPayGap.Core;
 using Newtonsoft.Json;

diff --git a/GenderPayGap.Database/Models/DraftReturn.cs b/GenderPayGap.Database/Models/DraftReturn.cs
@@ -1,6 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using Newtonsoft.Json;
 
 namespace GenderPayGap.Database.Models

diff --git a/GenderPayGap.Database/Models/Extensions/Organisation.cs b/GenderPayGap.Database/Models/Extensions/Organisation.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using GenderPayGap.Core;
 using GenderPayGap.Core.Helpers;
 using GenderPayGap.Extensions;

diff --git a/GenderPayGap.Database/Models/Extensions/OrganisationAddress.cs b/GenderPayGap.Database/Models/Extensions/OrganisationAddress.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace GenderPayGap.Database
 {
     public static class OrganisationAddressExtensions

diff --git a/GenderPayGap.Database/Models/Extensions/Return.cs b/GenderPayGap.Database/Models/Extensions/Return.cs
@@ -1,4 +1,3 @@
-using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using GenderPayGap.Core;
 using GenderPayGap.Core.Helpers;

diff --git a/GenderPayGap.Database/Models/Extensions/User.cs b/GenderPayGap.Database/Models/Extensions/User.cs
@@ -1,7 +1,5 @@
-using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics;
-using System.Linq;
 using System.Security.Cryptography;
 using GenderPayGap.Core;
 using GenderPayGap.Extensions;

diff --git a/GenderPayGap.Database/Models/Extensions/UserOrganisation.cs b/GenderPayGap.Database/Models/Extensions/UserOrganisation.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using GenderPayGap.Core;
 using GenderPayGap.Extensions;
 

diff --git a/GenderPayGap.Database/Models/Feedback.cs b/GenderPayGap.Database/Models/Feedback.cs
@@ -1,4 +1,3 @@
-using System;
 using System.ComponentModel.DataAnnotations;
 using GenderPayGap.Core;
 using Newtonsoft.Json;

diff --git a/GenderPayGap.Database/Models/InactiveUserOrganisation.cs b/GenderPayGap.Database/Models/InactiveUserOrganisation.cs
@@ -1,5 +1,4 @@
-using System;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Extensions;
 using Newtonsoft.Json;
 

diff --git a/GenderPayGap.Database/Models/Organisation.cs b/GenderPayGap.Database/Models/Organisation.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Extensions;
 using Newtonsoft.Json;
 

diff --git a/GenderPayGap.Database/Models/OrganisationAddress.cs b/GenderPayGap.Database/Models/OrganisationAddress.cs
@@ -1,5 +1,4 @@
-using System;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Extensions;
 using Newtonsoft.Json;
 

diff --git a/GenderPayGap.Database/Models/OrganisationName.cs b/GenderPayGap.Database/Models/OrganisationName.cs
@@ -1,5 +1,4 @@
-using System;
-using GenderPayGap.Extensions;
+using GenderPayGap.Extensions;
 using Newtonsoft.Json;
 
 namespace GenderPayGap.Database

diff --git a/GenderPayGap.Database/Models/OrganisationPublicSectorType.cs b/GenderPayGap.Database/Models/OrganisationPublicSectorType.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using GenderPayGap.Extensions;
 using Newtonsoft.Json;
 

diff --git a/GenderPayGap.Database/Models/OrganisationScope.cs b/GenderPayGap.Database/Models/OrganisationScope.cs
@@ -1,5 +1,4 @@
-using System;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Extensions;
 using Newtonsoft.Json;
 

diff --git a/GenderPayGap.Database/Models/OrganisationSicCode.cs b/GenderPayGap.Database/Models/OrganisationSicCode.cs
@@ -1,5 +1,4 @@
-using System;
-using GenderPayGap.Extensions;
+using GenderPayGap.Extensions;
 using Newtonsoft.Json;
 
 namespace GenderPayGap.Database

diff --git a/GenderPayGap.Database/Models/OrganisationStatus.cs b/GenderPayGap.Database/Models/OrganisationStatus.cs
@@ -1,5 +1,4 @@
-using System;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Extensions;
 using Newtonsoft.Json;
 

diff --git a/GenderPayGap.Database/Models/PublicSectorType.cs b/GenderPayGap.Database/Models/PublicSectorType.cs
@@ -1,5 +1,4 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace GenderPayGap.Database
 {

diff --git a/GenderPayGap.Database/Models/ReminderEmail.cs b/GenderPayGap.Database/Models/ReminderEmail.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations.Schema;
 using GenderPayGap.Core;
 using Newtonsoft.Json;
 

diff --git a/GenderPayGap.Database/Models/Return.cs b/GenderPayGap.Database/Models/Return.cs
@@ -1,5 +1,4 @@
-using System;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Extensions;
 using Newtonsoft.Json;
 

diff --git a/GenderPayGap.Database/Models/SicCode.cs b/GenderPayGap.Database/Models/SicCode.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace GenderPayGap.Database
 {

diff --git a/GenderPayGap.Database/Models/SicSection.cs b/GenderPayGap.Database/Models/SicSection.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace GenderPayGap.Database
 {

diff --git a/GenderPayGap.Database/Models/User.cs b/GenderPayGap.Database/Models/User.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Database.Models;
 using GenderPayGap.Extensions;
 using Newtonsoft.Json;

diff --git a/GenderPayGap.Database/Models/UserOrganisation.cs b/GenderPayGap.Database/Models/UserOrganisation.cs
@@ -1,5 +1,4 @@
-using System;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Extensions;
 using Newtonsoft.Json;
 

diff --git a/GenderPayGap.Database/Models/UserStatus.cs b/GenderPayGap.Database/Models/UserStatus.cs
@@ -1,5 +1,4 @@
-using System;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Extensions;
 using Newtonsoft.Json;
 

diff --git a/GenderPayGap.UnitTests/GenderPayGap.WebUI.Tests/Builders/ControllerBuilder.cs b/GenderPayGap.UnitTests/GenderPayGap.WebUI.Tests/Builders/ControllerBuilder.cs
@@ -1,4 +1,3 @@
-using System.ComponentModel;
 using System.Security.Claims;
 using GenderPayGap.Core.Classes;
 using GenderPayGap.Core.Interfaces;

diff --git a/GenderPayGap.UnitTests/GenderPayGap.WebUI.Tests/Builders/OrganisationBuilder.cs b/GenderPayGap.UnitTests/GenderPayGap.WebUI.Tests/Builders/OrganisationBuilder.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Core.Helpers;
 using GenderPayGap.Database;
 using GenderPayGap.Extensions;

diff --git a/GenderPayGap.UnitTests/GenderPayGap.WebUI.Tests/Builders/UserBuilder.cs b/GenderPayGap.UnitTests/GenderPayGap.WebUI.Tests/Builders/UserBuilder.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Database;
 using GenderPayGap.Extensions;
 using GenderPayGap.WebUI.Helpers;

diff --git a/GenderPayGap.UnitTests/GenderPayGap.WebUI.Tests/Builders/UserOrganisationBuilder.cs b/GenderPayGap.UnitTests/GenderPayGap.WebUI.Tests/Builders/UserOrganisationBuilder.cs
@@ -1,5 +1,4 @@
-using System;
-using GenderPayGap.Database;
+using GenderPayGap.Database;
 using GenderPayGap.Extensions;
 
 namespace GenderPayGap.WebUI.Tests.Builders

diff --git a/...I.Tests/BusinessLogicTests/Repositories/RegistrationRepository/RemoveRegistrationTests.cs b/...I.Tests/BusinessLogicTests/Repositories/RegistrationRepository/RemoveRegistrationTests.cs
@@ -1,13 +1,9 @@
-using System.Linq;
-using GenderPayGap.Core.Classes;
+using GenderPayGap.Core.Classes;
 using GenderPayGap.Core.Interfaces;
 using GenderPayGap.Database;
-using GenderPayGap.Extensions;
-using GenderPayGap.Tests.Common.Classes;
 using GenderPayGap.WebUI.Services;
 using GenderPayGap.WebUI.Tests.TestHelpers;
 using Moq;
-using NUnit.Framework;
 
 namespace Repositories.RegistrationRepository
 {

diff --git a/...nessLogicTests/Repositories/RegistrationRepository/RemoveRetiredUserRegistrationsTests.cs b/...nessLogicTests/Repositories/RegistrationRepository/RemoveRetiredUserRegistrationsTests.cs
@@ -1,13 +1,9 @@
-using System.Linq;
-using GenderPayGap.Core.Classes;
+using GenderPayGap.Core.Classes;
 using GenderPayGap.Core.Interfaces;
 using GenderPayGap.Database;
-using GenderPayGap.Extensions;
-using GenderPayGap.Tests.Common.Classes;
 using GenderPayGap.WebUI.Services;
 using GenderPayGap.WebUI.Tests.TestHelpers;
 using Moq;
-using NUnit.Framework;
 
 namespace Repositories.UserRepository
 {

diff --git a/...erPayGap.WebUI.Tests/BusinessLogicTests/Repositories/UserRepository/CheckPasswordTests.cs b/...erPayGap.WebUI.Tests/BusinessLogicTests/Repositories/UserRepository/CheckPasswordTests.cs
@@ -1,12 +1,9 @@
-using System;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Core.Interfaces;
 using GenderPayGap.Database;
 using GenderPayGap.WebUI.Helpers;
-using GenderPayGap.WebUI.Repositories;
 using GenderPayGap.WebUI.Services;
 using Moq;
-using NUnit.Framework;
 
 namespace Repositories.UserRepository
 {

diff --git a/...nderPayGap.WebUI.Tests/BusinessLogicTests/Repositories/UserRepository/FindByEmailTests.cs b/...nderPayGap.WebUI.Tests/BusinessLogicTests/Repositories/UserRepository/FindByEmailTests.cs
@@ -1,15 +1,11 @@
-using System.Linq;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Core.Interfaces;
 using GenderPayGap.Database;
-using GenderPayGap.Extensions;
 using GenderPayGap.Tests.Common.Classes;
 using GenderPayGap.Tests.Common.TestHelpers;
-using GenderPayGap.WebUI.Repositories;
 using GenderPayGap.WebUI.Services;
 using GenderPayGap.WebUI.Tests.TestHelpers;
 using Moq;
-using NUnit.Framework;
 
 namespace Repositories.UserRepository
 {

diff --git a/...enderPayGap.WebUI.Tests/BusinessLogicTests/Repositories/UserRepository/RetireUserTests.cs b/...enderPayGap.WebUI.Tests/BusinessLogicTests/Repositories/UserRepository/RetireUserTests.cs
@@ -1,15 +1,12 @@
-using System;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Core.Interfaces;
 using GenderPayGap.Database;
 using GenderPayGap.Extensions;
 using GenderPayGap.Tests.Common.Classes;
 using GenderPayGap.Tests.Common.TestHelpers;
-using GenderPayGap.WebUI.Repositories;
 using GenderPayGap.WebUI.Services;
 using GenderPayGap.WebUI.Tests.TestHelpers;
 using Moq;
-using NUnit.Framework;
 
 namespace Repositories.UserRepository
 {

diff --git a/...nderPayGap.WebUI.Tests/BusinessLogicTests/Repositories/UserRepository/UpdateEmailTests.cs b/...nderPayGap.WebUI.Tests/BusinessLogicTests/Repositories/UserRepository/UpdateEmailTests.cs
@@ -1,15 +1,12 @@
-using System;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Core.Interfaces;
 using GenderPayGap.Database;
 using GenderPayGap.Extensions;
 using GenderPayGap.Tests.Common.Classes;
 using GenderPayGap.Tests.Common.TestHelpers;
-using GenderPayGap.WebUI.Repositories;
 using GenderPayGap.WebUI.Services;
 using GenderPayGap.WebUI.Tests.TestHelpers;
 using Moq;
-using NUnit.Framework;
 
 namespace Repositories.UserRepository
 {

diff --git a/...rPayGap.WebUI.Tests/BusinessLogicTests/Repositories/UserRepository/UpdatePasswordTests.cs b/...rPayGap.WebUI.Tests/BusinessLogicTests/Repositories/UserRepository/UpdatePasswordTests.cs
@@ -1,16 +1,13 @@
-using System;
-using GenderPayGap.Core;
+using GenderPayGap.Core;
 using GenderPayGap.Core.Interfaces;
 using GenderPayGap.Database;
 using GenderPayGap.Extensions;
 using GenderPayGap.Tests.Common.Classes;
 using GenderPayGap.Tests.Common.TestHelpers;
 using GenderPayGap.WebUI.Helpers;
-using GenderPayGap.WebUI.Repositories;
 using GenderPayGap.WebUI.Services;
 using GenderPayGap.WebUI.Tests.TestHelpers;
 using Moq;
-using NUnit.Framework;
 
 namespace Repositories.UserRepository
 {

diff --git a/...PayGap.UnitTests/GenderPayGap.WebUI.Tests/BusinessLogicTests/Services/AuditLoggerTests.cs b/...PayGap.UnitTests/GenderPayGap.WebUI.Tests/BusinessLogicTests/Services/AuditLoggerTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using GenderPayGap.Core;
-using NUnit.Framework;
+using GenderPayGap.Core;
 
 namespace GenderPayGap.BusinessLogic.Tests.Services
 {