From 6d52dd031a3ac4f49a5e3c181bdd4a6770dd6fcf Mon Sep 17 00:00:00 2001 From: Axel Marquez <158314644+axelmarquezh@users.noreply.github.com> Date: Fri, 14 Jun 2024 11:39:12 -0600 Subject: [PATCH] [ODS-6229] Migrate EdFi.Common to .NET 8 (#1078) --- .github/workflows/Lib edFi.common.yml | 4 --- .../EdFi.Admin.DataAccess.csproj | 2 +- .../SqlConnectionStringBuilderAdapter.cs | 2 +- Application/EdFi.Common/EdFi.Common.csproj | 8 ++--- .../Security/Pbkdf2HmacSha1SecureHasher.cs | 4 +-- Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj | 2 +- .../EdFi.Ods.Common/EdFi.Ods.Common.csproj | 2 +- ...i.Ods.Repositories.NHibernate.Tests.csproj | 2 +- .../EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj | 2 +- .../EdFi.Ods.Tests/EdFi.Ods.Tests.csproj | 2 +- .../EdFi.Security.DataAccess.csproj | 2 +- .../EdFi.TestObjects/EdFi.TestObjects.csproj | 2 +- .../EdFi.BulkLoadClient.Console.csproj | 2 +- .../EdFi.LoadTools.Test.csproj | 2 +- .../EdFi.LoadTools/EdFi.LoadTools.csproj | 2 +- .../EdFi.SmokeTest.Console.csproj | 2 +- .../EdFi.XmlLookup.Console.csproj | 2 +- .../EdFi.Admin.DataAccess.UnitTests.csproj | 2 +- .../EdFi.Common.UnitTests.csproj | 29 +++++++++---------- .../Inflection/InflectorTests.cs | 1 + ...i.Ods.WebApi.CompositeSpecFlowTests.csproj | 2 +- .../EdFi.Ods.WebApi.IntegrationTests.csproj | 2 +- .../EdFi.Security.DataAccess.UnitTests.csproj | 2 +- .../EdFi.TestFixture/EdFi.TestFixture.csproj | 6 ++-- 24 files changed, 42 insertions(+), 46 deletions(-) diff --git a/.github/workflows/Lib edFi.common.yml b/.github/workflows/Lib edFi.common.yml index d3fccab0a4..a5fe4856fd 100644 --- a/.github/workflows/Lib edFi.common.yml +++ b/.github/workflows/Lib edFi.common.yml @@ -18,10 +18,6 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - name: Setup .NET - uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a # v3.0.3 - with: - dotnet-version: 3.1.x - name: build run: | .\build.githubactions.ps1 build -Configuration ${{ env.CONFIGURATION }} -InformationalVersion ${{ env.INFORMATIONAL_VERSION}} -BuildCounter ${{ github.run_number }} -BuildIncrementer ${{env.BUILD_INCREMENTER}} -Solution "Application/EdFi.Common/EdFi.Common.sln" -ProjectFile "Application/EdFi.Common/EdFi.Common.csproj" diff --git a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj index 2ac0cf9d95..e91c11689c 100644 --- a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj +++ b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj @@ -16,7 +16,7 @@ true - + diff --git a/Application/EdFi.Common/Database/SqlConnectionStringBuilderAdapter.cs b/Application/EdFi.Common/Database/SqlConnectionStringBuilderAdapter.cs index e53aaaee52..be3ec2159d 100644 --- a/Application/EdFi.Common/Database/SqlConnectionStringBuilderAdapter.cs +++ b/Application/EdFi.Common/Database/SqlConnectionStringBuilderAdapter.cs @@ -5,7 +5,7 @@ using System; using System.Data.Common; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; namespace EdFi.Common.Database { diff --git a/Application/EdFi.Common/EdFi.Common.csproj b/Application/EdFi.Common/EdFi.Common.csproj index 33460833a2..bac2b10553 100644 --- a/Application/EdFi.Common/EdFi.Common.csproj +++ b/Application/EdFi.Common/EdFi.Common.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 Debug;Release true true @@ -13,9 +13,9 @@ DEBUG;TRACE - - + + - + diff --git a/Application/EdFi.Common/Security/Pbkdf2HmacSha1SecureHasher.cs b/Application/EdFi.Common/Security/Pbkdf2HmacSha1SecureHasher.cs index 9ddf59584d..1002ecaa30 100644 --- a/Application/EdFi.Common/Security/Pbkdf2HmacSha1SecureHasher.cs +++ b/Application/EdFi.Common/Security/Pbkdf2HmacSha1SecureHasher.cs @@ -34,7 +34,7 @@ public PackedHash ComputeHash(string secret, int hashAlgorithm, int iterations, { byte[] bytes; - using (var rfc2898DeriveBytes = new Rfc2898DeriveBytes(secret, salt, iterations)) + using (var rfc2898DeriveBytes = new Rfc2898DeriveBytes(secret, salt, iterations, HashAlgorithmName.SHA1)) { bytes = rfc2898DeriveBytes.GetBytes(32); } @@ -54,7 +54,7 @@ public PackedHash ComputeHash(string secret, int hashAlgorithm, int iterations, byte[] bytes; byte[] salt; - using (var rfc2898DeriveBytes = new Rfc2898DeriveBytes(secret, saltSizeInBytes, iterations)) + using (var rfc2898DeriveBytes = new Rfc2898DeriveBytes(secret, saltSizeInBytes, iterations, HashAlgorithmName.SHA1)) { salt = rfc2898DeriveBytes.Salt; bytes = rfc2898DeriveBytes.GetBytes(32); diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj index 5b1fd86f47..91cb41a6f6 100644 --- a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj +++ b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj @@ -22,7 +22,7 @@ - + diff --git a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj index 12b1809cfd..e11fa39945 100644 --- a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj +++ b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj @@ -16,7 +16,7 @@ DEBUG;TRACE - + 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 1d567fd3a7..2fc845ed17 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 @@ -17,7 +17,7 @@ true - + diff --git a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj index 4ed29786d5..563adea444 100644 --- a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj +++ b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj @@ -14,7 +14,7 @@ - + diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj index 73ee610936..a99b21712d 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj @@ -23,7 +23,7 @@ - + diff --git a/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj b/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj index d63dae2696..5f226dcc21 100644 --- a/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj +++ b/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj @@ -15,7 +15,7 @@ true - + diff --git a/Application/EdFi.TestObjects/EdFi.TestObjects.csproj b/Application/EdFi.TestObjects/EdFi.TestObjects.csproj index 02a33a95fa..5722c80673 100644 --- a/Application/EdFi.TestObjects/EdFi.TestObjects.csproj +++ b/Application/EdFi.TestObjects/EdFi.TestObjects.csproj @@ -15,7 +15,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj b/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj index 509b44a5d4..222a75b98f 100644 --- a/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj +++ b/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj @@ -38,7 +38,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj b/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj index 9a01726cdb..637aca511f 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj @@ -21,7 +21,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj b/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj index dd03727734..adb5e0ffba 100644 --- a/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj +++ b/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj @@ -23,7 +23,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj b/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj index 39e98b06a9..0abd8f27d3 100644 --- a/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj +++ b/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj @@ -40,7 +40,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj b/Utilities/DataLoading/EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj index aba13515e4..82ec7348bb 100644 --- a/Utilities/DataLoading/EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj +++ b/Utilities/DataLoading/EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj @@ -29,7 +29,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 663c714d42..b724e5ac02 100644 --- a/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj +++ b/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj @@ -16,7 +16,7 @@ true - + diff --git a/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj b/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj index 159266a158..87f11afb03 100644 --- a/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj +++ b/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 Debug;Release true true @@ -19,27 +19,26 @@ - - - - + + + + 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 d29ca34931..6475dd25b2 100644 --- a/tests/EdFi.Common.UnitTests/Inflection/InflectorTests.cs +++ b/tests/EdFi.Common.UnitTests/Inflection/InflectorTests.cs @@ -6,6 +6,7 @@ using System.Linq; using EdFi.Common.Inflection; using NUnit.Framework; +using Assert = NUnit.Framework.Legacy.ClassicAssert; namespace EdFi.Ods.Common.UnitTests.Inflection { 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 faa087f6f5..08e2c10d90 100644 --- a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj +++ b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj @@ -31,7 +31,7 @@ - + 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 572a40c8ef..c3e9d802cd 100644 --- a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj +++ b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj @@ -20,7 +20,7 @@ - + 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 767690f5a6..4ca0d85bad 100644 --- a/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj +++ b/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj @@ -16,7 +16,7 @@ true - + diff --git a/tests/EdFi.TestFixture/EdFi.TestFixture.csproj b/tests/EdFi.TestFixture/EdFi.TestFixture.csproj index 02b02307d6..438d3fbae8 100644 --- a/tests/EdFi.TestFixture/EdFi.TestFixture.csproj +++ b/tests/EdFi.TestFixture/EdFi.TestFixture.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 Debug;Release Copyright © 2020 Ed-Fi Alliance, LLC and Contributors true @@ -13,7 +13,7 @@ - - + +