From 6fbb07c011e87a32fc559246bc0015cb69caca2e Mon Sep 17 00:00:00 2001 From: Mikhail Preyskurantov Date: Tue, 12 Sep 2023 13:50:28 +0300 Subject: [PATCH 1/4] Migrate TargetFramework netstandard2.0 -> net6.0 (except for DevExtreme.AspNet.Data.Tests.Common - otherwise, cannot be linked in other Tests project) --- ...evExtreme.AspNet.Data.Tests.EFCore1.csproj | 26 ------------------- ...evExtreme.AspNet.Data.Tests.EFCore2.csproj | 24 ----------------- ...evExtreme.AspNet.Data.Tests.EFCore3.csproj | 2 +- ...evExtreme.AspNet.Data.Tests.EFCore5.csproj | 2 +- ...evExtreme.AspNet.Data.Tests.EFCore6.csproj | 2 +- ...evExtreme.AspNet.Data.Tests.EFCore7.csproj | 2 +- .../DevExtreme.AspNet.Data.Tests.NH.csproj | 2 +- .../DevExtreme.AspNet.Data.Tests.Xpo.csproj | 2 +- .../DevExtreme.AspNet.Data.Tests.csproj | 2 +- .../DevExtreme.AspNet.Data.csproj | 4 +-- net/Sample/Sample.csproj | 2 +- 11 files changed, 10 insertions(+), 60 deletions(-) delete mode 100644 net/DevExtreme.AspNet.Data.Tests.EFCore1/DevExtreme.AspNet.Data.Tests.EFCore1.csproj delete mode 100644 net/DevExtreme.AspNet.Data.Tests.EFCore2/DevExtreme.AspNet.Data.Tests.EFCore2.csproj diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore1/DevExtreme.AspNet.Data.Tests.EFCore1.csproj b/net/DevExtreme.AspNet.Data.Tests.EFCore1/DevExtreme.AspNet.Data.Tests.EFCore1.csproj deleted file mode 100644 index e4718a96..00000000 --- a/net/DevExtreme.AspNet.Data.Tests.EFCore1/DevExtreme.AspNet.Data.Tests.EFCore1.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - netcoreapp3.1 - EFCORE1 - - - - - - - - - - - - - - - - - - - - - diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore2/DevExtreme.AspNet.Data.Tests.EFCore2.csproj b/net/DevExtreme.AspNet.Data.Tests.EFCore2/DevExtreme.AspNet.Data.Tests.EFCore2.csproj deleted file mode 100644 index 78204059..00000000 --- a/net/DevExtreme.AspNet.Data.Tests.EFCore2/DevExtreme.AspNet.Data.Tests.EFCore2.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - netcoreapp3.1 - EFCORE2 - - - - - - - - - - - - - - - - - - - diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore3/DevExtreme.AspNet.Data.Tests.EFCore3.csproj b/net/DevExtreme.AspNet.Data.Tests.EFCore3/DevExtreme.AspNet.Data.Tests.EFCore3.csproj index 7fdae812..7dcde552 100644 --- a/net/DevExtreme.AspNet.Data.Tests.EFCore3/DevExtreme.AspNet.Data.Tests.EFCore3.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.EFCore3/DevExtreme.AspNet.Data.Tests.EFCore3.csproj @@ -1,7 +1,7 @@ - net6 + net6.0 EFCORE3 diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore5/DevExtreme.AspNet.Data.Tests.EFCore5.csproj b/net/DevExtreme.AspNet.Data.Tests.EFCore5/DevExtreme.AspNet.Data.Tests.EFCore5.csproj index 8b261151..ff2f29ee 100644 --- a/net/DevExtreme.AspNet.Data.Tests.EFCore5/DevExtreme.AspNet.Data.Tests.EFCore5.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.EFCore5/DevExtreme.AspNet.Data.Tests.EFCore5.csproj @@ -1,7 +1,7 @@ - net6 + net6.0 EFCORE5 diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore6/DevExtreme.AspNet.Data.Tests.EFCore6.csproj b/net/DevExtreme.AspNet.Data.Tests.EFCore6/DevExtreme.AspNet.Data.Tests.EFCore6.csproj index 7409f68d..1e22478c 100644 --- a/net/DevExtreme.AspNet.Data.Tests.EFCore6/DevExtreme.AspNet.Data.Tests.EFCore6.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.EFCore6/DevExtreme.AspNet.Data.Tests.EFCore6.csproj @@ -1,7 +1,7 @@ - net6 + net6.0 EFCORE6 diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore7/DevExtreme.AspNet.Data.Tests.EFCore7.csproj b/net/DevExtreme.AspNet.Data.Tests.EFCore7/DevExtreme.AspNet.Data.Tests.EFCore7.csproj index ca6f8d12..535db241 100644 --- a/net/DevExtreme.AspNet.Data.Tests.EFCore7/DevExtreme.AspNet.Data.Tests.EFCore7.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.EFCore7/DevExtreme.AspNet.Data.Tests.EFCore7.csproj @@ -1,7 +1,7 @@ - net7 + net7.0 EFCORE7 diff --git a/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj b/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj index 6fa549f9..228d07b4 100644 --- a/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.NH/DevExtreme.AspNet.Data.Tests.NH.csproj @@ -1,7 +1,7 @@ - net6 + net6.0 diff --git a/net/DevExtreme.AspNet.Data.Tests.Xpo/DevExtreme.AspNet.Data.Tests.Xpo.csproj b/net/DevExtreme.AspNet.Data.Tests.Xpo/DevExtreme.AspNet.Data.Tests.Xpo.csproj index 9d10d6a9..904fec4e 100644 --- a/net/DevExtreme.AspNet.Data.Tests.Xpo/DevExtreme.AspNet.Data.Tests.Xpo.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.Xpo/DevExtreme.AspNet.Data.Tests.Xpo.csproj @@ -1,7 +1,7 @@ - net6 + net6.0 diff --git a/net/DevExtreme.AspNet.Data.Tests/DevExtreme.AspNet.Data.Tests.csproj b/net/DevExtreme.AspNet.Data.Tests/DevExtreme.AspNet.Data.Tests.csproj index 9f24dd31..73074112 100644 --- a/net/DevExtreme.AspNet.Data.Tests/DevExtreme.AspNet.Data.Tests.csproj +++ b/net/DevExtreme.AspNet.Data.Tests/DevExtreme.AspNet.Data.Tests.csproj @@ -1,7 +1,7 @@  - net6 + net6.0 diff --git a/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj b/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj index 4e7d5fe2..f047ca60 100644 --- a/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj +++ b/net/DevExtreme.AspNet.Data/DevExtreme.AspNet.Data.csproj @@ -14,7 +14,7 @@ DevExtreme.AspNet.Data 99.0 - net452;netstandard2.0 + net452;net6.0 full bin\Debug\$(TargetFramework)\DevExtreme.AspNet.Data.xml 1591 @@ -28,7 +28,7 @@ - + diff --git a/net/Sample/Sample.csproj b/net/Sample/Sample.csproj index 5c88e7fd..e9168b07 100644 --- a/net/Sample/Sample.csproj +++ b/net/Sample/Sample.csproj @@ -1,7 +1,7 @@  - net6 + net6.0 From 94bce3928d88ee000e3f61e5d163b95fc525c9c0 Mon Sep 17 00:00:00 2001 From: Mikhail Preyskurantov Date: Tue, 12 Sep 2023 14:06:44 +0300 Subject: [PATCH 2/4] Remove Tests.EFCore1 and Tests.EFCore2 from sln --- net/DevExtreme.AspNet.Data.sln | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/net/DevExtreme.AspNet.Data.sln b/net/DevExtreme.AspNet.Data.sln index 9a328217..f2613a11 100644 --- a/net/DevExtreme.AspNet.Data.sln +++ b/net/DevExtreme.AspNet.Data.sln @@ -16,21 +16,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Test EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "Sample\Sample.csproj", "{760B3927-BB40-4D5B-B64C-880E75E4A4A5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.NET4", "DevExtreme.AspNet.Data.Tests.NET4\DevExtreme.AspNet.Data.Tests.NET4.csproj", "{D083C7D4-E8EC-409F-8B45-512FABB21A54}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.NET4", "DevExtreme.AspNet.Data.Tests.NET4\DevExtreme.AspNet.Data.Tests.NET4.csproj", "{D083C7D4-E8EC-409F-8B45-512FABB21A54}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.EF6", "DevExtreme.AspNet.Data.Tests.EF6\DevExtreme.AspNet.Data.Tests.EF6.csproj", "{C401BB6E-D21B-45D5-AB98-6B308DB4E4FB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.EF6", "DevExtreme.AspNet.Data.Tests.EF6\DevExtreme.AspNet.Data.Tests.EF6.csproj", "{C401BB6E-D21B-45D5-AB98-6B308DB4E4FB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.EFCore1", "DevExtreme.AspNet.Data.Tests.EFCore1\DevExtreme.AspNet.Data.Tests.EFCore1.csproj", "{215EE7D0-0E2B-4A07-810F-9224F0C5021F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.Common", "DevExtreme.AspNet.Data.Tests.Common\DevExtreme.AspNet.Data.Tests.Common.csproj", "{F5878AD6-459F-4FCE-9BFB-54EE94D2083F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.Common", "DevExtreme.AspNet.Data.Tests.Common\DevExtreme.AspNet.Data.Tests.Common.csproj", "{F5878AD6-459F-4FCE-9BFB-54EE94D2083F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.Xpo", "DevExtreme.AspNet.Data.Tests.Xpo\DevExtreme.AspNet.Data.Tests.Xpo.csproj", "{074B5988-B409-4BEE-BF12-79762B459857}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.EFCore2", "DevExtreme.AspNet.Data.Tests.EFCore2\DevExtreme.AspNet.Data.Tests.EFCore2.csproj", "{03F66C05-DB87-483C-B96D-567EC4C6BF5C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.NH", "DevExtreme.AspNet.Data.Tests.NH\DevExtreme.AspNet.Data.Tests.NH.csproj", "{B9B11471-3317-4A42-B3AE-1879B76E3941}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.Xpo", "DevExtreme.AspNet.Data.Tests.Xpo\DevExtreme.AspNet.Data.Tests.Xpo.csproj", "{074B5988-B409-4BEE-BF12-79762B459857}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.NH", "DevExtreme.AspNet.Data.Tests.NH\DevExtreme.AspNet.Data.Tests.NH.csproj", "{B9B11471-3317-4A42-B3AE-1879B76E3941}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevExtreme.AspNet.Data.Tests.L2S", "DevExtreme.AspNet.Data.Tests.L2S\DevExtreme.AspNet.Data.Tests.L2S.csproj", "{190E01CD-78FC-4578-ACBF-7D6C4DC57C18}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.L2S", "DevExtreme.AspNet.Data.Tests.L2S\DevExtreme.AspNet.Data.Tests.L2S.csproj", "{190E01CD-78FC-4578-ACBF-7D6C4DC57C18}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevExtreme.AspNet.Data.Tests.EFCore3", "DevExtreme.AspNet.Data.Tests.EFCore3\DevExtreme.AspNet.Data.Tests.EFCore3.csproj", "{3DAF3316-6B1B-4961-831A-790647662554}" EndProject @@ -66,18 +62,10 @@ Global {C401BB6E-D21B-45D5-AB98-6B308DB4E4FB}.Debug|Any CPU.Build.0 = Debug|Any CPU {C401BB6E-D21B-45D5-AB98-6B308DB4E4FB}.Release|Any CPU.ActiveCfg = Release|Any CPU {C401BB6E-D21B-45D5-AB98-6B308DB4E4FB}.Release|Any CPU.Build.0 = Release|Any CPU - {215EE7D0-0E2B-4A07-810F-9224F0C5021F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {215EE7D0-0E2B-4A07-810F-9224F0C5021F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {215EE7D0-0E2B-4A07-810F-9224F0C5021F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {215EE7D0-0E2B-4A07-810F-9224F0C5021F}.Release|Any CPU.Build.0 = Release|Any CPU {F5878AD6-459F-4FCE-9BFB-54EE94D2083F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F5878AD6-459F-4FCE-9BFB-54EE94D2083F}.Debug|Any CPU.Build.0 = Debug|Any CPU {F5878AD6-459F-4FCE-9BFB-54EE94D2083F}.Release|Any CPU.ActiveCfg = Release|Any CPU {F5878AD6-459F-4FCE-9BFB-54EE94D2083F}.Release|Any CPU.Build.0 = Release|Any CPU - {03F66C05-DB87-483C-B96D-567EC4C6BF5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03F66C05-DB87-483C-B96D-567EC4C6BF5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03F66C05-DB87-483C-B96D-567EC4C6BF5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03F66C05-DB87-483C-B96D-567EC4C6BF5C}.Release|Any CPU.Build.0 = Release|Any CPU {074B5988-B409-4BEE-BF12-79762B459857}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {074B5988-B409-4BEE-BF12-79762B459857}.Debug|Any CPU.Build.0 = Debug|Any CPU {074B5988-B409-4BEE-BF12-79762B459857}.Release|Any CPU.ActiveCfg = Release|Any CPU From efb9a08edf1afd8864d318899220944c8ecf5d6e Mon Sep 17 00:00:00 2001 From: Mikhail Preyskurantov Date: Tue, 12 Sep 2023 14:14:58 +0300 Subject: [PATCH 3/4] Remove old dotnet-version --- .github/actions/dotnet-test-build/action.yml | 1 - .github/workflows/ci.yml | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/actions/dotnet-test-build/action.yml b/.github/actions/dotnet-test-build/action.yml index 0a448fa4..50015428 100644 --- a/.github/actions/dotnet-test-build/action.yml +++ b/.github/actions/dotnet-test-build/action.yml @@ -9,7 +9,6 @@ runs: with: dotnet-quality: ga dotnet-version: | - 3.1 6.0 7.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff662841..9dead929 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,9 +91,7 @@ jobs: - uses: actions/setup-dotnet@v3 with: dotnet-quality: ga - dotnet-version: | - 3.1 - 6.0 + dotnet-version: 6.0 - uses: actions/checkout@v3 From e1ca8b2fb93627998995e209b670b30ffd407c7b Mon Sep 17 00:00:00 2001 From: Mikhail Preyskurantov Date: Tue, 12 Sep 2023 17:13:28 +0300 Subject: [PATCH 4/4] Convert Tests.Common to multi target, get rid netstandard2.0 --- .../DevExtreme.AspNet.Data.Tests.Common.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj b/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj index 9f3ca2c1..345163de 100644 --- a/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj +++ b/net/DevExtreme.AspNet.Data.Tests.Common/DevExtreme.AspNet.Data.Tests.Common.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net452;net6.0 DevExtreme.AspNet.Data.Tests False