From da1b1eceb8e22f1f2a3ab89ddfbfc4ecb86ce53a Mon Sep 17 00:00:00 2001 From: Jesus Flores <43448209+simpat-jesus@users.noreply.github.com> Date: Mon, 19 Feb 2024 16:36:36 -0600 Subject: [PATCH] [ODS-6246] Update dependencies (#963) --- .../EdFi.Admin.DataAccess.csproj | 10 +++++----- Application/EdFi.Common/EdFi.Common.csproj | 6 +++--- Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj | 14 +++++++------- .../Extensions/ServiceCollectionExtensions.cs | 3 ++- .../EdFi.Ods.Common/EdFi.Ods.Common.csproj | 12 ++++++------ .../EdFi.Ods.Features/EdFi.Ods.Features.csproj | 8 ++++---- ...EdFi.Ods.Repositories.NHibernate.Tests.csproj | 8 ++++---- .../EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj | 4 ++-- .../EdFi.Ods.Standard/EdFi.Ods.Standard.csproj | 4 ++-- .../EdFi.Ods.Tests.TestExtension.csproj | 2 +- ...rsonMapCacheDeleteEntityByIdDecoratorTests.cs | 1 + .../EdFi.Ods.Api/Jobs/CronHelperTests.cs | 1 + .../EdFi.Ods.Api/Providers/ETagProviderTests.cs | 1 + .../FluentValidationObjectValidatorTests.cs | 4 ++-- .../EdFi.Ods.Common/Context/CallContextTests.cs | 1 + .../Filtering/AliasGeneratorTests.cs | 4 ++-- .../Models/Domain/DomainModelTests.cs | 1 + .../Models/Resource/FilterContextTests.cs | 1 + .../Utils/Extensions/EnumExtensionsTest.cs | 1 + .../AggregateDependencyControllerTests.cs | 11 +---------- .../OpenApiMetadataControllerTests.cs | 7 +------ Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj | 12 ++++++------ .../EdFi.Security.DataAccess.csproj | 8 ++++---- Application/Test.Common/Test.Common.csproj | 4 ++-- .../EdFi.Ods.CodeGen.Tests.csproj | 12 ++++++------ .../EdFi.Ods.CodeGen/EdFi.Ods.CodeGen.csproj | 4 ++-- .../EdFi.LoadTools.Test.csproj | 16 ++++++++-------- .../EdFi.LoadTools.Test/ExtensionMethodsTests.cs | 1 + .../EdFi.LoadTools.Test/Mapping/MapperTests.cs | 3 ++- .../OAuthTokenHandlerTests.cs | 3 +-- .../EdFi.LoadTools.Test/PercentMatchToTests.cs | 1 + .../EdFi.LoadTools.Test/PropertyMapperTests.cs | 1 + .../ResourceReferencePreloadStepTest.cs | 1 + .../SmokeTests/APIGetTests.cs | 1 + .../SmokeTests/GetDependenciesTests.cs | 12 ++++++------ .../SmokeTests/GetVersionTests.cs | 14 ++++++-------- .../SmokeTests/ModelDependencySortTests.cs | 3 ++- .../SmokeTests/PropertyBuilderTests.cs | 1 + .../EdFi.LoadTools.Test/SwaggerRetrieverTests.cs | 1 + .../EdFi.LoadTools.Test/UtilitiesTests.cs | 3 ++- .../XmlReferenceCacheTests.cs | 1 + .../XmlResourceHashCacheTests.cs | 1 + .../XmlResourcePipelineTests.cs | 3 ++- .../XsdMetadataRetrievalTests.cs | 1 + .../EdFi.LoadTools/EdFi.LoadTools.csproj | 10 +++++----- .../EdFi.SmokeTest.Console.csproj | 4 ++-- .../Template_Project.csproj | 2 +- ...EdFi.Admin.DataAccess.IntegrationTests.csproj | 10 +++++----- .../EdFi.Admin.DataAccess.UnitTests.csproj | 12 ++++++------ .../EdFi.Common.UnitTests.csproj | 8 ++++---- .../Inflection/InflectorTests.cs | 1 + .../EdFi.Ods.Api.IntegrationTests.csproj | 8 ++++---- .../EdFi.Ods.Features.UnitTests.csproj | 12 ++++++------ ...tionsFactoryProfileNamingStrategyUnitTests.cs | 2 +- ...EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj | 12 ++++++------ .../EdFi.Ods.WebApi.IntegrationTests.csproj | 10 +++++----- .../EdFi.Security.DataAccess.UnitTests.csproj | 10 +++++----- tests/EdFi.TestFixture/EdFi.TestFixture.csproj | 10 +++++----- 58 files changed, 164 insertions(+), 158 deletions(-) diff --git a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj index 6564d02121..052be5fc74 100644 --- a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj +++ b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj @@ -28,11 +28,11 @@ - - - - - + + + + + diff --git a/Application/EdFi.Common/EdFi.Common.csproj b/Application/EdFi.Common/EdFi.Common.csproj index 19f6568fbd..8a21936513 100644 --- a/Application/EdFi.Common/EdFi.Common.csproj +++ b/Application/EdFi.Common/EdFi.Common.csproj @@ -12,10 +12,10 @@ DEBUG;TRACE - - + + - + \ No newline at end of file diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj index 5a1f581f9c..01ccdd6975 100644 --- a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj +++ b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj @@ -37,15 +37,15 @@ - - - - - - + + + + + + - + diff --git a/Application/EdFi.Ods.Api/Jobs/Extensions/ServiceCollectionExtensions.cs b/Application/EdFi.Ods.Api/Jobs/Extensions/ServiceCollectionExtensions.cs index 428c3b8469..02408e65dc 100644 --- a/Application/EdFi.Ods.Api/Jobs/Extensions/ServiceCollectionExtensions.cs +++ b/Application/EdFi.Ods.Api/Jobs/Extensions/ServiceCollectionExtensions.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Quartz; +using Quartz.AspNetCore; namespace EdFi.Ods.Api.Jobs.Extensions { @@ -12,7 +13,7 @@ public static class ServiceCollectionExtensions { public static void AddScheduledJobs(this IServiceCollection services) { - services.AddQuartz(q => { q.UseMicrosoftDependencyInjectionJobFactory(); }); + services.AddQuartz(); services.AddQuartzServer(options => { options.WaitForJobsToComplete = true; }); } diff --git a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj index 7cced88e0f..729d348035 100644 --- a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj +++ b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj @@ -27,15 +27,15 @@ - - - + + + - + - - + + diff --git a/Application/EdFi.Ods.Features/EdFi.Ods.Features.csproj b/Application/EdFi.Ods.Features/EdFi.Ods.Features.csproj index 1d35bccbea..deb85864f7 100644 --- a/Application/EdFi.Ods.Features/EdFi.Ods.Features.csproj +++ b/Application/EdFi.Ods.Features/EdFi.Ods.Features.csproj @@ -15,10 +15,10 @@ - - - - + + + + diff --git a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj index 81511d710e..2e0dae821a 100644 --- a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj +++ b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj @@ -31,13 +31,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj index 0ad79da247..2b6f2c47a8 100644 --- a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj +++ b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj b/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj index 136af1b0d5..19aca654ef 100644 --- a/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj +++ b/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj @@ -18,12 +18,12 @@ true - + - + diff --git a/Application/EdFi.Ods.Tests.TestExtension/EdFi.Ods.Tests.TestExtension.csproj b/Application/EdFi.Ods.Tests.TestExtension/EdFi.Ods.Tests.TestExtension.csproj index 6d2b2f050d..8ec40bb5ae 100644 --- a/Application/EdFi.Ods.Tests.TestExtension/EdFi.Ods.Tests.TestExtension.csproj +++ b/Application/EdFi.Ods.Tests.TestExtension/EdFi.Ods.Tests.TestExtension.csproj @@ -14,7 +14,7 @@ - + diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Caching/PersonMapCacheDeleteEntityByIdDecoratorTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Caching/PersonMapCacheDeleteEntityByIdDecoratorTests.cs index 5f3bbe7d3e..8a68df0e34 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Caching/PersonMapCacheDeleteEntityByIdDecoratorTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Caching/PersonMapCacheDeleteEntityByIdDecoratorTests.cs @@ -17,6 +17,7 @@ using EdFi.Ods.Common.Repositories; using FakeItEasy; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.Ods.Tests.EdFi.Ods.Api.Caching; diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Jobs/CronHelperTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Jobs/CronHelperTests.cs index e144c5b877..47b61288d7 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Jobs/CronHelperTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Jobs/CronHelperTests.cs @@ -7,6 +7,7 @@ using EdFi.Ods.Common.Configuration; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.Ods.Tests.EdFi.Ods.Api.Jobs { diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Providers/ETagProviderTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Providers/ETagProviderTests.cs index cee4178b4a..1c5468f81e 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Providers/ETagProviderTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Providers/ETagProviderTests.cs @@ -9,6 +9,7 @@ using EdFi.Ods.Common.Exceptions; using NUnit.Framework; using Shouldly; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.Ods.Tests.EdFi.Ods.Api { diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Validation/FluentValidationObjectValidatorTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Validation/FluentValidationObjectValidatorTests.cs index ef612a74c4..9c1af0b684 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Validation/FluentValidationObjectValidatorTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Validation/FluentValidationObjectValidatorTests.cs @@ -118,8 +118,8 @@ public void Should_only_generate_validation_errors_for_the_specific_ruleset() Assert.That( string.Join(Environment.NewLine, _actualValidationResults.Select(vr => vr.ToString())), Does.Contain("between 1 and 3 characters") - .And.ContainsSubstring("between 1 and 5 characters") - .And.Not.ContainsSubstring("age is quite odd")); + .And.Contains("between 1 and 5 characters") + .And.Not.Contains("age is quite odd")); } } diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Context/CallContextTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Context/CallContextTests.cs index 7e17f5c441..1aab9bac42 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Context/CallContextTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Context/CallContextTests.cs @@ -10,6 +10,7 @@ using EdFi.TestFixture; using NUnit.Framework; using Test.Common; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.Ods.Tests.EdFi.Ods.Common.Context { diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Filtering/AliasGeneratorTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Filtering/AliasGeneratorTests.cs index a744250a5a..a2b4bef2f8 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Filtering/AliasGeneratorTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Filtering/AliasGeneratorTests.cs @@ -38,7 +38,7 @@ protected override void Act() if (!_actualAliases.Add(nextAlias)) { - Assert.Fail("Duplicate alias generated: '{0}'", nextAlias); + Assert.Fail($"Duplicate alias generated: '{nextAlias}'"); } } @@ -90,7 +90,7 @@ protected override void Act() break; } - Assert.Fail("Duplicate alias generated: '{0}'", nextAlias); + Assert.Fail($"Duplicate alias generated: '{nextAlias}'"); } } diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Models/Domain/DomainModelTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Models/Domain/DomainModelTests.cs index 393a058bb9..dcaf9db0c7 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Models/Domain/DomainModelTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Models/Domain/DomainModelTests.cs @@ -15,6 +15,7 @@ using FakeItEasy; using NUnit.Framework; using Test.Common; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.Ods.Tests.EdFi.Ods.Common.Models.Domain { diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Models/Resource/FilterContextTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Models/Resource/FilterContextTests.cs index 97c02d04be..509d191998 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Models/Resource/FilterContextTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Models/Resource/FilterContextTests.cs @@ -21,6 +21,7 @@ using FakeItEasy; using NUnit.Framework; using Test.Common; +using Assert = NUnit.Framework.Legacy.ClassicAssert; using Resource_Resource = EdFi.Ods.Common.Models.Resource.Resource; namespace EdFi.Ods.Tests.EdFi.Ods.Common.Models.Resource diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Utils/Extensions/EnumExtensionsTest.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Utils/Extensions/EnumExtensionsTest.cs index b21f6a1ff6..615c08802f 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Utils/Extensions/EnumExtensionsTest.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Utils/Extensions/EnumExtensionsTest.cs @@ -7,6 +7,7 @@ using EdFi.Ods.Common.Utils.Extensions; using NUnit.Framework; using Shouldly; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.Ods.Tests.EdFi.Ods.CommonUtils.Extensions { diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Features/Controllers/AggregateDependencyControllerTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Features/Controllers/AggregateDependencyControllerTests.cs index a398fdf1ba..4f620288ea 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Features/Controllers/AggregateDependencyControllerTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Features/Controllers/AggregateDependencyControllerTests.cs @@ -3,20 +3,12 @@ // The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0. // See the LICENSE and NOTICES files in the project root for more information. -using System.Collections.Generic; using System.IO; -using System.Net.Http; -using System.Net.Http.Headers; -using System.Runtime.CompilerServices; using System.Xml; using System.Xml.Serialization; -using Antlr.Runtime.Misc; -using EdFi.Common.Configuration; using EdFi.Ods.Api.Constants; -using EdFi.Ods.Api.Extensions; using EdFi.Ods.Api.Models.GraphML; using EdFi.Ods.Common.Configuration; -using EdFi.Ods.Common.Extensions; using EdFi.Ods.Common.Logging; using EdFi.Ods.Common.Models.Graphs; using EdFi.Ods.Common.Models.Resource; @@ -25,10 +17,9 @@ using FakeItEasy; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Routing; -using Newtonsoft.Json; using NUnit.Framework; using QuickGraph; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.Ods.Tests.EdFi.Ods.Features.Controllers { diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Features/Controllers/OpenApiMetadataControllerTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Features/Controllers/OpenApiMetadataControllerTests.cs index eedbe50ce0..0087faf952 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Features/Controllers/OpenApiMetadataControllerTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Features/Controllers/OpenApiMetadataControllerTests.cs @@ -4,13 +4,10 @@ // See the LICENSE and NOTICES files in the project root for more information. using System.Collections.Generic; -using System.Net; using EdFi.Ods.Api.Constants; -using EdFi.Ods.Api.Extensions; using EdFi.Ods.Api.Models; using EdFi.Ods.Api.Providers; using EdFi.Ods.Common.Configuration; -using EdFi.Ods.Common.Constants; using EdFi.Ods.Features.Controllers; using EdFi.Ods.Features.OpenApiMetadata.Models; using EdFi.Ods.Tests.EdFi.Ods.Api.Services.Metadata.Helpers; @@ -18,12 +15,10 @@ using FakeItEasy; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Abstractions; -using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Routing; -using NHibernate.Criterion; using NUnit.Framework; using Test.Common; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.Ods.Tests.EdFi.Ods.Features.Controllers { diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj index 20773f2780..4d73459e2b 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj @@ -33,16 +33,16 @@ - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj b/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj index be261e9be7..c068f00724 100644 --- a/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj +++ b/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj @@ -26,10 +26,10 @@ - + - - - + + + diff --git a/Application/Test.Common/Test.Common.csproj b/Application/Test.Common/Test.Common.csproj index ce21dc1f64..49a5a5cd9b 100644 --- a/Application/Test.Common/Test.Common.csproj +++ b/Application/Test.Common/Test.Common.csproj @@ -13,8 +13,8 @@ true - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/EdFi.Ods.CodeGen.Tests.csproj b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/EdFi.Ods.CodeGen.Tests.csproj index dff17b5d31..10d7429fe8 100644 --- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/EdFi.Ods.CodeGen.Tests.csproj +++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/EdFi.Ods.CodeGen.Tests.csproj @@ -19,12 +19,12 @@ - - - - - - + + + + + + diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/EdFi.Ods.CodeGen.csproj b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/EdFi.Ods.CodeGen.csproj index 7898127b1a..a1d380ea49 100644 --- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/EdFi.Ods.CodeGen.csproj +++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/EdFi.Ods.CodeGen.csproj @@ -26,9 +26,9 @@ true - + - + diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj b/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj index 023c1c5f83..f632b96591 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj @@ -28,18 +28,18 @@ - - + + - - + + - + - - - + + + diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/ExtensionMethodsTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/ExtensionMethodsTests.cs index 8cd06e141d..0e48454bfc 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/ExtensionMethodsTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/ExtensionMethodsTests.cs @@ -6,6 +6,7 @@ using System; using EdFi.LoadTools.Engine; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/Mapping/MapperTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/Mapping/MapperTests.cs index 60baed677c..1a6d65c6a1 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/Mapping/MapperTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/Mapping/MapperTests.cs @@ -7,8 +7,9 @@ using System.Linq; using EdFi.LoadTools.Mapping; using EdFi.OdsApi.Sdk.Models.All; -using NUnit.Framework; using Newtonsoft.Json; +using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test.Mapping { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/OAuthTokenHandlerTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/OAuthTokenHandlerTests.cs index ce0519e3b7..163e710301 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/OAuthTokenHandlerTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/OAuthTokenHandlerTests.cs @@ -4,12 +4,11 @@ // See the LICENSE and NOTICES files in the project root for more information. using System; -using System.Collections.Generic; using System.IO; using EdFi.LoadTools.ApiClient; using Microsoft.Extensions.Configuration; -using Newtonsoft.Json; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/PercentMatchToTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/PercentMatchToTests.cs index 8e27af916b..2b06cdd2c2 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/PercentMatchToTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/PercentMatchToTests.cs @@ -8,6 +8,7 @@ using System.Linq; using EdFi.LoadTools.Engine; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/PropertyMapperTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/PropertyMapperTests.cs index 2bec64e757..4b90d18ade 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/PropertyMapperTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/PropertyMapperTests.cs @@ -7,6 +7,7 @@ using EdFi.LoadTools.ApiClient; using EdFi.LoadTools.Engine.Mapping; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/ResourceReferencePreloadStepTest.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/ResourceReferencePreloadStepTest.cs index b78185e8be..db9d857d0a 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/ResourceReferencePreloadStepTest.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/ResourceReferencePreloadStepTest.cs @@ -12,6 +12,7 @@ using EdFi.LoadTools.Engine; using EdFi.LoadTools.Engine.FileImportPipeline; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/APIGetTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/APIGetTests.cs index 9eb50cebd8..bb2544f074 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/APIGetTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/APIGetTests.cs @@ -22,6 +22,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test.SmokeTests { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/GetDependenciesTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/GetDependenciesTests.cs index 821d723f29..b731152c9b 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/GetDependenciesTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/GetDependenciesTests.cs @@ -3,17 +3,17 @@ // The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0. // See the LICENSE and NOTICES files in the project root for more information. +using System.Threading.Tasks; using EdFi.LoadTools.Engine; using EdFi.LoadTools.SmokeTest.CommonTests; -using NUnit.Framework; -using Moq; -using Microsoft.AspNetCore.TestHost; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Hosting; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; -using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; +using Moq; +using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test.SmokeTests { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/GetVersionTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/GetVersionTests.cs index f71c06180c..1ef4d8d01d 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/GetVersionTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/GetVersionTests.cs @@ -3,19 +3,17 @@ // The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0. // See the LICENSE and NOTICES files in the project root for more information. -using System.Configuration; +using System.Threading.Tasks; using EdFi.LoadTools.Engine; using EdFi.LoadTools.SmokeTest.CommonTests; -using NUnit.Framework; -using Moq; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.TestHost; -using System.Net.Http; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Configuration; -using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; +using Moq; +using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test.SmokeTests { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/ModelDependencySortTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/ModelDependencySortTests.cs index 195e2e0a0e..0b3aaec23b 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/ModelDependencySortTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/ModelDependencySortTests.cs @@ -10,8 +10,9 @@ using EdFi.LoadTools.SmokeTest; using EdFi.LoadTools.SmokeTest.SdkTests; using EdFi.OdsApi.Sdk.Apis.All; -using NUnit.Framework; using Moq; +using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test.SmokeTests { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/PropertyBuilderTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/PropertyBuilderTests.cs index 1ab89b6829..1e35207661 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/PropertyBuilderTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/SmokeTests/PropertyBuilderTests.cs @@ -12,6 +12,7 @@ using Microsoft.OpenApi.Models; using Moq; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; // ReSharper disable InconsistentNaming // ReSharper disable UnusedAutoPropertyAccessor.Local diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/SwaggerRetrieverTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/SwaggerRetrieverTests.cs index d5d55cbabb..82cdb0f3a7 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/SwaggerRetrieverTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/SwaggerRetrieverTests.cs @@ -10,6 +10,7 @@ using EdFi.LoadTools.Engine; using Microsoft.Extensions.Configuration; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/UtilitiesTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/UtilitiesTests.cs index 7faeb8f338..ad5585e65b 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/UtilitiesTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/UtilitiesTests.cs @@ -6,8 +6,9 @@ using System; using System.Dynamic; using EdFi.LoadTools.ApiClient; -using NUnit.Framework; using Newtonsoft.Json.Linq; +using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/XmlReferenceCacheTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/XmlReferenceCacheTests.cs index 60491de9af..1b80db325f 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/XmlReferenceCacheTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/XmlReferenceCacheTests.cs @@ -14,6 +14,7 @@ using log4net.Core; using log4net.Repository.Hierarchy; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; // ReSharper disable InconsistentNaming diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/XmlResourceHashCacheTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/XmlResourceHashCacheTests.cs index 7542b91125..6ce4c85522 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/XmlResourceHashCacheTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/XmlResourceHashCacheTests.cs @@ -8,6 +8,7 @@ using System.IO; using EdFi.LoadTools.Engine; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/XmlResourcePipelineTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/XmlResourcePipelineTests.cs index 6996902baf..871e943b7c 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/XmlResourcePipelineTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/XmlResourcePipelineTests.cs @@ -8,8 +8,9 @@ using EdFi.LoadTools.Engine; using EdFi.LoadTools.Engine.Mapping; using EdFi.LoadTools.Engine.ResourcePipeline; -using NUnit.Framework; using Newtonsoft.Json.Linq; +using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.LoadTools.Test { diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/XsdMetadataRetrievalTests.cs b/Utilities/DataLoading/EdFi.LoadTools.Test/XsdMetadataRetrievalTests.cs index 9ab1bd29c7..a50f833824 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/XsdMetadataRetrievalTests.cs +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/XsdMetadataRetrievalTests.cs @@ -9,6 +9,7 @@ using EdFi.LoadTools.ApiClient; using EdFi.LoadTools.Engine.Factories; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; // ReSharper disable InconsistentNaming diff --git a/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj b/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj index 795f35aefb..a8d30298dd 100644 --- a/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj +++ b/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj @@ -21,16 +21,16 @@ - - + + - - + + - + diff --git a/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj b/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj index 95cf39db3b..91521fa0a4 100644 --- a/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj +++ b/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj @@ -36,8 +36,8 @@ - - + + diff --git a/Utilities/VisualStudioProjectTemplates/EdFi.ProjectTemplates.Extensions/Template_Project.csproj b/Utilities/VisualStudioProjectTemplates/EdFi.ProjectTemplates.Extensions/Template_Project.csproj index 1a9d819fb2..1753d0f14c 100644 --- a/Utilities/VisualStudioProjectTemplates/EdFi.ProjectTemplates.Extensions/Template_Project.csproj +++ b/Utilities/VisualStudioProjectTemplates/EdFi.ProjectTemplates.Extensions/Template_Project.csproj @@ -17,7 +17,7 @@ - + diff --git a/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj b/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj index 071c88731c..d03e4f571b 100644 --- a/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj +++ b/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj @@ -15,14 +15,14 @@ true - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj b/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj index 9971243a9f..3a8ba03a0c 100644 --- a/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj +++ b/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj @@ -27,15 +27,15 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj b/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj index 3a5e594dd2..f369d52e97 100644 --- a/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj +++ b/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj @@ -18,13 +18,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/tests/EdFi.Common.UnitTests/Inflection/InflectorTests.cs b/tests/EdFi.Common.UnitTests/Inflection/InflectorTests.cs index 7cfa6ef413..0e46a109ea 100644 --- a/tests/EdFi.Common.UnitTests/Inflection/InflectorTests.cs +++ b/tests/EdFi.Common.UnitTests/Inflection/InflectorTests.cs @@ -7,6 +7,7 @@ using EdFi.Common.Inflection; using NUnit.Framework; using Shouldly; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.Ods.Common.UnitTests.Inflection { diff --git a/tests/EdFi.Ods.Api.IntegrationTests/EdFi.Ods.Api.IntegrationTests.csproj b/tests/EdFi.Ods.Api.IntegrationTests/EdFi.Ods.Api.IntegrationTests.csproj index f0246461c5..bde881406d 100644 --- a/tests/EdFi.Ods.Api.IntegrationTests/EdFi.Ods.Api.IntegrationTests.csproj +++ b/tests/EdFi.Ods.Api.IntegrationTests/EdFi.Ods.Api.IntegrationTests.csproj @@ -13,13 +13,13 @@ true - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/tests/EdFi.Ods.Features.UnitTests/EdFi.Ods.Features.UnitTests.csproj b/tests/EdFi.Ods.Features.UnitTests/EdFi.Ods.Features.UnitTests.csproj index 058a1589b5..0409f93bd8 100644 --- a/tests/EdFi.Ods.Features.UnitTests/EdFi.Ods.Features.UnitTests.csproj +++ b/tests/EdFi.Ods.Features.UnitTests/EdFi.Ods.Features.UnitTests.csproj @@ -6,12 +6,12 @@ false - - - - - - + + + + + + diff --git a/tests/EdFi.Ods.Features.UnitTests/OpenApiMetadataDefinitionsFactoryProfileNamingStrategyUnitTests.cs b/tests/EdFi.Ods.Features.UnitTests/OpenApiMetadataDefinitionsFactoryProfileNamingStrategyUnitTests.cs index 09c549458f..646c1b7758 100644 --- a/tests/EdFi.Ods.Features.UnitTests/OpenApiMetadataDefinitionsFactoryProfileNamingStrategyUnitTests.cs +++ b/tests/EdFi.Ods.Features.UnitTests/OpenApiMetadataDefinitionsFactoryProfileNamingStrategyUnitTests.cs @@ -8,7 +8,7 @@ using EdFi.Ods.Features.OpenApiMetadata.Strategies.FactoryStrategies; using EdFi.Ods.Common.Models.Resource; using EdFi.Ods.Features.OpenApiMetadata.Dtos; -using Assert = NUnit.Framework.Assert; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.Ods.Features.UnitTests { diff --git a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj index 8db14dec3f..f8125580e2 100644 --- a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj +++ b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj @@ -52,15 +52,15 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj index 3570c76617..bebf3849b1 100644 --- a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj +++ b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj @@ -27,14 +27,14 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj b/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj index 1fbdffb5e0..708639b120 100644 --- a/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj +++ b/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj @@ -28,14 +28,14 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/tests/EdFi.TestFixture/EdFi.TestFixture.csproj b/tests/EdFi.TestFixture/EdFi.TestFixture.csproj index 91857e1bf5..22fd3f4ca4 100644 --- a/tests/EdFi.TestFixture/EdFi.TestFixture.csproj +++ b/tests/EdFi.TestFixture/EdFi.TestFixture.csproj @@ -11,10 +11,10 @@ DEBUG;TRACE - - - - - + + + + + \ No newline at end of file