diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8bb9a89ecc2..5acdd6d8b81 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -104,7 +104,7 @@ stages: name: Build - script: | .dotnet\dotnet publish --configuration $(_BuildConfig) --runtime win-x64 --self-contained test\EFCore.Trimming.Tests - artifacts\bin\EFCore.Trimming.Tests\$(_BuildConfig)\$(_BuildTargetFramework)\win-x64\publish\EFCore.Trimming.Tests.exe + artifacts\bin\EFCore.Trimming.Tests\$(_BuildConfig)\net7.0\win-x64\publish\EFCore.Trimming.Tests.exe displayName: Test trimming - task: PublishBuildArtifacts@1 displayName: Upload TestResults diff --git a/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj b/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj index 2fe4305fae0..998d4200277 100644 --- a/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj +++ b/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.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 3e67e42ffec..f68ffb7c1fd 100644 --- a/benchmark/EFCore.SqlServer.Benchmarks/EFCore.SqlServer.Benchmarks.csproj +++ b/benchmark/EFCore.SqlServer.Benchmarks/EFCore.SqlServer.Benchmarks.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.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 dabd276a0b1..9f945cd00fc 100644 --- a/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj +++ b/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.Benchmarks Exe diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ae406c0e92..41af0e6f7a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,49 +1,50 @@ - + + https://github.com/dotnet/runtime - eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 + e24f66dff0770eee344038da8c12476d8c450c41 - + https://github.com/dotnet/runtime - eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 + e24f66dff0770eee344038da8c12476d8c450c41 - + https://github.com/dotnet/runtime - eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 + e24f66dff0770eee344038da8c12476d8c450c41 - + https://github.com/dotnet/runtime - eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 + e24f66dff0770eee344038da8c12476d8c450c41 - + https://github.com/dotnet/runtime - eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 + e24f66dff0770eee344038da8c12476d8c450c41 https://github.com/dotnet/runtime eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 - + https://github.com/dotnet/runtime - eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 + e24f66dff0770eee344038da8c12476d8c450c41 https://github.com/dotnet/runtime eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 - + https://github.com/dotnet/runtime - eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 + e24f66dff0770eee344038da8c12476d8c450c41 - + https://github.com/dotnet/runtime - eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 + e24f66dff0770eee344038da8c12476d8c450c41 - + https://github.com/dotnet/runtime - eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 + e24f66dff0770eee344038da8c12476d8c450c41 diff --git a/eng/Versions.props b/eng/Versions.props index 1939ca3b716..ab60226b68f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,17 +15,17 @@ False - 7.0.0-preview.3.22171.1 - 7.0.0-preview.3.22171.1 - 7.0.0-preview.3.22171.1 - 7.0.0-preview.3.22171.1 - 7.0.0-preview.3.22171.1 - 7.0.0-preview.3.22171.1 - 7.0.0-preview.3.22171.1 + 7.0.0-preview.2.22152.2 + 7.0.0-preview.2.22152.2 + 7.0.0-preview.2.22152.2 + 7.0.0-preview.2.22152.2 + 7.0.0-preview.2.22152.2 + 7.0.0-preview.2.22152.2 + 7.0.0-preview.2.22152.2 7.0.0-preview.3.22171.1 - 7.0.0-preview.3.22171.1 - 7.0.0-preview.3.22171.1 - 7.0.0-preview.3.22171.1 + 7.0.0-preview.2.22152.2 + 7.0.0-preview.3.22163.2 + 7.0.0-preview.2.22152.2 4.0.1 diff --git a/eng/helix.proj b/eng/helix.proj index 43c84deccaa..68d80d146d5 100644 --- a/eng/helix.proj +++ b/eng/helix.proj @@ -56,7 +56,7 @@ - net6.0 + net7.0 netcoreapp2.0 2.4.2-pre.9 diff --git a/global.json b/global.json index 79922c436e6..b945df16521 100644 --- a/global.json +++ b/global.json @@ -1,19 +1,14 @@ { "tools": { - "dotnet": "6.0.103", + "dotnet": "7.0.100-preview.2.22153.17", "runtimes": { - "dotnet": [ - "3.1.23", - "5.0.15" - ], "aspnetcore": [ - "3.1.23", - "5.0.15" + "7.0.0-preview.2.22153.2" ] } }, "sdk": { - "version": "6.0.103", + "version": "7.0.100-preview.2.22153.17", "allowPrerelease": true, "rollForward": "latestMajor" }, diff --git a/src/Microsoft.Data.Sqlite.Core/SqliteBlob.cs b/src/Microsoft.Data.Sqlite.Core/SqliteBlob.cs index 25b211f6206..bbcb2a263ef 100644 --- a/src/Microsoft.Data.Sqlite.Core/SqliteBlob.cs +++ b/src/Microsoft.Data.Sqlite.Core/SqliteBlob.cs @@ -183,7 +183,7 @@ public override int Read(byte[] buffer, int offset, int count) /// the buffer if that many bytes are not currently available, or zero (0) if the end of the stream has been /// reached. /// -#if NET +#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER public override int Read(Span buffer) #else public virtual int Read(Span buffer) @@ -257,7 +257,7 @@ public override void Write(byte[] buffer, int offset, int count) /// /// A region of memory. This method copies the contents of this region to the current stream. /// -#if NET +#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER public override void Write(ReadOnlySpan buffer) #else public virtual void Write(ReadOnlySpan buffer) diff --git a/src/Microsoft.Data.Sqlite.Core/SqliteTransaction.cs b/src/Microsoft.Data.Sqlite.Core/SqliteTransaction.cs index 8e6f5c983e9..f1db5bdf2cc 100644 --- a/src/Microsoft.Data.Sqlite.Core/SqliteTransaction.cs +++ b/src/Microsoft.Data.Sqlite.Core/SqliteTransaction.cs @@ -101,7 +101,7 @@ public override void Rollback() RollbackInternal(); } -#if NET +#if NET5_0_OR_GREATER /// public override bool SupportsSavepoints => true; #endif @@ -111,7 +111,7 @@ public override void Rollback() /// established to be rolled back, restoring the transaction state to what it was at the time of the savepoint. /// /// The name of the savepoint to be created. -#if NET +#if NET5_0_OR_GREATER public override void Save(string savepointName) #else public virtual void Save(string savepointName) @@ -139,7 +139,7 @@ public virtual void Save(string savepointName) /// Rolls back all commands that were executed after the specified savepoint was established. /// /// The name of the savepoint to roll back to. -#if NET +#if NET5_0_OR_GREATER public override void Rollback(string savepointName) #else public virtual void Rollback(string savepointName) @@ -168,7 +168,7 @@ public virtual void Rollback(string savepointName) /// reclaim some resources before the transaction ends. /// /// The name of the savepoint to release. -#if NET +#if NET5_0_OR_GREATER public override void Release(string savepointName) #else public virtual void Release(string savepointName) diff --git a/src/Microsoft.Data.Sqlite.Core/Utilities/AllowNullAttribute.cs b/src/Microsoft.Data.Sqlite.Core/Utilities/AllowNullAttribute.cs index f0da84d5cd3..73be1e0f899 100644 --- a/src/Microsoft.Data.Sqlite.Core/Utilities/AllowNullAttribute.cs +++ b/src/Microsoft.Data.Sqlite.Core/Utilities/AllowNullAttribute.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#if !NET +#if !(NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER) namespace System.Diagnostics.CodeAnalysis { diff --git a/src/Microsoft.Data.Sqlite.Core/Utilities/MemberNotNullAttribute.cs b/src/Microsoft.Data.Sqlite.Core/Utilities/MemberNotNullAttribute.cs index a6bed8247ce..e977d80e0fa 100644 --- a/src/Microsoft.Data.Sqlite.Core/Utilities/MemberNotNullAttribute.cs +++ b/src/Microsoft.Data.Sqlite.Core/Utilities/MemberNotNullAttribute.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#if !NET +#if !NET5_0_OR_GREATER namespace System.Diagnostics.CodeAnalysis { diff --git a/src/ef/NotNullIfNotNullAttribute.cs b/src/ef/NotNullIfNotNullAttribute.cs index ff18062e54c..49ee73d01b5 100644 --- a/src/ef/NotNullIfNotNullAttribute.cs +++ b/src/ef/NotNullIfNotNullAttribute.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#if !NETCOREAPP3_0_OR_GREATER +#if !(NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER) namespace System.Diagnostics.CodeAnalysis { diff --git a/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj b/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj index cd39ac99e98..4e570d4b04a 100644 --- a/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj +++ b/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.Analyzers.Tests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.Analyzers.Tests/TestUtilities/DiagnosticAnalyzerTestBase.cs b/test/EFCore.Analyzers.Tests/TestUtilities/DiagnosticAnalyzerTestBase.cs index 9c8dc1d92e5..bc4d40526c0 100644 --- a/test/EFCore.Analyzers.Tests/TestUtilities/DiagnosticAnalyzerTestBase.cs +++ b/test/EFCore.Analyzers.Tests/TestUtilities/DiagnosticAnalyzerTestBase.cs @@ -61,7 +61,8 @@ var compilationWithAnalyzers = compilation .WithOptions( compilation.Options.WithSpecificDiagnosticOptions( - analyzer.SupportedDiagnostics.ToDictionary(d => d.Id, d => ReportDiagnostic.Default))) + compilation.Options.SpecificDiagnosticOptions + .AddRange(analyzer.SupportedDiagnostics.ToDictionary(d => d.Id, d => ReportDiagnostic.Default)))) .WithAnalyzers(ImmutableArray.Create(analyzer)); var diagnostics = analyzerDiagnosticsOnly @@ -98,6 +99,10 @@ var metadataReferences .WithCompilationOptions( new CSharpCompilationOptions( OutputKind.DynamicallyLinkedLibrary, + specificDiagnosticOptions: new Dictionary + { + { "CS1701", ReportDiagnostic.Suppress } + }, nullableContextOptions: NullableContextOptions.Enable)); } } 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 56914b4708a..2b6183a103a 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 @@ - net6.0 + net7.0 Microsoft.EntityFrameworkCore.AspNet.InMemory.FunctionalTests Microsoft.EntityFrameworkCore true 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 def779ed667..5b1774fafcc 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. - net6.0 + net7.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 b301d86d8d0..e2da545b8dd 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 @@ - net6.0 + net7.0 Microsoft.EntityFrameworkCore.AspNet.SqlServer.FunctionalTests Microsoft.EntityFrameworkCore True 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 07761013b1c..64a835ff1be 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 @@ - net6.0 + net7.0 Microsoft.EntityFrameworkCore.AspNet.Sqlite.FunctionalTests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj b/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj index 6f149b3a68f..eb810463022 100644 --- a/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj +++ b/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.Cosmos.FunctionalTests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj b/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj index 2272660190a..31ef559f63c 100644 --- a/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj +++ b/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.Cosmos.Tests Microsoft.EntityFrameworkCore.Cosmos true diff --git a/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj b/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj index 3d0b2a85525..8f93c9f64bd 100644 --- a/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj +++ b/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.CrossStore.FunctionalTests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj index 3d377074941..0456e084046 100644 --- a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj +++ b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 true Microsoft.EntityFrameworkCore.Design.Tests Microsoft.EntityFrameworkCore diff --git a/test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj b/test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj index e4cdd0f033b..e78f51f16f1 100644 --- a/test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj +++ b/test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.InMemory.FunctionalTests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj b/test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj index c6f456b5a72..1b1408fe5a0 100644 --- a/test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj +++ b/test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.InMemory.Tests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj b/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj index b98740ade3d..6a258b52ed5 100644 --- a/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj +++ b/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.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 1834ef65960..51cdbc2b73b 100644 --- a/test/EFCore.Proxies.Tests/EFCore.Proxies.Tests.csproj +++ b/test/EFCore.Proxies.Tests/EFCore.Proxies.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.Proxies.Tests Microsoft.EntityFrameworkCore true 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 7482cd6aeee..b45763d16c6 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. - net6.0 + net7.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 e95070b881d..cd7dacc9d37 100644 --- a/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj +++ b/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.Relational.Tests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj b/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj index ebc8f8efb78..b16da6d2127 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. - net6.0 + net7.0 Microsoft.EntityFrameworkCore.Specification.Tests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj b/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj index 15e5541da86..5b652cc3a80 100644 --- a/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj +++ b/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.SqlServer.FunctionalTests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.SqlServer.Tests/EFCore.SqlServer.Tests.csproj b/test/EFCore.SqlServer.Tests/EFCore.SqlServer.Tests.csproj index 15acd5677a2..4f9362333ab 100644 --- a/test/EFCore.SqlServer.Tests/EFCore.SqlServer.Tests.csproj +++ b/test/EFCore.SqlServer.Tests/EFCore.SqlServer.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.SqlServer.Tests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj b/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj index 06b81d36002..b53862bf4ad 100644 --- a/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj +++ b/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.Sqlite.FunctionalTests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.Sqlite.Tests/EFCore.Sqlite.Tests.csproj b/test/EFCore.Sqlite.Tests/EFCore.Sqlite.Tests.csproj index b7f4f4b7f3e..5bbee64320f 100644 --- a/test/EFCore.Sqlite.Tests/EFCore.Sqlite.Tests.csproj +++ b/test/EFCore.Sqlite.Tests/EFCore.Sqlite.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.Sqlite.Tests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.Tests/EFCore.Tests.csproj b/test/EFCore.Tests/EFCore.Tests.csproj index 06ea852112a..46fcda86760 100644 --- a/test/EFCore.Tests/EFCore.Tests.csproj +++ b/test/EFCore.Tests/EFCore.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.Tests Microsoft.EntityFrameworkCore true diff --git a/test/EFCore.Trimming.Tests/EFCore.Trimming.Tests.csproj b/test/EFCore.Trimming.Tests/EFCore.Trimming.Tests.csproj index 77de174db4a..33e2f616fb4 100644 --- a/test/EFCore.Trimming.Tests/EFCore.Trimming.Tests.csproj +++ b/test/EFCore.Trimming.Tests/EFCore.Trimming.Tests.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 true false 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 1b45eb19a40..38907efa8bc 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 @@  - net6.0;net461 + net7.0;net461 $(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 412b23e531b..0e906fb1c30 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 @@ - net6.0;net461 + net7.0;net461 $(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 3d9358e1e08..b914e95a36c 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 @@ - net6.0;net461 + net7.0;net461 $(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 d85f56619c0..980eb5049c5 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 @@ - net6.0;net461 + net7.0;net461 $(DefineConstants);WINSQLITE3 enable diff --git a/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj b/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj index acd3db4fa30..5df352ede98 100644 --- a/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj +++ b/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.Tools true diff --git a/test/ef.Tests/ef.Tests.csproj b/test/ef.Tests/ef.Tests.csproj index 2f9bdada152..98acdff6030 100644 --- a/test/ef.Tests/ef.Tests.csproj +++ b/test/ef.Tests/ef.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 Microsoft.EntityFrameworkCore.Tools true