From d1715d535da37fb1213244476232772f1d7bce8a Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Thu, 12 Sep 2024 00:33:51 -0700 Subject: [PATCH] Enable Central Package Management Fixes #34638 --- Directory.Build.props | 3 - Directory.Packages.props | 87 +++++++++++++++++++ NuGet.config | 26 ++++++ benchmark/Directory.Build.props | 8 +- .../EFCore.Benchmarks.csproj | 2 +- .../EFCore.Sqlite.Benchmarks.csproj | 2 +- eng/Version.Details.xml | 8 ++ eng/Versions.props | 11 ++- src/Directory.Build.props | 2 +- src/EFCore.Analyzers/EFCore.Analyzers.csproj | 3 +- src/EFCore.Cosmos/EFCore.Cosmos.csproj | 2 +- .../Storage/Internal/ByteArrayConverter.cs | 2 +- .../Storage/Internal/CosmosClientWrapper.cs | 2 +- .../Storage/Internal/CosmosDatabaseWrapper.cs | 4 +- .../Storage/Internal/JsonCosmosSerializer.cs | 2 +- src/EFCore.Design/EFCore.Design.csproj | 16 ++-- src/EFCore.Proxies/EFCore.Proxies.csproj | 2 +- .../EFCore.Relational.csproj | 2 +- .../EFCore.SqlServer.Abstractions.csproj | 4 +- .../EFCore.SqlServer.NTS.csproj | 3 +- src/EFCore.SqlServer/EFCore.SqlServer.csproj | 2 +- .../EFCore.Sqlite.Core.csproj | 2 +- .../EFCore.Sqlite.NTS.csproj | 5 +- src/EFCore.Sqlite/EFCore.Sqlite.csproj | 2 +- src/EFCore.Tasks/EFCore.Tasks.csproj | 8 +- src/EFCore.Tools/EFCore.Tools.csproj | 2 +- src/EFCore/EFCore.csproj | 4 +- .../Microsoft.Data.Sqlite.Core.csproj | 2 +- .../Microsoft.Data.Sqlite.csproj | 2 +- src/ef/ef.csproj | 5 ++ test/Directory.Packages.props | 10 +++ .../EFCore.Analyzers.Tests.csproj | 11 ++- ...ore.AspNet.InMemory.FunctionalTests.csproj | 2 + .../EFCore.AspNet.Specification.Tests.csproj | 8 +- ...re.AspNet.SqlServer.FunctionalTests.csproj | 2 + ...FCore.AspNet.Sqlite.FunctionalTests.csproj | 2 + .../EFCore.Cosmos.FunctionalTests.csproj | 8 +- .../EFCore.Design.Tests.csproj | 5 +- .../EFCore.NativeAotTests.csproj | 6 +- .../EFCore.OData.FunctionalTests.csproj | 2 +- ...Core.Relational.Specification.Tests.csproj | 5 +- .../EFCore.Relational.Tests.csproj | 2 +- .../EFCore.Specification.Tests.csproj | 12 +-- .../EFCore.SqlServer.FunctionalTests.csproj | 4 +- .../EFCore.Sqlite.FunctionalTests.csproj | 2 +- test/EFCore.Tests/EFCore.Tests.csproj | 2 +- .../EFCore.TrimmingTests.csproj | 6 +- .../Microsoft.Data.Sqlite.Tests.csproj | 2 +- ...osoft.Data.Sqlite.e_sqlcipher.Tests.csproj | 2 +- ...osoft.Data.Sqlite.e_sqlite3mc.Tests.csproj | 2 +- ...Microsoft.Data.Sqlite.sqlite3.Tests.csproj | 2 +- ...rosoft.Data.Sqlite.winsqlite3.Tests.csproj | 2 +- test/ef.Tests/ef.Tests.csproj | 3 +- 53 files changed, 232 insertions(+), 95 deletions(-) create mode 100644 Directory.Packages.props create mode 100644 test/Directory.Packages.props diff --git a/Directory.Build.props b/Directory.Build.props index 80858aaddfc..27589f30050 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -55,9 +55,6 @@ $(NoWarn.Replace(';1591', '')) - - - diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000000..507838019ac --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,87 @@ + + + + + + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NuGet.config b/NuGet.config index d1a8a417e43..21b746fb5ac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/benchmark/Directory.Build.props b/benchmark/Directory.Build.props index d92102a50e8..acb8c8be1b6 100644 --- a/benchmark/Directory.Build.props +++ b/benchmark/Directory.Build.props @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj b/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj index f0bd47ad2fd..271d03e2cb8 100644 --- a/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj +++ b/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj @@ -12,7 +12,7 @@ - + diff --git a/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj b/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj index 51ac02729fc..2eb2534dfb2 100644 --- a/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj +++ b/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ebc648cf096..38804068fcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -53,6 +53,14 @@ https://github.com/dotnet/runtime dec716d1c4651b70e4710e781e832a64be1e713b + + https://github.com/dotnet/runtime + dec716d1c4651b70e4710e781e832a64be1e713b + + + https://github.com/dotnet/runtime + dec716d1c4651b70e4710e781e832a64be1e713b + diff --git a/eng/Versions.props b/eng/Versions.props index 9c6c1ded8b6..b821e9f21d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,20 +27,23 @@ 9.0.0-rc.2.24456.9 9.0.0-rc.2.24456.9 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 9.0.0-beta.24453.1 - 17.9.5 - 17.9.5 - 17.9.5 - + 17.8.3 + 17.8.3 + 17.8.3 + 4.8.0 1.1.2 1.12.0 1.3.2 1.8.1 + 2.1.10 diff --git a/src/Directory.Build.props b/src/Directory.Build.props index f202e2801f2..e65be73b154 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -10,7 +10,7 @@ - + diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.csproj b/src/EFCore.Analyzers/EFCore.Analyzers.csproj index beacecfce80..90c28c46a19 100644 --- a/src/EFCore.Analyzers/EFCore.Analyzers.csproj +++ b/src/EFCore.Analyzers/EFCore.Analyzers.csproj @@ -29,8 +29,7 @@ - - + diff --git a/src/EFCore.Cosmos/EFCore.Cosmos.csproj b/src/EFCore.Cosmos/EFCore.Cosmos.csproj index 783a083e626..e5189d571d3 100644 --- a/src/EFCore.Cosmos/EFCore.Cosmos.csproj +++ b/src/EFCore.Cosmos/EFCore.Cosmos.csproj @@ -48,7 +48,7 @@ - + diff --git a/src/EFCore.Cosmos/Storage/Internal/ByteArrayConverter.cs b/src/EFCore.Cosmos/Storage/Internal/ByteArrayConverter.cs index 75ca94f1a4e..fe63cd57d67 100644 --- a/src/EFCore.Cosmos/Storage/Internal/ByteArrayConverter.cs +++ b/src/EFCore.Cosmos/Storage/Internal/ByteArrayConverter.cs @@ -51,7 +51,7 @@ public override void WriteJson( public override object ReadJson( JsonReader reader, Type objectType, - object existingValue, + object? existingValue, JsonSerializer serializer) { if (reader.TokenType != JsonToken.StartArray) diff --git a/src/EFCore.Cosmos/Storage/Internal/CosmosClientWrapper.cs b/src/EFCore.Cosmos/Storage/Internal/CosmosClientWrapper.cs index 7eeb334862f..a5c89b6b37d 100644 --- a/src/EFCore.Cosmos/Storage/Internal/CosmosClientWrapper.cs +++ b/src/EFCore.Cosmos/Storage/Internal/CosmosClientWrapper.cs @@ -359,7 +359,7 @@ private static async Task CreateItemOnceAsync( response.Diagnostics.GetClientElapsedTime(), response.Headers.RequestCharge, response.Headers.ActivityId, - parameters.Document["id"].ToString(), + parameters.Document["id"]!.ToString(), parameters.ContainerId, partitionKeyValue); diff --git a/src/EFCore.Cosmos/Storage/Internal/CosmosDatabaseWrapper.cs b/src/EFCore.Cosmos/Storage/Internal/CosmosDatabaseWrapper.cs index 4eed39b426f..0fa8e4e7025 100644 --- a/src/EFCore.Cosmos/Storage/Internal/CosmosDatabaseWrapper.cs +++ b/src/EFCore.Cosmos/Storage/Internal/CosmosDatabaseWrapper.cs @@ -246,7 +246,7 @@ private bool Save(IUpdateEntry entry) if (propertyName != null) { document[propertyName] = - JToken.FromObject(entityType.GetDiscriminatorValue(), CosmosClientWrapper.Serializer); + JToken.FromObject(entityType.GetDiscriminatorValue()!, CosmosClientWrapper.Serializer); } } @@ -377,7 +377,7 @@ private Task SaveAsync(IUpdateEntry entry, CancellationToken cancellationT if (propertyName != null) { document[propertyName] = - JToken.FromObject(entityType.GetDiscriminatorValue(), CosmosClientWrapper.Serializer); + JToken.FromObject(entityType.GetDiscriminatorValue()!, CosmosClientWrapper.Serializer); } } diff --git a/src/EFCore.Cosmos/Storage/Internal/JsonCosmosSerializer.cs b/src/EFCore.Cosmos/Storage/Internal/JsonCosmosSerializer.cs index 9028cd3b0e6..291e6747e20 100644 --- a/src/EFCore.Cosmos/Storage/Internal/JsonCosmosSerializer.cs +++ b/src/EFCore.Cosmos/Storage/Internal/JsonCosmosSerializer.cs @@ -28,7 +28,7 @@ public override T FromStream(Stream stream) using var streamReader = new StreamReader(stream); using var jsonTextReader = new JsonTextReader(streamReader); - return GetSerializer().Deserialize(jsonTextReader); + return GetSerializer().Deserialize(jsonTextReader)!; } } diff --git a/src/EFCore.Design/EFCore.Design.csproj b/src/EFCore.Design/EFCore.Design.csproj index 47bc569cf84..9fb32f5f722 100644 --- a/src/EFCore.Design/EFCore.Design.csproj +++ b/src/EFCore.Design/EFCore.Design.csproj @@ -56,15 +56,13 @@ - - - - - - - - - + + + + + + + diff --git a/src/EFCore.Proxies/EFCore.Proxies.csproj b/src/EFCore.Proxies/EFCore.Proxies.csproj index 212bda63217..4e4ef839666 100644 --- a/src/EFCore.Proxies/EFCore.Proxies.csproj +++ b/src/EFCore.Proxies/EFCore.Proxies.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/EFCore.Relational/EFCore.Relational.csproj b/src/EFCore.Relational/EFCore.Relational.csproj index bac04d23a8f..bf707817d73 100644 --- a/src/EFCore.Relational/EFCore.Relational.csproj +++ b/src/EFCore.Relational/EFCore.Relational.csproj @@ -50,7 +50,7 @@ - + diff --git a/src/EFCore.SqlServer.Abstractions/EFCore.SqlServer.Abstractions.csproj b/src/EFCore.SqlServer.Abstractions/EFCore.SqlServer.Abstractions.csproj index 0a63e98053e..9cc5060b7f0 100644 --- a/src/EFCore.SqlServer.Abstractions/EFCore.SqlServer.Abstractions.csproj +++ b/src/EFCore.SqlServer.Abstractions/EFCore.SqlServer.Abstractions.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj b/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj index 68d80529ee4..9a775d6e018 100644 --- a/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj +++ b/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj @@ -56,8 +56,7 @@ - - + diff --git a/src/EFCore.SqlServer/EFCore.SqlServer.csproj b/src/EFCore.SqlServer/EFCore.SqlServer.csproj index 751a3edda68..9c55dc8c9bf 100644 --- a/src/EFCore.SqlServer/EFCore.SqlServer.csproj +++ b/src/EFCore.SqlServer/EFCore.SqlServer.csproj @@ -49,7 +49,7 @@ - + diff --git a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj index 82672a9741f..ce21537a399 100644 --- a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj +++ b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj @@ -51,7 +51,7 @@ - + diff --git a/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj b/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj index fea05f25c06..c15872f5600 100644 --- a/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj +++ b/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj @@ -57,9 +57,8 @@ - - - + + diff --git a/src/EFCore.Sqlite/EFCore.Sqlite.csproj b/src/EFCore.Sqlite/EFCore.Sqlite.csproj index 4f245bf6871..5e7afc5b865 100644 --- a/src/EFCore.Sqlite/EFCore.Sqlite.csproj +++ b/src/EFCore.Sqlite/EFCore.Sqlite.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index 45ac5587a10..aed54b84d90 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -49,13 +49,13 @@ - - - + + + - + diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj index 779f77df29a..1bd9cc8930a 100644 --- a/src/EFCore.Tools/EFCore.Tools.csproj +++ b/src/EFCore.Tools/EFCore.Tools.csproj @@ -35,7 +35,7 @@ Update-Database - + diff --git a/src/EFCore/EFCore.csproj b/src/EFCore/EFCore.csproj index f8ba3e739d9..722676f7c1c 100644 --- a/src/EFCore/EFCore.csproj +++ b/src/EFCore/EFCore.csproj @@ -46,8 +46,8 @@ Microsoft.EntityFrameworkCore.DbSet - - + + diff --git a/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj b/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj index d3c36ca31b3..30212d7d239 100644 --- a/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj +++ b/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj @@ -40,7 +40,7 @@ Microsoft.Data.Sqlite.SqliteTransaction - + diff --git a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj index d64ad0c60dc..90b848797e7 100644 --- a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj +++ b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj @@ -24,7 +24,7 @@ Microsoft.Data.Sqlite.SqliteTransaction - + diff --git a/src/ef/ef.csproj b/src/ef/ef.csproj index 2e08b452408..36f668682e5 100644 --- a/src/ef/ef.csproj +++ b/src/ef/ef.csproj @@ -29,6 +29,11 @@ + + + + + diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props new file mode 100644 index 00000000000..66da5e96afd --- /dev/null +++ b/test/Directory.Packages.props @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj b/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj index d6d3557f289..82eef21265b 100644 --- a/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj +++ b/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj @@ -39,13 +39,16 @@ - - - - + + + + + + + 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 3774b870241..abffdd03822 100644 --- a/test/EFCore.AspNet.InMemory.FunctionalTests/EFCore.AspNet.InMemory.FunctionalTests.csproj +++ b/test/EFCore.AspNet.InMemory.FunctionalTests/EFCore.AspNet.InMemory.FunctionalTests.csproj @@ -45,6 +45,8 @@ + + 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 3c5cb9b150a..3ea53b38ea8 100644 --- a/test/EFCore.AspNet.Specification.Tests/EFCore.AspNet.Specification.Tests.csproj +++ b/test/EFCore.AspNet.Specification.Tests/EFCore.AspNet.Specification.Tests.csproj @@ -50,9 +50,11 @@ - - - + + + + + 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 ed3086b264d..9a527a88ac1 100644 --- a/test/EFCore.AspNet.SqlServer.FunctionalTests/EFCore.AspNet.SqlServer.FunctionalTests.csproj +++ b/test/EFCore.AspNet.SqlServer.FunctionalTests/EFCore.AspNet.SqlServer.FunctionalTests.csproj @@ -50,6 +50,8 @@ + + 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 5838fe849ea..9c670219fb4 100644 --- a/test/EFCore.AspNet.Sqlite.FunctionalTests/EFCore.AspNet.Sqlite.FunctionalTests.csproj +++ b/test/EFCore.AspNet.Sqlite.FunctionalTests/EFCore.AspNet.Sqlite.FunctionalTests.csproj @@ -49,6 +49,8 @@ + + diff --git a/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj b/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj index a8ecf58320d..5be9cabc700 100644 --- a/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj +++ b/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj @@ -76,10 +76,10 @@ - - - - + + + + diff --git a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj index 36abc41e4cf..9d4ed03c0fe 100644 --- a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj +++ b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj @@ -56,9 +56,8 @@ - - - + + diff --git a/test/EFCore.NativeAotTests/EFCore.NativeAotTests.csproj b/test/EFCore.NativeAotTests/EFCore.NativeAotTests.csproj index 4d8d1305f54..fe0f037d78e 100644 --- a/test/EFCore.NativeAotTests/EFCore.NativeAotTests.csproj +++ b/test/EFCore.NativeAotTests/EFCore.NativeAotTests.csproj @@ -17,9 +17,9 @@ - - - + + + diff --git a/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj b/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj index 56e314a4657..1778dd946d9 100644 --- a/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj +++ b/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj @@ -42,7 +42,7 @@ - + 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 94f59331dcb..d88c0787094 100644 --- a/test/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj +++ b/test/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj @@ -49,10 +49,7 @@ - - - - + diff --git a/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj b/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj index 3d389319bed..2c14c5d40b9 100644 --- a/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj +++ b/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj @@ -46,7 +46,7 @@ - + diff --git a/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj b/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj index dd337cdf607..97ea97c7d11 100644 --- a/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj +++ b/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj @@ -56,12 +56,12 @@ - - - - - - + + + + + + diff --git a/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj b/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj index f2bf02bd544..d91e7e88ddf 100644 --- a/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj +++ b/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj @@ -75,7 +75,7 @@ - - + + diff --git a/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj b/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj index 29007bec732..1279a7b59b3 100644 --- a/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj +++ b/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj @@ -65,7 +65,7 @@ - + diff --git a/test/EFCore.Tests/EFCore.Tests.csproj b/test/EFCore.Tests/EFCore.Tests.csproj index ce9ba2dadcd..aa6260f3e87 100644 --- a/test/EFCore.Tests/EFCore.Tests.csproj +++ b/test/EFCore.Tests/EFCore.Tests.csproj @@ -54,7 +54,7 @@ - + diff --git a/test/EFCore.TrimmingTests/EFCore.TrimmingTests.csproj b/test/EFCore.TrimmingTests/EFCore.TrimmingTests.csproj index 03cb1f3e7a3..1862142a484 100644 --- a/test/EFCore.TrimmingTests/EFCore.TrimmingTests.csproj +++ b/test/EFCore.TrimmingTests/EFCore.TrimmingTests.csproj @@ -16,9 +16,9 @@ - - - + + + 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 b1cf002ec0c..4decb62d26f 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj @@ -11,7 +11,7 @@ - + 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 cd813a7b655..675c49e1c0d 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 @@ -11,7 +11,7 @@ - + diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlite3mc.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlite3mc.Tests.csproj index 919bbd88c28..5695d730aff 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlite3mc.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlite3mc.Tests.csproj @@ -11,7 +11,7 @@ - + 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 0da5603328d..c057b2cf32a 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 @@ -11,7 +11,7 @@ - + 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 aa4bac9747d..d5a11003545 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 @@ -11,7 +11,7 @@ - + diff --git a/test/ef.Tests/ef.Tests.csproj b/test/ef.Tests/ef.Tests.csproj index a0c282eaf1f..b99b7dd7bdf 100644 --- a/test/ef.Tests/ef.Tests.csproj +++ b/test/ef.Tests/ef.Tests.csproj @@ -43,8 +43,7 @@ - - +