Skip to content

Commit

Permalink
[ODS-6246] Update dependencies (#963)
Browse files Browse the repository at this point in the history
  • Loading branch information
simpat-jesus authored and semalaiappan committed Mar 7, 2024
1 parent ec0d7c6 commit da1b1ec
Show file tree
Hide file tree
Showing 58 changed files with 164 additions and 158 deletions.
10 changes: 5 additions & 5 deletions Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
</Choose>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
</ItemGroup>
<ItemGroup>
<None Include="../../LICENSE.txt" Pack="true" PackagePath="LICENSE.txt" />
Expand Down
6 changes: 3 additions & 3 deletions Application/EdFi.Common/EdFi.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="Npgsql" Version="8.0.1" />
<PackageReference Include="Npgsql" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
</ItemGroup>
</Project>
14 changes: 7 additions & 7 deletions Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.0" />
<PackageReference Include="FluentValidation" Version="11.9.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.8" />
<PackageReference Include="NHibernate" Version="5.4.0" />
<PackageReference Include="Polly" Version="7.2.3" />
<PackageReference Include="Quartz.AspNetCore" Version="3.5.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.13" />
<PackageReference Include="NHibernate" Version="5.5.0" />
<PackageReference Include="Polly" Version="8.3.0" />
<PackageReference Include="Quartz.AspNetCore" Version="3.8.1" />
<PackageReference Include="Sandwych.QuickGraph.Core" Version="1.0.0" />
<PackageReference Include="Standart.Hash.xxHash" Version="4.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.2" />
<PackageReference Include="System.CodeDom" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@

using Microsoft.Extensions.DependencyInjection;
using Quartz;
using Quartz.AspNetCore;

namespace EdFi.Ods.Api.Jobs.Extensions
{
public static class ServiceCollectionExtensions
{
public static void AddScheduledJobs(this IServiceCollection services)
{
services.AddQuartz(q => { q.UseMicrosoftDependencyInjectionJobFactory(); });
services.AddQuartz();

services.AddQuartzServer(options => { options.WaitForJobsToComplete = true; });
}
Expand Down
12 changes: 6 additions & 6 deletions Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
</Otherwise>
</Choose>
<ItemGroup>
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
<PackageReference Include="Dapper" Version="2.0.123" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
<PackageReference Include="Dapper" Version="2.1.28" />
<PackageReference Include="FluentValidation" Version="11.9.0" />
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="MediatR" Version="12.0.1" />
<PackageReference Include="MediatR" Version="12.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="NHibernate" Version="5.4.0" />
<PackageReference Include="Npgsql" Version="8.0.1" />
<PackageReference Include="NHibernate" Version="5.5.0" />
<PackageReference Include="Npgsql" Version="8.0.2" />
<PackageReference Include="Sandwych.QuickGraph.Core" Version="1.0.0" />
<PackageReference Include="Standart.Hash.xxHash" Version="4.0.5" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
Expand Down
8 changes: 4 additions & 4 deletions Application/EdFi.Ods.Features/EdFi.Ods.Features.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
</PropertyGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.8" />
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.1" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.13" />
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.2" />
</ItemGroup>
<ItemGroup>
<None Remove="Resources\ChangeQueries.json" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
</Otherwise>
</Choose>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.36" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.39" />
<PackageReference Include="Shouldly" Version="4.2.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\tests\EdFi.TestFixture\EdFi.TestFixture.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</Otherwise>
</Choose>
<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.123" />
<PackageReference Include="Npgsql" Version="8.0.1" />
<PackageReference Include="Dapper" Version="2.1.28" />
<PackageReference Include="Npgsql" Version="8.0.2" />
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Application/EdFi.Ods.Standard/EdFi.Ods.Standard.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NHibernate" Version="5.4.0" />
<PackageReference Include="NHibernate" Version="5.5.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EdFi.Ods.Api\EdFi.Ods.Api.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<Content Include="Marker_EdFi_Ods_Test_TestExtension.cs">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}'");
}
}

Expand Down Expand Up @@ -90,7 +90,7 @@ protected override void Act()
break;
}

Assert.Fail("Duplicate alias generated: '{0}'", nextAlias);
Assert.Fail($"Duplicate alias generated: '{nextAlias}'");
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,21 @@
// 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;
using EdFi.TestFixture;
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
{
Expand Down
12 changes: 6 additions & 6 deletions Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@
</Otherwise>
</Choose>
<ItemGroup>
<PackageReference Include="CompareNETObjects" Version="4.78.0" />
<PackageReference Include="CompareNETObjects" Version="4.83.0" />
<PackageReference Include="EntityFrameworkTesting.FakeItEasy" Version="1.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit.ConsoleRunner" Version="3.16.2" />
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.36" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.17.0" />
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.39" />
<PackageReference Include="Shouldly" Version="4.2.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\tests\EdFi.TestFixture\EdFi.TestFixture.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
</Otherwise>
</Choose>
<ItemGroup>
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
<PackageReference Include="EFCore.NamingConventions" Version="8.0.3" />
<PackageReference Include="Npgsql" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageReference Include="Npgsql" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Application/Test.Common/Test.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
<PackageReference Include="NUnit" Version="4.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ApprovalTests" Version="5.8.0" />
<PackageReference Include="FakeItEasy" Version="7.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="ApprovalTests" Version="6.0.0" />
<PackageReference Include="FakeItEasy" Version="8.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit" Version="4.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Shouldly" Version="4.2.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Application\EdFi.Ods.Common\EdFi.Ods.Common.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="DatabaseSchemaReader" Version="2.7.17" />
<PackageReference Include="DatabaseSchemaReader" Version="2.10.1" />
<PackageReference Include="FluentValidation" Version="11.9.0" />
<PackageReference Include="Stubble.Core" Version="1.10.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
Expand Down
Loading

0 comments on commit da1b1ec

Please sign in to comment.