diff --git a/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj b/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj index 9d1460f2963..2fe4305fae0 100644 --- a/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj +++ b/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Benchmarks diff --git a/benchmark/EFCore.SqlServer.Benchmarks/EFCore.SqlServer.Benchmarks.csproj b/benchmark/EFCore.SqlServer.Benchmarks/EFCore.SqlServer.Benchmarks.csproj index 805190f619a..3e67e42ffec 100644 --- a/benchmark/EFCore.SqlServer.Benchmarks/EFCore.SqlServer.Benchmarks.csproj +++ b/benchmark/EFCore.SqlServer.Benchmarks/EFCore.SqlServer.Benchmarks.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Benchmarks Exe diff --git a/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj b/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj index c27f7ce7de8..3decda2b1f7 100644 --- a/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj +++ b/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Benchmarks Exe diff --git a/eng/helix.proj b/eng/helix.proj index 5438cea8671..37317944802 100644 --- a/eng/helix.proj +++ b/eng/helix.proj @@ -54,7 +54,7 @@ - net5.0 + net6.0 netcoreapp2.0 2.4.1 diff --git a/global.json b/global.json index efec5d3fd9a..f2bee489e8b 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "5.0.104", + "dotnet": "6.0.100-preview.2.21155.3", "runtimes": { "dotnet": [ "3.1.13" @@ -11,7 +11,7 @@ } }, "sdk": { - "version": "5.0.104", + "version": "6.0.100-preview.2.21155.3", "allowPrerelease": true, "rollForward": "latestMajor" }, diff --git a/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj b/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj index d68e8bdd40f..79ca5e35055 100644 --- a/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj +++ b/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Analyzers.Tests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.AspNet.InMemory.FunctionalTests/EFCore.AspNet.InMemory.FunctionalTests.csproj b/test/EFCore.AspNet.InMemory.FunctionalTests/EFCore.AspNet.InMemory.FunctionalTests.csproj index 5a973b7f0f5..c1f3bea88a7 100644 --- a/test/EFCore.AspNet.InMemory.FunctionalTests/EFCore.AspNet.InMemory.FunctionalTests.csproj +++ b/test/EFCore.AspNet.InMemory.FunctionalTests/EFCore.AspNet.InMemory.FunctionalTests.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 Microsoft.EntityFrameworkCore.AspNet.InMemory.FunctionalTests Microsoft.EntityFrameworkCore @@ -10,9 +10,6 @@ PreserveNewest - - PreserveNewest - diff --git a/test/EFCore.AspNet.Specification.Tests/EFCore.AspNet.Specification.Tests.csproj b/test/EFCore.AspNet.Specification.Tests/EFCore.AspNet.Specification.Tests.csproj index 582cc3df09d..4bd87c36beb 100644 --- a/test/EFCore.AspNet.Specification.Tests/EFCore.AspNet.Specification.Tests.csproj +++ b/test/EFCore.AspNet.Specification.Tests/EFCore.AspNet.Specification.Tests.csproj @@ -2,7 +2,7 @@ Shared ASP.NET test suite for Entity Framework Core database providers. - net5.0 + net6.0 Microsoft.EntityFrameworkCore.AspNet.Specification.Tests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.AspNet.SqlServer.FunctionalTests/EFCore.AspNet.SqlServer.FunctionalTests.csproj b/test/EFCore.AspNet.SqlServer.FunctionalTests/EFCore.AspNet.SqlServer.FunctionalTests.csproj index e9548af8b9b..c5ff4bf87cd 100644 --- a/test/EFCore.AspNet.SqlServer.FunctionalTests/EFCore.AspNet.SqlServer.FunctionalTests.csproj +++ b/test/EFCore.AspNet.SqlServer.FunctionalTests/EFCore.AspNet.SqlServer.FunctionalTests.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 Microsoft.EntityFrameworkCore.AspNet.SqlServer.FunctionalTests Microsoft.EntityFrameworkCore True @@ -11,9 +11,6 @@ PreserveNewest - - PreserveNewest - diff --git a/test/EFCore.AspNet.Sqlite.FunctionalTests/EFCore.AspNet.Sqlite.FunctionalTests.csproj b/test/EFCore.AspNet.Sqlite.FunctionalTests/EFCore.AspNet.Sqlite.FunctionalTests.csproj index ff671618aa8..41ff78985dd 100644 --- a/test/EFCore.AspNet.Sqlite.FunctionalTests/EFCore.AspNet.Sqlite.FunctionalTests.csproj +++ b/test/EFCore.AspNet.Sqlite.FunctionalTests/EFCore.AspNet.Sqlite.FunctionalTests.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 Microsoft.EntityFrameworkCore.AspNet.Sqlite.FunctionalTests Microsoft.EntityFrameworkCore @@ -10,9 +10,6 @@ PreserveNewest - - PreserveNewest - diff --git a/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj b/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj index 4476f37dc52..ca49776d0ea 100644 --- a/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj +++ b/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj @@ -1,15 +1,12 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Cosmos.FunctionalTests Microsoft.EntityFrameworkCore - - PreserveNewest - PreserveNewest diff --git a/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj b/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj index 092602ee0d0..4db6302bb43 100644 --- a/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj +++ b/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj @@ -1,17 +1,11 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Cosmos.Tests Microsoft.EntityFrameworkCore.Cosmos - - - PreserveNewest - - - diff --git a/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj b/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj index 5be8fbf8d14..fdcc1cfd0a3 100644 --- a/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj +++ b/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj @@ -1,17 +1,11 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.CrossStore.FunctionalTests Microsoft.EntityFrameworkCore - - - PreserveNewest - - - diff --git a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj index 1f11db3b6ea..518d49a2698 100644 --- a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj +++ b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj @@ -1,18 +1,12 @@  - net5.0 + net6.0 true Microsoft.EntityFrameworkCore.Design.Tests Microsoft.EntityFrameworkCore - - - Always - - - diff --git a/test/EFCore.Design.Tests/xunit.runner.json b/test/EFCore.Design.Tests/xunit.runner.json deleted file mode 100644 index 0f530c147cf..00000000000 --- a/test/EFCore.Design.Tests/xunit.runner.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj b/test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj index 68ac9c2e3e2..84b391a6967 100644 --- a/test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj +++ b/test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj @@ -1,17 +1,11 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.InMemory.FunctionalTests Microsoft.EntityFrameworkCore - - - PreserveNewest - - - diff --git a/test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj b/test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj index 4281caef41e..55bc28096c2 100644 --- a/test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj +++ b/test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj @@ -1,17 +1,11 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.InMemory.Tests Microsoft.EntityFrameworkCore - - - PreserveNewest - - - diff --git a/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj b/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj index e0a741e92ce..f88ff64a074 100644 --- a/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj +++ b/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 Microsoft.EntityFrameworkCore.OData.FunctionalTests Microsoft.EntityFrameworkCore True diff --git a/test/EFCore.Proxies.Tests/EFCore.Proxies.Tests.csproj b/test/EFCore.Proxies.Tests/EFCore.Proxies.Tests.csproj index c494ea7371d..e2aece85041 100644 --- a/test/EFCore.Proxies.Tests/EFCore.Proxies.Tests.csproj +++ b/test/EFCore.Proxies.Tests/EFCore.Proxies.Tests.csproj @@ -1,17 +1,11 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Proxies.Tests Microsoft.EntityFrameworkCore - - - PreserveNewest - - - diff --git a/test/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj b/test/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj index b7f01551b83..9abd6f267f6 100644 --- a/test/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj +++ b/test/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj @@ -2,7 +2,7 @@ Shared test suite for Entity Framework Core relational database providers. - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Relational.Specification.Tests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj b/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj index 53a332bb346..4c94b21c679 100644 --- a/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj +++ b/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj @@ -1,17 +1,11 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Relational.Tests Microsoft.EntityFrameworkCore - - - PreserveNewest - - - diff --git a/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj b/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj index 665c595cd29..c1697fd677e 100644 --- a/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj +++ b/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj @@ -2,7 +2,7 @@ Shared test suite for Entity Framework Core database providers. - net5.0 + net6.0 9.0 Microsoft.EntityFrameworkCore.Specification.Tests Microsoft.EntityFrameworkCore diff --git a/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj b/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj index 9ffc5efd390..ba90a9173c8 100644 --- a/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj +++ b/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.SqlServer.FunctionalTests Microsoft.EntityFrameworkCore True @@ -17,9 +17,6 @@ PreserveNewest - - PreserveNewest - diff --git a/test/EFCore.SqlServer.Tests/EFCore.SqlServer.Tests.csproj b/test/EFCore.SqlServer.Tests/EFCore.SqlServer.Tests.csproj index 746ec1c4d38..71034eaedeb 100644 --- a/test/EFCore.SqlServer.Tests/EFCore.SqlServer.Tests.csproj +++ b/test/EFCore.SqlServer.Tests/EFCore.SqlServer.Tests.csproj @@ -1,17 +1,11 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.SqlServer.Tests Microsoft.EntityFrameworkCore - - - PreserveNewest - - - diff --git a/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj b/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj index 4c8e49082be..62306a55f0b 100644 --- a/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj +++ b/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Sqlite.FunctionalTests Microsoft.EntityFrameworkCore @@ -10,9 +10,6 @@ PreserveNewest - - PreserveNewest - diff --git a/test/EFCore.Sqlite.Tests/EFCore.Sqlite.Tests.csproj b/test/EFCore.Sqlite.Tests/EFCore.Sqlite.Tests.csproj index fcdb5a6ff62..73ea390834a 100644 --- a/test/EFCore.Sqlite.Tests/EFCore.Sqlite.Tests.csproj +++ b/test/EFCore.Sqlite.Tests/EFCore.Sqlite.Tests.csproj @@ -1,17 +1,11 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Sqlite.Tests Microsoft.EntityFrameworkCore - - - PreserveNewest - - - diff --git a/test/EFCore.Tests/EFCore.Tests.csproj b/test/EFCore.Tests/EFCore.Tests.csproj index 941f580d001..1ae2f8611af 100644 --- a/test/EFCore.Tests/EFCore.Tests.csproj +++ b/test/EFCore.Tests/EFCore.Tests.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Tests Microsoft.EntityFrameworkCore @@ -11,9 +11,6 @@ <_Parameter1>PackageVersion <_Parameter2>$(PackageVersion) - - PreserveNewest - diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj index e5019c60bd9..62e8d340808 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 $(DefineConstants);E_SQLITE3 enable diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj index e6412c23aff..74bc6c70b73 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 $(DefineConstants);E_SQLCIPHER enable diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj index b6ee8a7dafd..92b9dd582f3 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 $(DefineConstants);SQLITE3 enable diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj index c09d2e431de..ac994b310bf 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 $(DefineConstants);WINSQLITE3 enable diff --git a/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj b/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj index 643afbd08b7..041c8f39650 100644 --- a/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj +++ b/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Tools diff --git a/test/ef.Tests/ef.Tests.csproj b/test/ef.Tests/ef.Tests.csproj index 80f4f5a91b2..21ffb849ac1 100644 --- a/test/ef.Tests/ef.Tests.csproj +++ b/test/ef.Tests/ef.Tests.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 Microsoft.EntityFrameworkCore.Tools diff --git a/test/xunit.runner.json b/test/xunit.runner.json deleted file mode 100644 index c276745d0d7..00000000000 --- a/test/xunit.runner.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "appDomain": "denied" -}