diff --git a/Application/EdFi.Ods.Api/Container/Modules/SqlServerSpecificModule.cs b/Application/EdFi.Ods.Api/Container/Modules/SqlServerSpecificModule.cs index 60ffb0d241..0c30d3adc0 100644 --- a/Application/EdFi.Ods.Api/Container/Modules/SqlServerSpecificModule.cs +++ b/Application/EdFi.Ods.Api/Container/Modules/SqlServerSpecificModule.cs @@ -5,12 +5,12 @@ using Autofac; using EdFi.Common.Configuration; +using EdFi.Ods.Api.Security.Authorization; using EdFi.Ods.Common.Configuration; using EdFi.Ods.Common.Container; using EdFi.Ods.Common.Infrastructure.Activities; using EdFi.Ods.Common.Infrastructure.Configuration; using EdFi.Ods.Common.Infrastructure.SqlServer; -using EdFi.Ods.Api.Security.Authorization; namespace EdFi.Ods.Api.Container.Modules { diff --git a/Application/EdFi.Ods.Api/Controllers/DataManagementControllerBase.cs b/Application/EdFi.Ods.Api/Controllers/DataManagementControllerBase.cs index 2334163084..9c5e2fd075 100644 --- a/Application/EdFi.Ods.Api/Controllers/DataManagementControllerBase.cs +++ b/Application/EdFi.Ods.Api/Controllers/DataManagementControllerBase.cs @@ -207,7 +207,7 @@ public virtual async Task GetAll( // Return multiple results if (queryParameters.TotalCount) { - Response.Headers.Add(HeaderConstants.TotalCount, result.ResultMetadata.TotalCount.ToString()); + Response.Headers.Append(HeaderConstants.TotalCount, result.ResultMetadata.TotalCount.ToString()); } Response.GetTypedHeaders().ContentType = new MediaTypeHeaderValue(GetReadContentType()); diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj index afdacd65a6..9c2c739d47 100644 --- a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj +++ b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj @@ -1,8 +1,8 @@  EdFi.Ods.Api - LICENSE.txt - net6.0 + LICENSE.txt + net8.0 EdFi.Ods.Api 99.99.99.00 EdFi.Ods.Api @@ -19,31 +19,30 @@ - - + + - - - - - - - - - - + + + + + + + + + - - - - + + + + - + @@ -53,7 +52,7 @@ - + - + \ No newline at end of file diff --git a/Application/EdFi.Ods.Api/Middleware/EdFiOAuthAuthenticationHandler.cs b/Application/EdFi.Ods.Api/Middleware/EdFiOAuthAuthenticationHandler.cs index 77e0d90760..b1b12595f4 100644 --- a/Application/EdFi.Ods.Api/Middleware/EdFiOAuthAuthenticationHandler.cs +++ b/Application/EdFi.Ods.Api/Middleware/EdFiOAuthAuthenticationHandler.cs @@ -25,9 +25,8 @@ public EdFiOAuthAuthenticationHandler( IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder, - ISystemClock clock, IAuthenticationProvider authenticationProvider) - : base(options, logger, encoder, clock) + : base(options, logger, encoder) { _authenticationProvider = authenticationProvider; } diff --git a/Application/EdFi.Ods.Api/OperationalContext/PersonIdentification/AmbiguousUniqueIdMatchException.cs b/Application/EdFi.Ods.Api/OperationalContext/PersonIdentification/AmbiguousUniqueIdMatchException.cs index ff12f3fa94..df0d4456e3 100644 --- a/Application/EdFi.Ods.Api/OperationalContext/PersonIdentification/AmbiguousUniqueIdMatchException.cs +++ b/Application/EdFi.Ods.Api/OperationalContext/PersonIdentification/AmbiguousUniqueIdMatchException.cs @@ -28,10 +28,5 @@ public AmbiguousUniqueIdMatchException(string message) public AmbiguousUniqueIdMatchException(string message, Exception inner) : base(message, inner) { } - - protected AmbiguousUniqueIdMatchException( - SerializationInfo info, - StreamingContext context) - : base(info, context) { } } } diff --git a/Application/EdFi.Ods.Api/OperationalContext/PersonIdentification/NoUniqueIdMatchException.cs b/Application/EdFi.Ods.Api/OperationalContext/PersonIdentification/NoUniqueIdMatchException.cs index 620acbbe72..ecd7815930 100644 --- a/Application/EdFi.Ods.Api/OperationalContext/PersonIdentification/NoUniqueIdMatchException.cs +++ b/Application/EdFi.Ods.Api/OperationalContext/PersonIdentification/NoUniqueIdMatchException.cs @@ -28,10 +28,5 @@ public NoUniqueIdMatchException(string message) public NoUniqueIdMatchException(string message, Exception inner) : base(message, inner) { } - - protected NoUniqueIdMatchException( - SerializationInfo info, - StreamingContext context) - : base(info, context) { } } } diff --git a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj index 30a3ddc8fb..4b3f6a2e7f 100644 --- a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj +++ b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj @@ -17,10 +17,10 @@ - + - + @@ -28,7 +28,7 @@ - + diff --git a/Application/EdFi.Ods.Composites.Enrollment/EdFi.Ods.Composites.Enrollment.csproj b/Application/EdFi.Ods.Composites.Enrollment/EdFi.Ods.Composites.Enrollment.csproj index c5380a92f1..948afa72c1 100644 --- a/Application/EdFi.Ods.Composites.Enrollment/EdFi.Ods.Composites.Enrollment.csproj +++ b/Application/EdFi.Ods.Composites.Enrollment/EdFi.Ods.Composites.Enrollment.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 EdFi.Ods.Composites.Enrollment EdFi.Ods.Composites.Enrollment true @@ -29,4 +29,4 @@ - + \ No newline at end of file diff --git a/Application/EdFi.Ods.Composites.Test/EdFi.Ods.Composites.Test.csproj b/Application/EdFi.Ods.Composites.Test/EdFi.Ods.Composites.Test.csproj index 636134f907..afcb5ec609 100644 --- a/Application/EdFi.Ods.Composites.Test/EdFi.Ods.Composites.Test.csproj +++ b/Application/EdFi.Ods.Composites.Test/EdFi.Ods.Composites.Test.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 EdFi.Ods.Composites.Test EdFi.Ods.Composites.Test true @@ -29,4 +29,4 @@ - + \ No newline at end of file diff --git a/Application/EdFi.Ods.Features/ChangeQueries/ActionResults/SnapshotsAreReadOnlyResult.cs b/Application/EdFi.Ods.Features/ChangeQueries/ActionResults/SnapshotsAreReadOnlyResult.cs index 7e82e6fbe5..a49044f751 100644 --- a/Application/EdFi.Ods.Features/ChangeQueries/ActionResults/SnapshotsAreReadOnlyResult.cs +++ b/Application/EdFi.Ods.Features/ChangeQueries/ActionResults/SnapshotsAreReadOnlyResult.cs @@ -5,6 +5,7 @@ using System.Net; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; namespace EdFi.Ods.Features.ChangeQueries.ActionResults @@ -25,7 +26,7 @@ public async Task ExecuteResultAsync(ActionContext context) StatusCode = (int) HttpStatusCode.MethodNotAllowed, }; - context.HttpContext.Response.Headers.Add("Allow", "GET"); + context.HttpContext.Response.Headers.Append("Allow", "GET"); await objectResult.ExecuteResultAsync(context); } diff --git a/Application/EdFi.Ods.Features/EdFi.Ods.Features.csproj b/Application/EdFi.Ods.Features/EdFi.Ods.Features.csproj index b19da9a4d5..a26c7f95cb 100644 --- a/Application/EdFi.Ods.Features/EdFi.Ods.Features.csproj +++ b/Application/EdFi.Ods.Features/EdFi.Ods.Features.csproj @@ -1,7 +1,6 @@ - - net6.0 + net8.0 EdFi.Ods.Features EdFi.Ods.Features Debug;Release @@ -17,7 +16,7 @@ - + @@ -32,6 +31,6 @@ - + - + \ No newline at end of file diff --git a/Application/EdFi.Ods.Profiles.Test/EdFi.Ods.Profiles.Test.csproj b/Application/EdFi.Ods.Profiles.Test/EdFi.Ods.Profiles.Test.csproj index 8f354cb8aa..0315081a03 100644 --- a/Application/EdFi.Ods.Profiles.Test/EdFi.Ods.Profiles.Test.csproj +++ b/Application/EdFi.Ods.Profiles.Test/EdFi.Ods.Profiles.Test.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 EdFi.Ods.Profiles.Test EdFi.Ods.Profiles.Test true @@ -13,8 +13,8 @@ true - - + + @@ -35,4 +35,4 @@ - + \ No newline at end of file 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 14de052e04..39acaf7859 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 @@ -1,6 +1,6 @@ - net6.0 + net8.0 EdFi.Ods.Repositories.NHibernate.Tests EdFi.Ods.Repositories.NHibernate.Tests Copyright © 2019 Ed-Fi Alliance, LLC and Contributors @@ -18,23 +18,23 @@ - + - - - - - - - - + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + @@ -55,4 +55,4 @@ PreserveNewest - + \ No newline at end of file diff --git a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj index a155d79a11..b3ece4446c 100644 --- a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj +++ b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 EdFi.Ods.Sandbox EdFi.Ods.Sandbox true @@ -15,12 +15,12 @@ - + - - - - + + + + @@ -31,4 +31,4 @@ - + \ No newline at end of file diff --git a/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj b/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj index 0d9811a4a0..1ae3d176c3 100644 --- a/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj +++ b/Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj @@ -2,7 +2,7 @@ EdFi.Ods.Standard LICENSE.txt - net6.0 + net8.0 EdFi.Ods.Standard EdFi.Ods.Standard true @@ -17,11 +17,11 @@ - + - + @@ -45,4 +45,4 @@ - + \ No newline at end of file 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 79381851ef..e700a20749 100644 --- a/Application/EdFi.Ods.Tests.TestExtension/EdFi.Ods.Tests.TestExtension.csproj +++ b/Application/EdFi.Ods.Tests.TestExtension/EdFi.Ods.Tests.TestExtension.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 EdFi.Ods.Tests.FakeExtension EdFi.Ods.Tests.FakeExtension Copyright © 2019 Ed-Fi Alliance, LLC and Contributors @@ -15,7 +15,7 @@ - + @@ -28,8 +28,8 @@ - - - + + + \ No newline at end of file diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Authentication/CachingOAuthTokenValidatorDecoratorTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Authentication/CachingOAuthTokenValidatorDecoratorTests.cs index 591bf68cd8..0473177a48 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Authentication/CachingOAuthTokenValidatorDecoratorTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Authentication/CachingOAuthTokenValidatorDecoratorTests.cs @@ -16,6 +16,8 @@ using NUnit.Framework; using Shouldly; using Test.Common; +using Assert = NUnit.Framework.Legacy.ClassicAssert; + namespace EdFi.Ods.Tests.EdFi.Ods.Api.Services.Authorization { diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Caching/DescriptorsCacheTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Caching/DescriptorsCacheTests.cs index 164426443b..04e842c59c 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Caching/DescriptorsCacheTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Caching/DescriptorsCacheTests.cs @@ -10,15 +10,15 @@ using EdFi.Ods.Api.Dtos; using EdFi.Ods.Api.Providers; using EdFi.Ods.Common.Caching; -using EdFi.Ods.Common.Configuration; using EdFi.Ods.Common.Exceptions; using EdFi.Ods.Common.Providers; -using EdFi.Ods.Common.Utils; using FakeItEasy; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Options; using NUnit.Framework; using Shouldly; +using Assert = NUnit.Framework.Legacy.ClassicAssert; + namespace EdFi.Ods.Tests.EdFi.Ods.Entities.NHibernate { diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Caching/InstanceSecurityRepositoryCacheTest.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Caching/InstanceSecurityRepositoryCacheTest.cs index a02a349bcc..8df8c2270d 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Caching/InstanceSecurityRepositoryCacheTest.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Caching/InstanceSecurityRepositoryCacheTest.cs @@ -13,6 +13,8 @@ using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Options; 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/Providers/ETagProviderTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Providers/ETagProviderTests.cs index 98d4b94f9d..70c052e40d 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Providers/ETagProviderTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Providers/ETagProviderTests.cs @@ -8,6 +8,7 @@ using EdFi.Ods.Common; using EdFi.Ods.Common.Exceptions; using NUnit.Framework; +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 f1ec21bcfe..05a1d5fb67 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Validation/FluentValidationObjectValidatorTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Api/Validation/FluentValidationObjectValidatorTests.cs @@ -117,8 +117,8 @@ public void Should_only_generate_validation_errors_for_the_specific_ruleset() Assert.That( _actualValidationResults.GetAllMessages(), 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..13e662db8b 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,8 @@ 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 7ab1dd4557..80a0e5562c 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 @@ -14,6 +14,8 @@ 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 a2e82cfa25..006351ca96 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 @@ -19,8 +19,10 @@ 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 { public class FilterContextTests 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..c8c5de6bd2 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,8 @@ 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 673879875c..5da3eadad7 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,13 @@ // 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.Models.Graphs; using EdFi.Ods.Common.Models.Resource; using EdFi.Ods.Features.Controllers; @@ -24,10 +17,10 @@ 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 acdaea44ba..f5e4f2c0df 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,11 @@ 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.Security/JsonClaimHelperTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Security/JsonClaimHelperTests.cs index e5e68d735a..4b28a62b72 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Security/JsonClaimHelperTests.cs +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Security/JsonClaimHelperTests.cs @@ -10,6 +10,7 @@ using EdFi.TestFixture; using NUnit.Framework; using Shouldly; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.Ods.Tests.EdFi.Security.Claims { diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj index 8a98aa3167..82143c85f1 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 EdFi.Ods.Tests EdFi.Ods.Tests Copyright © 2019 Ed-Fi Alliance, LLC and Contributors @@ -19,34 +19,34 @@ - + - - + + - + - - - - - + + + + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - + - + @@ -67,4 +67,4 @@ Always - + \ No newline at end of file diff --git a/Application/EdFi.TestObjects/EdFi.TestObjects.csproj b/Application/EdFi.TestObjects/EdFi.TestObjects.csproj index 704aacb45f..cdd7170d09 100644 --- a/Application/EdFi.TestObjects/EdFi.TestObjects.csproj +++ b/Application/EdFi.TestObjects/EdFi.TestObjects.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 EdFi.TestObjects EdFi.TestObjects Copyright © 2019 Ed-Fi Alliance, LLC and Contributors @@ -14,11 +14,11 @@ true - + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -29,4 +29,4 @@ - + \ No newline at end of file diff --git a/Application/Test.Common/Test.Common.csproj b/Application/Test.Common/Test.Common.csproj index b8e4278bb3..3a0c33ff6c 100644 --- a/Application/Test.Common/Test.Common.csproj +++ b/Application/Test.Common/Test.Common.csproj @@ -14,12 +14,12 @@ true - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 64e305c628..5f6e365b2b 100644 --- a/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj +++ b/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj @@ -40,7 +40,7 @@ - + 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 05e253090e..bc45016bda 100644 --- a/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj +++ b/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj @@ -17,7 +17,7 @@ - + diff --git a/tests/EdFi.Common.UnitTests/Database/SqlConnectionStringBuilderAdapterTests.cs b/tests/EdFi.Common.UnitTests/Database/SqlConnectionStringBuilderAdapterTests.cs index 2b0980751f..2a3aabd625 100644 --- a/tests/EdFi.Common.UnitTests/Database/SqlConnectionStringBuilderAdapterTests.cs +++ b/tests/EdFi.Common.UnitTests/Database/SqlConnectionStringBuilderAdapterTests.cs @@ -4,7 +4,7 @@ // See the LICENSE and NOTICES files in the project root for more information. using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using EdFi.Common.Database; using EdFi.TestFixture; using NUnit.Framework; diff --git a/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj b/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj index 87f11afb03..6831715749 100644 --- a/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj +++ b/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj @@ -19,7 +19,7 @@ - + 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 a6ccf897ce..ffa7ebc1b4 100644 --- a/tests/EdFi.Ods.Api.IntegrationTests/EdFi.Ods.Api.IntegrationTests.csproj +++ b/tests/EdFi.Ods.Api.IntegrationTests/EdFi.Ods.Api.IntegrationTests.csproj @@ -1,7 +1,6 @@ - - net6.0 + net8.0 EdFi.Ods.Api.IntegrationTests EdFi.Ods.Api.IntegrationTests Copyright © 2020 Ed-Fi Alliance, LLC and Contributors @@ -11,28 +10,25 @@ true true - - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - - PreserveNewest @@ -42,5 +38,4 @@ appsettings.json - - + \ No newline at end of file diff --git a/tests/EdFi.Ods.Api.IntegrationTests/OrganizationDepartmentTests.cs b/tests/EdFi.Ods.Api.IntegrationTests/OrganizationDepartmentTests.cs index 205141bf03..c7e06b0cfe 100644 --- a/tests/EdFi.Ods.Api.IntegrationTests/OrganizationDepartmentTests.cs +++ b/tests/EdFi.Ods.Api.IntegrationTests/OrganizationDepartmentTests.cs @@ -135,9 +135,9 @@ public void When_updating_organization_department_with_school_to_without_school_ EducationOrganizationHelper.ShouldContainTuples(Connection, (900, 900), (9001, 9001)); EducationOrganizationHelper.ShouldNotContainTuples(Connection, (900, 9001)); } - + // ---------- Advanced Scenarios ------------- - + // This test creates multi-levels of Org Departments under both the LEA and a School. // It then moves the org dept from the LEA to the 2nd-level org department under the school // Finally, it moves it back up to under the LEA. @@ -147,7 +147,7 @@ public void When_updating_organization_departments_parent_elsewhere_in_hierarchy { var baselineTuples = EducationOrganizationHelper.GetExistingTuples(Connection); var baselineTupleCount = baselineTuples.Count; - + Builder .AddLocalEducationAgency(901) .AddOrganizationDepartment(8901, parentEducationOrganizationId: 901) @@ -161,7 +161,7 @@ public void When_updating_organization_departments_parent_elsewhere_in_hierarchy .AddOrganizationDepartment(88901002, parentEducationOrganizationId: 8901002) .Execute(); - var expectedTuplesAfterCreation = new [] + var expectedTuplesAfterCreation = new[] { (901, 901), (8901, 8901), @@ -182,8 +182,8 @@ public void When_updating_organization_departments_parent_elsewhere_in_hierarchy (901001, 7901001), (901001, 8901001), (901, 901002), - (901, 7901002), - (901, 8901002), + (901, 7901002), + (901, 8901002), (901, 88901002), // LEA to 2nd level org department under school (901002, 7901002), (901002, 8901002), @@ -192,12 +192,12 @@ public void When_updating_organization_departments_parent_elsewhere_in_hierarchy }; EducationOrganizationHelper.ShouldContainTuples(Connection, expectedTuplesAfterCreation); - + var afterCreationCount = EducationOrganizationHelper.GetExistingTuples(Connection).Count; - + // Make sure all the tuples above were added (and only those tuples) (baselineTupleCount + expectedTuplesAfterCreation.Length).ShouldBe(afterCreationCount); - + // Move the LEA org department to the bottom of the hierarchy (under 2nd-level school org dept) Builder.UpdateOrganizationDepartment(8901, parentEducationOrganizationId: 88901002).Execute(); @@ -240,20 +240,18 @@ public void When_updating_organization_departments_parent_elsewhere_in_hierarchy (88901002, 8901), // Second-level org dept (88901002, 88901), }; - + EducationOrganizationHelper.ShouldContainTuples(Connection, expectedTuplesAfterMovedDown); - + afterMovedDownCount.ShouldBe(afterCreationCount + 6, - () => - { - return $"The following additional tuples were found: {Environment.NewLine}" - + string.Join(Environment.NewLine, + $"The following additional tuples were found: {Environment.NewLine}" + + string.Join(Environment.NewLine, EducationOrganizationHelper.GetExistingTuples(Connection) .Except(baselineTuples) .Except(expectedTuplesAfterMovedDown) - .Select(t => $"({t.Item1},{t.Item2})")); - }); - + .Select(t => $"({t.Item1},{t.Item2})")) + ); + // Move the original LEA org department back to the LEA Builder.UpdateOrganizationDepartment(8901, parentEducationOrganizationId: 901).Execute(); @@ -268,7 +266,7 @@ public void When_updating_organization_departments_parent_elsewhere_in_hierarchy (8901002, 88901), (88901002, 8901), // Second-level org dept (88901002, 88901)); - + afterMoveBackUpCount.ShouldBe(afterCreationCount); } } diff --git a/tests/EdFi.Ods.Api.IntegrationTests/Security/Authentication/AccessTokenSecurityTests.cs b/tests/EdFi.Ods.Api.IntegrationTests/Security/Authentication/AccessTokenSecurityTests.cs index a3bf9e0bdc..cda524978f 100644 --- a/tests/EdFi.Ods.Api.IntegrationTests/Security/Authentication/AccessTokenSecurityTests.cs +++ b/tests/EdFi.Ods.Api.IntegrationTests/Security/Authentication/AccessTokenSecurityTests.cs @@ -3,22 +3,22 @@ // 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; +using System.Collections.Generic; +using System.Data.Entity; +using System.Linq; +using System.Transactions; using EdFi.Admin.DataAccess; using EdFi.Admin.DataAccess.Contexts; using EdFi.Admin.DataAccess.Models; using EdFi.Admin.DataAccess.Providers; using EdFi.Admin.DataAccess.Repositories; -using EdFi.Ods.Api.Configuration; using EdFi.Common.Configuration; +using EdFi.Ods.Api.Configuration; using EdFi.TestFixture; using Microsoft.Extensions.Configuration; using NUnit.Framework; using Shouldly; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Transactions; -using System.Data.Entity; // ReSharper disable InconsistentNaming @@ -85,7 +85,7 @@ protected ApiClient LoadAnApiClient(Application application) }); TestFixtureContext.SaveChanges(); - return a; + return a.Entity; } protected ClientAccessToken LoadAnAccessToken(ApiClient client, DateTime expiration) @@ -99,14 +99,14 @@ protected ClientAccessToken LoadAnAccessToken(ApiClient client, DateTime expirat TestFixtureContext.SaveChanges(); - return a; + return a.Entity; } protected Vendor LoadAVendor() { var a = TestFixtureContext.Vendors.Add(new Vendor()); TestFixtureContext.SaveChanges(); - return a; + return a.Entity; } protected void LoadAVendorNamespacePrefix(Vendor vendor, string namespacePrefix) @@ -133,7 +133,7 @@ protected Application LoadAnApplication(Vendor vendor, string claimSetName) TestFixtureContext.SaveChanges(); - return a; + return a.Entity; } protected ApplicationEducationOrganization LoadAnApplicationEducationOrganization(Application application, @@ -148,7 +148,7 @@ protected ApplicationEducationOrganization LoadAnApplicationEducationOrganizatio }); TestFixtureContext.SaveChanges(); - return a; + return a.Entity; } protected void LoadAProfile(Application application, string profileName) @@ -182,7 +182,7 @@ protected override void Arrange() var vendor = LoadAVendor(); var application = LoadAnApplication(vendor, "whatever"); - var apiClient = LoadAnApiClient(application, 1); + var apiClient = LoadAnApiClient(application); _accessToken = LoadAnAccessToken(apiClient, DateTime.UtcNow.AddSeconds(-10)); } @@ -209,7 +209,7 @@ protected override void Arrange() { base.Arrange(); - Client = LoadAnApiClient(null, 0); + Client = LoadAnApiClient(null); AccessToken = LoadAnAccessToken(Client, DateTime.UtcNow.AddSeconds(100)); } @@ -337,58 +337,58 @@ public void Should_have_four_records_with_second_ProfileName() } } } + } - [TestFixture] - public class And_client_has_only_minimal_data : Given_an_unexpired_token - { - protected IReadOnlyList Result; - - protected override void Arrange() - { - base.Arrange(); - - var application = LoadAnApplication(null, "Sandbox"); - Client = LoadAnApiClient(application, 5); - AccessToken = LoadAnAccessToken(Client, DateTime.UtcNow.AddSeconds(100)); - } - - protected override void Act() - { - Result = RawApiClientDetailsProvider.GetRawClientDetailsDataAsync(AccessToken.Id) - .ConfigureAwait(false) - .GetAwaiter() - .GetResult(); ; - } - - [TestFixture] - public class When_getting_client_information : And_client_has_only_minimal_data - { - [Test] - public void Should_return_one_record() - { - Result.ShouldNotBeNull(); - Result.Count.ShouldBe(1); - } - - [Test] - public void Should_have_null_EducationOrganizationId() - { - Result.ShouldAllBe(x => !x.EducationOrganizationId.HasValue); - } - - [Test] - public void Should_have_null_ProfileName() - { - Result.ShouldAllBe(x => x.NamespacePrefix == null); - } - - [Test] - public void Should_have_null_NamespacePrefix() - { - Result.ShouldAllBe(x => x.ProfileName == null); - } - } - } + [TestFixture] + public class And_client_has_only_minimal_data : Given_an_unexpired_token + { + protected IReadOnlyList Result; + + protected override void Arrange() + { + base.Arrange(); + + var application = LoadAnApplication(null, "Sandbox"); + Client = LoadAnApiClient(application); + AccessToken = LoadAnAccessToken(Client, DateTime.UtcNow.AddSeconds(100)); + } + + protected override void Act() + { + Result = SystemUnderTest.GetClientForTokenAsync(AccessToken.Id) + .ConfigureAwait(false) + .GetAwaiter() + .GetResult(); ; + } + + [TestFixture] + public class When_getting_client_information : And_client_has_only_minimal_data + { + [Test] + public void Should_return_one_record() + { + Result.ShouldNotBeNull(); + Result.Count.ShouldBe(1); + } + + [Test] + public void Should_have_null_EducationOrganizationId() + { + Result.ShouldAllBe(x => !x.EducationOrganizationId.HasValue); + } + + [Test] + public void Should_have_null_ProfileName() + { + Result.ShouldAllBe(x => x.NamespacePrefix == null); + } + + [Test] + public void Should_have_null_NamespacePrefix() + { + Result.ShouldAllBe(x => x.ProfileName == null); + } + } } } } 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 6e845a0b1c..4fbe1d6bf8 100644 --- a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj +++ b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj @@ -1,7 +1,6 @@ - - net6.0 + net8.0 EdFi.Ods.WebApi.CompositeSpecFlowTests Copyright © 2020 Ed-Fi Alliance, LLC and Contributors true @@ -10,7 +9,6 @@ true true - @@ -27,42 +25,42 @@ - - - - + + + + - - - - - - - + + + + + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - + + + + + + + Always - - Always - appsettings.json - + + Always + appsettings.json + Always @@ -73,4 +71,4 @@ - + \ No newline at end of file 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 ac7e6f9440..1e0fcdaf0b 100644 --- a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj +++ b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj @@ -1,7 +1,6 @@ - - net6.0 + net8.0 EdFi.Ods.WebApi.IntegrationTests EdFi.Ods.WebApi.IntegrationTests Copyright © 2020 Ed-Fi Alliance, LLC and Contributors @@ -11,30 +10,28 @@ true true - - - - - - + + + + + - - - - + + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - @@ -45,15 +42,14 @@ - PreserveNewest - - PreserveNewest - appsettings.json - + + PreserveNewest + appsettings.json + PreserveNewest @@ -61,4 +57,4 @@ PreserveNewest - + \ No newline at end of file diff --git a/tests/EdFi.Security.DataAccess.IntegrationTests/EdFi.Security.DataAccess.IntegrationTests.csproj b/tests/EdFi.Security.DataAccess.IntegrationTests/EdFi.Security.DataAccess.IntegrationTests.csproj index 8b740d2be4..63fb51c7ab 100644 --- a/tests/EdFi.Security.DataAccess.IntegrationTests/EdFi.Security.DataAccess.IntegrationTests.csproj +++ b/tests/EdFi.Security.DataAccess.IntegrationTests/EdFi.Security.DataAccess.IntegrationTests.csproj @@ -4,7 +4,7 @@ false - + 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 07a8ce499c..fb6f2b18dd 100644 --- a/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj +++ b/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj @@ -17,15 +17,15 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/EdFi.TestFixture/EdFi.TestFixture.csproj b/tests/EdFi.TestFixture/EdFi.TestFixture.csproj index e97ae90286..5e3a794c8e 100644 --- a/tests/EdFi.TestFixture/EdFi.TestFixture.csproj +++ b/tests/EdFi.TestFixture/EdFi.TestFixture.csproj @@ -12,7 +12,7 @@ DEBUG;TRACE - +