From 5700eaa546d0d83cfee52cf702d8f967c7f9edc4 Mon Sep 17 00:00:00 2001 From: Bela VanderVoort Date: Tue, 24 Dec 2024 20:54:14 -0600 Subject: [PATCH] formatting --- efcore/Directory.Build.props | 62 ++++--- efcore/Directory.Build.targets | 32 ++-- efcore/NuGet.config | 40 ++++- efcore/benchmark/Directory.Build.props | 13 +- .../EFCore.Benchmarks.csproj | 9 +- .../EFCore.SqlServer.Benchmarks.csproj | 5 - .../EFCore.Sqlite.Benchmarks.csproj | 6 - efcore/eng/Publishing.props | 10 +- efcore/eng/Version.Details.xml | 15 +- efcore/eng/Versions.props | 8 +- efcore/eng/common/internal/NuGet.config | 5 +- efcore/eng/common/internal/Tools.csproj | 48 ++++-- efcore/eng/common/sdl/NuGet.config | 5 +- efcore/eng/common/sdl/packages.config | 2 +- .../linker/SupportFiles/Directory.Build.props | 1 - .../SupportFiles/Directory.Build.targets | 3 +- efcore/eng/testing/linker/trimmingTests.props | 2 +- .../eng/testing/linker/trimmingTests.targets | 161 ++++++++++-------- efcore/src/Directory.Build.props | 9 +- .../EFCore.Abstractions.csproj | 7 - .../EFCore.Analyzers/EFCore.Analyzers.csproj | 26 +-- efcore/src/EFCore.Cosmos/EFCore.Cosmos.csproj | 16 +- efcore/src/EFCore.Design/EFCore.Design.csproj | 31 ++-- .../EFCore.InMemory/EFCore.InMemory.csproj | 15 +- .../src/EFCore.Proxies/EFCore.Proxies.csproj | 16 +- .../EFCore.Relational.csproj | 21 ++- .../EFCore.SqlServer.Abstractions.csproj | 3 - .../EFCore.SqlServer.HierarchyId.csproj | 21 ++- ...rameworkCore.SqlServer.HierarchyId.targets | 24 +-- .../EFCore.SqlServer.NTS.csproj | 22 ++- ...orkCore.SqlServer.NetTopologySuite.targets | 24 +-- .../EFCore.SqlServer/EFCore.SqlServer.csproj | 21 ++- .../EFCore.Sqlite.Core.csproj | 26 +-- .../EFCore.Sqlite.NTS.csproj | 22 ++- ...meworkCore.Sqlite.NetTopologySuite.targets | 24 +-- efcore/src/EFCore.Sqlite/EFCore.Sqlite.csproj | 21 ++- .../EFCore.Templates/EFCore.Templates.csproj | 31 ++-- efcore/src/EFCore.Tools/EFCore.Tools.csproj | 39 +++-- efcore/src/EFCore/EFCore.csproj | 26 +-- .../Microsoft.Data.Sqlite.Core.csproj | 6 - .../Microsoft.Data.Sqlite.csproj | 8 - .../Resources/EntityFrameworkCore.targets | 18 +- efcore/src/dotnet-ef/dotnet-ef.csproj | 21 +-- efcore/src/ef/ef.csproj | 26 +-- efcore/test/Directory.Build.props | 2 - .../EFCore.Analyzers.Tests.csproj | 27 +-- ...ore.AspNet.InMemory.FunctionalTests.csproj | 5 - .../EFCore.AspNet.Specification.Tests.csproj | 6 - ...re.AspNet.SqlServer.FunctionalTests.csproj | 9 +- ...FCore.AspNet.Sqlite.FunctionalTests.csproj | 5 - .../EFCore.Cosmos.FunctionalTests.csproj | 20 +-- .../EFCore.Cosmos.Tests.csproj | 4 - .../EFCore.CrossStore.FunctionalTests.csproj | 4 - .../EFCore.Design.Tests.csproj | 26 +-- .../EFCore.InMemory.FunctionalTests.csproj | 6 - .../EFCore.InMemory.Tests.csproj | 4 - .../EFCore.NativeAotTests.csproj | 14 +- .../EFCore.OData.FunctionalTests.csproj | 10 +- .../EFCore.Proxies.Tests.csproj | 4 - ...Core.Relational.Specification.Tests.csproj | 16 +- .../EFCore.Relational.Tests.csproj | 11 +- .../EFCore.Specification.Tests.csproj | 17 +- .../EFCore.SqlServer.FunctionalTests.csproj | 21 +-- .../EFCore.SqlServer.HierarchyId.Tests.csproj | 8 +- .../EFCore.SqlServer.Tests.csproj | 4 - .../EFCore.Sqlite.FunctionalTests.csproj | 8 - .../EFCore.Sqlite.Tests.csproj | 4 - efcore/test/EFCore.Tests/EFCore.Tests.csproj | 9 - .../EFCore.TrimmingTests.csproj | 14 +- .../Microsoft.Data.Sqlite.Tests.csproj | 4 - ...osoft.Data.Sqlite.e_sqlcipher.Tests.csproj | 4 - ...Microsoft.Data.Sqlite.sqlite3.Tests.csproj | 4 - ...rosoft.Data.Sqlite.winsqlite3.Tests.csproj | 4 - .../dotnet-ef.Tests/dotnet-ef.Tests.csproj | 4 - efcore/test/ef.Tests/ef.Tests.csproj | 16 +- 75 files changed, 624 insertions(+), 621 deletions(-) diff --git a/efcore/Directory.Build.props b/efcore/Directory.Build.props index 08c3f51488c..7b52a493a41 100644 --- a/efcore/Directory.Build.props +++ b/efcore/Directory.Build.props @@ -1,37 +1,55 @@ - true - true - true - true - true + true + true + true + true + $(MSBuildProjectName.EndsWith('.FunctionalTests'))) " + >true false - - win - osx - linux - freebsd + win + osx + linux + freebsd x64 - $(TargetOsName)-$(TargetArchitecture) + $(TargetOsName)-$(TargetArchitecture) - - - + Condition="'$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " + /> $(CopyrightMicrosoft) MIT - MicrosoftAspNetCore Entity Framework Core;entity-framework-core;EF;Data;O/RM;EntityFramework;EntityFrameworkCore;EFCore @@ -42,23 +60,21 @@ https://docs.microsoft.com/ef/core/ $(MSBuildThisFileDirectory)logo\ef-logo.png - $(WarningsNotAsErrors);CS1591;SA1636 - $(NoWarn.Replace(';1591', '')) - - - - + diff --git a/efcore/Directory.Build.targets b/efcore/Directory.Build.targets index 246a75277c8..41c1a308a32 100644 --- a/efcore/Directory.Build.targets +++ b/efcore/Directory.Build.targets @@ -1,23 +1,33 @@ - + - - - - + + - + <_Parameter1>CommitHash <_Parameter2>$(SourceRevisionId) - - + <_Parameter1>Serviceable <_Parameter2>True diff --git a/efcore/NuGet.config b/efcore/NuGet.config index d1a8a417e43..2f0feb8b99b 100644 --- a/efcore/NuGet.config +++ b/efcore/NuGet.config @@ -6,15 +6,39 @@ - - - - - - - + + + + + + + - + diff --git a/efcore/benchmark/Directory.Build.props b/efcore/benchmark/Directory.Build.props index d92102a50e8..8a32cba1814 100644 --- a/efcore/benchmark/Directory.Build.props +++ b/efcore/benchmark/Directory.Build.props @@ -1,15 +1,18 @@ - $(MSBuildThisFileDirectory)..\rulesets\EFCore.test.ruleset - - - + + - diff --git a/efcore/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj b/efcore/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj index e7d9a7afe27..8ad4500b9a4 100644 --- a/efcore/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj +++ b/efcore/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj @@ -1,17 +1,16 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.Benchmarks - true - - + - diff --git a/efcore/benchmark/EFCore.SqlServer.Benchmarks/EFCore.SqlServer.Benchmarks.csproj b/efcore/benchmark/EFCore.SqlServer.Benchmarks/EFCore.SqlServer.Benchmarks.csproj index 662b8f28d0d..5128b749875 100644 --- a/efcore/benchmark/EFCore.SqlServer.Benchmarks/EFCore.SqlServer.Benchmarks.csproj +++ b/efcore/benchmark/EFCore.SqlServer.Benchmarks/EFCore.SqlServer.Benchmarks.csproj @@ -1,25 +1,20 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.Benchmarks Exe - true - - PreserveNewest - diff --git a/efcore/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj b/efcore/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj index b693456dfed..2f8641afc83 100644 --- a/efcore/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj +++ b/efcore/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj @@ -1,24 +1,19 @@ - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.Benchmarks Exe - true - - - Always @@ -28,5 +23,4 @@ - diff --git a/efcore/eng/Publishing.props b/efcore/eng/Publishing.props index 1da7cb4e448..2c356747c39 100644 --- a/efcore/eng/Publishing.props +++ b/efcore/eng/Publishing.props @@ -1,9 +1,9 @@ - - 3 - - false - + false + diff --git a/efcore/eng/Version.Details.xml b/efcore/eng/Version.Details.xml index bdfd435a66a..86e2d89603c 100644 --- a/efcore/eng/Version.Details.xml +++ b/efcore/eng/Version.Details.xml @@ -5,11 +5,17 @@ https://github.com/dotnet/runtime 721c445e494a1d85d2d12e7a99ac2cd94bb898fa - + https://github.com/dotnet/runtime 721c445e494a1d85d2d12e7a99ac2cd94bb898fa - + https://github.com/dotnet/runtime 721c445e494a1d85d2d12e7a99ac2cd94bb898fa @@ -29,7 +35,10 @@ https://github.com/dotnet/runtime 721c445e494a1d85d2d12e7a99ac2cd94bb898fa - + https://github.com/dotnet/runtime 721c445e494a1d85d2d12e7a99ac2cd94bb898fa diff --git a/efcore/eng/Versions.props b/efcore/eng/Versions.props index 01aaf5db066..db613bbf447 100644 --- a/efcore/eng/Versions.props +++ b/efcore/eng/Versions.props @@ -8,8 +8,12 @@ - false - release + false + release net8.0 diff --git a/efcore/eng/common/internal/NuGet.config b/efcore/eng/common/internal/NuGet.config index 19d3d311b16..5ce1c93d524 100644 --- a/efcore/eng/common/internal/NuGet.config +++ b/efcore/eng/common/internal/NuGet.config @@ -2,6 +2,9 @@ - + diff --git a/efcore/eng/common/internal/Tools.csproj b/efcore/eng/common/internal/Tools.csproj index 7f5ce6d6081..4de24a21cbd 100644 --- a/efcore/eng/common/internal/Tools.csproj +++ b/efcore/eng/common/internal/Tools.csproj @@ -7,24 +7,48 @@ - - - - - - + + + + + + - + https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json; - - + + $(RestoreSources); https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json; - + - - + diff --git a/efcore/eng/common/sdl/NuGet.config b/efcore/eng/common/sdl/NuGet.config index 3849bdb3cf5..ad97bbb991b 100644 --- a/efcore/eng/common/sdl/NuGet.config +++ b/efcore/eng/common/sdl/NuGet.config @@ -5,7 +5,10 @@ - + diff --git a/efcore/eng/common/sdl/packages.config b/efcore/eng/common/sdl/packages.config index 4585cfd6bba..86ce08dcf2a 100644 --- a/efcore/eng/common/sdl/packages.config +++ b/efcore/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/efcore/eng/testing/linker/SupportFiles/Directory.Build.props b/efcore/eng/testing/linker/SupportFiles/Directory.Build.props index ae755ffdccb..2f970d51f41 100644 --- a/efcore/eng/testing/linker/SupportFiles/Directory.Build.props +++ b/efcore/eng/testing/linker/SupportFiles/Directory.Build.props @@ -12,7 +12,6 @@ true enable enable - true diff --git a/efcore/eng/testing/linker/SupportFiles/Directory.Build.targets b/efcore/eng/testing/linker/SupportFiles/Directory.Build.targets index 8c119d5413b..5e6db65aa4e 100644 --- a/efcore/eng/testing/linker/SupportFiles/Directory.Build.targets +++ b/efcore/eng/testing/linker/SupportFiles/Directory.Build.targets @@ -1,2 +1 @@ - - + diff --git a/efcore/eng/testing/linker/trimmingTests.props b/efcore/eng/testing/linker/trimmingTests.props index f1928b5afd3..3f1aadab630 100644 --- a/efcore/eng/testing/linker/trimmingTests.props +++ b/efcore/eng/testing/linker/trimmingTests.props @@ -2,7 +2,7 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'trimmingTests')) $([MSBuild]::NormalizeDirectory('$(TrimmingTestDir)', 'projects')) - $(MSBuildThisFileDirectory)project.csproj.template + $(MSBuildThisFileDirectory)project.csproj.template enable diff --git a/efcore/eng/testing/linker/trimmingTests.targets b/efcore/eng/testing/linker/trimmingTests.targets index 2174c5ab2a9..8ebe6a42f5d 100644 --- a/efcore/eng/testing/linker/trimmingTests.targets +++ b/efcore/eng/testing/linker/trimmingTests.targets @@ -1,31 +1,41 @@ - <_additionalSourceFiles Condition="'@(TestConsoleAppSourceFiles)' == ''" Include="$(MSBuildProjectDirectory)\**\*.cs" Exclude="$(MSBuildProjectDirectory)\*.cs" /> - + <_additionalSourceFiles + Condition="'@(TestConsoleAppSourceFiles)' == ''" + Include="$(MSBuildProjectDirectory)\**\*.cs" + Exclude="$(MSBuildProjectDirectory)\*.cs" + /> + @(_additionalSourceFiles) - $([MSBuild]::NormalizeDirectory('$(TrimmingTestProjectsDir)', '$(MSBuildProjectName)')) - - + - + - $([MSBuild]::NormalizeDirectory('$(TrimmingTestProjectsDir)', '$(MSBuildProjectName)', '%(Filename)', '$(PackageRID)')) $(TargetRuntimeIdentifier) $(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework)-%(TestConsoleAppSourceFiles.TargetOS) + $(DefaultNetCoreTargetFramework)-%(TestConsoleAppSourceFiles.TargetOS) @@ -34,81 +44,78 @@ $([MSBuild]::NormalizeDirectory('%(ProjectDir)', 'bin', '$(Configuration)', '%(TargetFramework)', '%(TestRuntimeIdentifier)', 'publish')) - - + %(FullPath) %(AdditionalSourceFiles) - - - - - + + + + + - - + <_projectDir>%(TestConsoleApps.ProjectDir)\ <_projectFile>%(TestConsoleApps.ProjectFile) <_projectSourceFile>%(TestConsoleApps.ProjectCompileItems) - - + <_additionalProjectReference Include="<ProjectReference Include="%(ProjectReference.FullPath)" SkipUseReferenceAssembly="true" />" /> - <_additionalProjectReferenceTemp Include="$(AdditionalProjectReferences)" /> <_additionalProjectReference Include="<ProjectReference Include="$(LibrariesProjectRoot)%(_additionalProjectReferenceTemp.Identity)\src\%(_additionalProjectReferenceTemp.Identity).csproj" SkipUseReferenceAssembly="true" />" /> - <_additionalProjectReferencesString>@(_additionalProjectReference, '%0a ') - contentfiles;analyzers;build - - <_packageReferences Include="@(PackageReference)" Exclude="Microsoft.DotNet.ILCompiler;Microsoft.NET.ILLink.Tasks" /> + <_packageReferences + Include="@(PackageReference)" + Exclude="Microsoft.DotNet.ILCompiler;Microsoft.NET.ILLink.Tasks" + /> - - <_additionalPackageReference Include="<PackageReference Include="%(_packageReferences.Identity)" Version="%(_packageReferences.Version)" > <PrivateAssets>%(_packageReferences.PrivateAssets)</PrivateAssets> </PackageReference>" /> + <_additionalPackageReference + Include="<PackageReference Include="%(_packageReferences.Identity)" Version="%(_packageReferences.Version)" > <PrivateAssets>%(_packageReferences.PrivateAssets)</PrivateAssets> </PackageReference>" + /> - <_additionalPackageReferencesString>@(_additionalPackageReference, '%0a ') - <_additionalProjectSourceFiles Include="%(TestConsoleApps.AdditionalSourceFiles)" /> - <_switchesAsItems Include="%(TestConsoleApps.DisabledFeatureSwitches)" Value="false" /> <_switchesAsItems Include="%(TestConsoleApps.EnabledFeatureSwitches)" Value="true" /> - <_propertiesAsItems Include="%(TestConsoleApps.DisabledProperties)" Value="false" /> <_propertiesAsItems Include="%(TestConsoleApps.EnabledProperties)" Value="true" /> - - <_runtimeHostConfigurationOptionsString>@(_switchesAsItems->'<RuntimeHostConfigurationOption Include="%(Identity)" Value="%(Value)" Trim="true" />', '%0a ') - <_additionalPropertiesString>@(_propertiesAsItems->'<%(Identity)>%(Value)</%(Identity)>', '%0a ') + <_runtimeHostConfigurationOptionsString>@(_switchesAsItems->'<RuntimeHostConfigurationOption Include="%(Identity)" Value="%(Value)" Trim="true" />', '%0a ') + <_additionalPropertiesString>@(_propertiesAsItems->'<%(Identity)>%(Value)</%(Identity)>', '%0a ') - - - + + DestinationFolder="$(_projectDir)" + /> - - + <_RemoveProps>TreatWarningsAsErrors;BuildingSolutionFile;SolutionPath;SolutionFileName;SolutionExt;SolutionDir;CurrentSolutionConfigurationContents;Platform - - - - + + - - - + - + - - + - - - diff --git a/efcore/src/Directory.Build.props b/efcore/src/Directory.Build.props index 7b7ee237313..2e8ec0422d7 100644 --- a/efcore/src/Directory.Build.props +++ b/efcore/src/Directory.Build.props @@ -1,6 +1,5 @@ - latest True @@ -9,9 +8,11 @@ nullablePublicOnly;strict $(MSBuildThisFileDirectory)..\rulesets\EFCore.ruleset - - + - diff --git a/efcore/src/EFCore.Abstractions/EFCore.Abstractions.csproj b/efcore/src/EFCore.Abstractions/EFCore.Abstractions.csproj index 1872b15a402..562cdf0655e 100644 --- a/efcore/src/EFCore.Abstractions/EFCore.Abstractions.csproj +++ b/efcore/src/EFCore.Abstractions/EFCore.Abstractions.csproj @@ -1,5 +1,4 @@  - Provides abstractions and attributes that are used to configure Entity Framework Core $(DefaultNetCoreTargetFramework) @@ -10,7 +9,6 @@ true true - @@ -18,12 +16,10 @@ - - TextTemplatingFileGenerator @@ -31,11 +27,9 @@ Microsoft.EntityFrameworkCore.Diagnostics - - True @@ -43,5 +37,4 @@ AbstractionsStrings.Designer.tt - diff --git a/efcore/src/EFCore.Analyzers/EFCore.Analyzers.csproj b/efcore/src/EFCore.Analyzers/EFCore.Analyzers.csproj index f905f61fc15..292899404f1 100644 --- a/efcore/src/EFCore.Analyzers/EFCore.Analyzers.csproj +++ b/efcore/src/EFCore.Analyzers/EFCore.Analyzers.csproj @@ -10,13 +10,11 @@ $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset true - - @@ -25,31 +23,38 @@ AnalyzerStrings.resx - - - + + - - + true - - - PublicResXFileCodeGenerator @@ -57,5 +62,4 @@ Microsoft.EntityFrameworkCore - diff --git a/efcore/src/EFCore.Cosmos/EFCore.Cosmos.csproj b/efcore/src/EFCore.Cosmos/EFCore.Cosmos.csproj index 02536555d5b..7e20b87347e 100644 --- a/efcore/src/EFCore.Cosmos/EFCore.Cosmos.csproj +++ b/efcore/src/EFCore.Cosmos/EFCore.Cosmos.csproj @@ -1,5 +1,4 @@ - Azure Cosmos provider for Entity Framework Core. $(DefaultNetCoreTargetFramework) @@ -10,7 +9,6 @@ $(PackageTags);CosmosDb;SQL API true - @@ -34,20 +32,21 @@ - - - + - - CosmosStrings.Designer.tt @@ -55,7 +54,6 @@ True - Microsoft.EntityFrameworkCore.Cosmos.Internal @@ -63,9 +61,7 @@ CosmosStrings.Designer.cs - - diff --git a/efcore/src/EFCore.Design/EFCore.Design.csproj b/efcore/src/EFCore.Design/EFCore.Design.csproj index f1fd0f511d3..52eeba307b2 100644 --- a/efcore/src/EFCore.Design/EFCore.Design.csproj +++ b/efcore/src/EFCore.Design/EFCore.Design.csproj @@ -1,5 +1,4 @@  - Shared design-time components for Entity Framework Core tools. $(DefaultNetCoreTargetFramework) @@ -9,7 +8,6 @@ True true - @@ -36,7 +34,6 @@ - @@ -45,26 +42,35 @@ - True build - - + - - - - + + + - TextTemplatingFileGenerator @@ -80,11 +86,9 @@ CSharpEntityTypeGenerator.cs - - True @@ -102,5 +106,4 @@ CSharpEntityTypeGenerator.tt - diff --git a/efcore/src/EFCore.InMemory/EFCore.InMemory.csproj b/efcore/src/EFCore.InMemory/EFCore.InMemory.csproj index 9c42260ab64..5e4027fd115 100644 --- a/efcore/src/EFCore.InMemory/EFCore.InMemory.csproj +++ b/efcore/src/EFCore.InMemory/EFCore.InMemory.csproj @@ -1,5 +1,4 @@  - In-memory database provider for Entity Framework Core (to be used for testing purposes). $(DefaultNetCoreTargetFramework) @@ -10,7 +9,6 @@ $(PackageTags);In-Memory true - @@ -33,16 +31,18 @@ - - - + - TextTemplatingFileGenerator @@ -50,11 +50,9 @@ Microsoft.EntityFrameworkCore.InMemory.Internal - - True @@ -62,5 +60,4 @@ InMemoryStrings.Designer.tt - diff --git a/efcore/src/EFCore.Proxies/EFCore.Proxies.csproj b/efcore/src/EFCore.Proxies/EFCore.Proxies.csproj index 310779f2196..4629855453a 100644 --- a/efcore/src/EFCore.Proxies/EFCore.Proxies.csproj +++ b/efcore/src/EFCore.Proxies/EFCore.Proxies.csproj @@ -1,5 +1,4 @@  - Lazy loading proxies for Entity Framework Core. $(DefaultNetCoreTargetFramework) @@ -10,7 +9,6 @@ $(PackageTags);Lazy loading true - @@ -33,20 +31,21 @@ - - - - + - TextTemplatingFileGenerator @@ -54,11 +53,9 @@ Microsoft.EntityFrameworkCore.Internal - - True @@ -66,5 +63,4 @@ ProxiesStrings.Designer.tt - diff --git a/efcore/src/EFCore.Relational/EFCore.Relational.csproj b/efcore/src/EFCore.Relational/EFCore.Relational.csproj index 9725aabf412..5fef054ffc2 100644 --- a/efcore/src/EFCore.Relational/EFCore.Relational.csproj +++ b/efcore/src/EFCore.Relational/EFCore.Relational.csproj @@ -1,5 +1,4 @@  - Shared Entity Framework Core components for relational database providers. $(DefaultNetCoreTargetFramework) @@ -9,7 +8,6 @@ true true - @@ -36,20 +34,24 @@ - - - + - - + - TextTemplatingFileGenerator @@ -57,11 +59,9 @@ Microsoft.EntityFrameworkCore.Diagnostics - - True @@ -69,5 +69,4 @@ RelationalStrings.Designer.tt - diff --git a/efcore/src/EFCore.SqlServer.Abstractions/EFCore.SqlServer.Abstractions.csproj b/efcore/src/EFCore.SqlServer.Abstractions/EFCore.SqlServer.Abstractions.csproj index 0a63e98053e..9928794e256 100644 --- a/efcore/src/EFCore.SqlServer.Abstractions/EFCore.SqlServer.Abstractions.csproj +++ b/efcore/src/EFCore.SqlServer.Abstractions/EFCore.SqlServer.Abstractions.csproj @@ -1,5 +1,4 @@  - netstandard2.1 3.6 @@ -14,10 +13,8 @@ $(PackageTags);SQL Server;HierarchyId true - - diff --git a/efcore/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj b/efcore/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj index e6d879e920a..b461057c180 100644 --- a/efcore/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj +++ b/efcore/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj @@ -1,5 +1,4 @@  - $(DefaultNetCoreTargetFramework) 3.6 @@ -10,7 +9,6 @@ $(PackageTags);SQL Server;HierarchyId true - @@ -28,24 +26,28 @@ - - True build - - + - + - TextTemplatingFileGenerator @@ -53,11 +55,9 @@ Microsoft.EntityFrameworkCore.SqlServer.Internal - - True @@ -65,5 +65,4 @@ SqlServerHierarchyIdStrings.Designer.tt - diff --git a/efcore/src/EFCore.SqlServer.HierarchyId/build/net8.0/Microsoft.EntityFrameworkCore.SqlServer.HierarchyId.targets b/efcore/src/EFCore.SqlServer.HierarchyId/build/net8.0/Microsoft.EntityFrameworkCore.SqlServer.HierarchyId.targets index b445f6e4b57..e36c59e894b 100644 --- a/efcore/src/EFCore.SqlServer.HierarchyId/build/net8.0/Microsoft.EntityFrameworkCore.SqlServer.HierarchyId.targets +++ b/efcore/src/EFCore.SqlServer.HierarchyId/build/net8.0/Microsoft.EntityFrameworkCore.SqlServer.HierarchyId.targets @@ -24,23 +24,27 @@ - + <_Parameter1>Microsoft.EntityFrameworkCore.SqlServer.Design.Internal.SqlServerHierarchyIdDesignTimeServices, Microsoft.EntityFrameworkCore.SqlServer.HierarchyId <_Parameter2>Microsoft.EntityFrameworkCore.SqlServer - + - \ No newline at end of file + diff --git a/efcore/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj b/efcore/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj index 8a1570e3b59..14264b6721e 100644 --- a/efcore/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj +++ b/efcore/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj @@ -1,5 +1,4 @@  - NetTopologySuite support for the Microsoft SQL Server database provider for Entity Framework Core. $(DefaultNetCoreTargetFramework) @@ -10,7 +9,6 @@ $(PackageTags);SQL Server;GIS;NTS;OGC;Spatial true - @@ -38,28 +36,31 @@ - - True build - - - + + - - TextTemplatingFileGenerator @@ -67,11 +68,9 @@ Microsoft.EntityFrameworkCore.SqlServer.Internal - - True @@ -79,5 +78,4 @@ SqlServerNTSStrings.Designer.tt - diff --git a/efcore/src/EFCore.SqlServer.NTS/build/net8.0/Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite.targets b/efcore/src/EFCore.SqlServer.NTS/build/net8.0/Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite.targets index d4029a430f5..a4bc9c2fb65 100644 --- a/efcore/src/EFCore.SqlServer.NTS/build/net8.0/Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite.targets +++ b/efcore/src/EFCore.SqlServer.NTS/build/net8.0/Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite.targets @@ -24,23 +24,27 @@ - + <_Parameter1>Microsoft.EntityFrameworkCore.SqlServer.Design.Internal.SqlServerNetTopologySuiteDesignTimeServices, Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite <_Parameter2>Microsoft.EntityFrameworkCore.SqlServer - + - \ No newline at end of file + diff --git a/efcore/src/EFCore.SqlServer/EFCore.SqlServer.csproj b/efcore/src/EFCore.SqlServer/EFCore.SqlServer.csproj index 5d07b4b910e..21b02e687c4 100644 --- a/efcore/src/EFCore.SqlServer/EFCore.SqlServer.csproj +++ b/efcore/src/EFCore.SqlServer/EFCore.SqlServer.csproj @@ -1,5 +1,4 @@ - Microsoft SQL Server database provider for Entity Framework Core. $(DefaultNetCoreTargetFramework) @@ -10,7 +9,6 @@ $(PackageTags);SQL Server true - @@ -37,20 +35,24 @@ - - - - + + - - TextTemplatingFileGenerator @@ -58,11 +60,9 @@ Microsoft.EntityFrameworkCore.SqlServer.Internal - - True @@ -70,5 +70,4 @@ SqlServerStrings.Designer.tt - diff --git a/efcore/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj b/efcore/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj index 6597351343a..c0671fc9d21 100644 --- a/efcore/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj +++ b/efcore/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj @@ -1,5 +1,4 @@  - Microsoft.EntityFrameworkCore.Sqlite Microsoft.EntityFrameworkCore.Sqlite.Core @@ -11,7 +10,6 @@ $(PackageTags);SQLite true - @@ -38,21 +36,28 @@ - - - + - + - - + - TextTemplatingFileGenerator @@ -60,11 +65,9 @@ Microsoft.EntityFrameworkCore.Sqlite.Internal - - True @@ -72,5 +75,4 @@ SqliteStrings.Designer.tt - diff --git a/efcore/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj b/efcore/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj index 33550712092..7fae88b6784 100644 --- a/efcore/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj +++ b/efcore/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj @@ -1,5 +1,4 @@  - Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite @@ -11,7 +10,6 @@ $(PackageTags);SQLite;GIS;NTS;OGC;SpatiaLite true - @@ -39,29 +37,32 @@ - - True build - - - + + - - TextTemplatingFileGenerator @@ -69,11 +70,9 @@ Microsoft.EntityFrameworkCore.Sqlite.Internal - - True @@ -81,5 +80,4 @@ SqliteNTSStrings.Designer.tt - diff --git a/efcore/src/EFCore.Sqlite.NTS/build/net8.0/Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite.targets b/efcore/src/EFCore.Sqlite.NTS/build/net8.0/Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite.targets index 37f11ead01c..38c77bb930b 100644 --- a/efcore/src/EFCore.Sqlite.NTS/build/net8.0/Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite.targets +++ b/efcore/src/EFCore.Sqlite.NTS/build/net8.0/Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite.targets @@ -24,23 +24,27 @@ - + <_Parameter1>Microsoft.EntityFrameworkCore.Sqlite.Design.Internal.SqliteNetTopologySuiteDesignTimeServices, Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite <_Parameter2>Microsoft.EntityFrameworkCore.Sqlite - + - \ No newline at end of file + diff --git a/efcore/src/EFCore.Sqlite/EFCore.Sqlite.csproj b/efcore/src/EFCore.Sqlite/EFCore.Sqlite.csproj index f728029ae0c..cb7cf47ff5f 100644 --- a/efcore/src/EFCore.Sqlite/EFCore.Sqlite.csproj +++ b/efcore/src/EFCore.Sqlite/EFCore.Sqlite.csproj @@ -1,7 +1,5 @@ - - SQLite database provider for Entity Framework Core. $(DefaultNetCoreTargetFramework) @@ -13,7 +11,6 @@ true true - @@ -40,26 +37,28 @@ - - - + + - - True lib - - - diff --git a/efcore/src/EFCore.Templates/EFCore.Templates.csproj b/efcore/src/EFCore.Templates/EFCore.Templates.csproj index f21d190ab80..22c42343cd1 100644 --- a/efcore/src/EFCore.Templates/EFCore.Templates.csproj +++ b/efcore/src/EFCore.Templates/EFCore.Templates.csproj @@ -1,5 +1,4 @@  - Template Microsoft.EntityFrameworkCore.Templates @@ -17,12 +16,10 @@ true false - - content\templates\ef-templates\CodeTemplates\EFCore\DbContext.t4 @@ -32,12 +29,14 @@ content\templates\ef-templates\CodeTemplates\EFCore\EntityType.t4 - - - + @@ -113,19 +112,21 @@ if (!linePragmasRemoved - $(BeforePack);GenerateContent - - + - + - - \ No newline at end of file + diff --git a/efcore/src/EFCore.Tools/EFCore.Tools.csproj b/efcore/src/EFCore.Tools/EFCore.Tools.csproj index 91e375fae51..bbcd24a093a 100644 --- a/efcore/src/EFCore.Tools/EFCore.Tools.csproj +++ b/efcore/src/EFCore.Tools/EFCore.Tools.csproj @@ -1,7 +1,5 @@ - - netcoreapp2.0 Microsoft.EntityFrameworkCore.Tools @@ -27,7 +25,6 @@ Update-Database False true - @@ -54,44 +51,50 @@ Update-Database - - - + - - - + true - true - - - - - + Outputs="@(GeneratedContent->'$(IntermediateOutputPath)%(FileName)'" + > + - - diff --git a/efcore/src/EFCore/EFCore.csproj b/efcore/src/EFCore/EFCore.csproj index 77b927ca73d..6c1a7357016 100644 --- a/efcore/src/EFCore/EFCore.csproj +++ b/efcore/src/EFCore/EFCore.csproj @@ -1,5 +1,4 @@  - Entity Framework Core is a modern object-database mapper for .NET. It supports LINQ queries, change tracking, updates, and schema migrations. EF Core works with SQL Server, Azure SQL Database, SQLite, Azure Cosmos DB, MySQL, PostgreSQL, and other databases through a provider plugin API. @@ -14,7 +13,6 @@ Microsoft.EntityFrameworkCore.DbSet true true - @@ -37,28 +35,33 @@ Microsoft.EntityFrameworkCore.DbSet - - - - + + - - + - True buildTransitive - TextTemplatingFileGenerator @@ -86,11 +89,9 @@ Microsoft.EntityFrameworkCore.DbSet TextTemplatingFileGenerator - - True @@ -124,5 +125,4 @@ Microsoft.EntityFrameworkCore.DbSet True - diff --git a/efcore/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj b/efcore/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj index 525245c8847..97c652ea4ec 100644 --- a/efcore/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj +++ b/efcore/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj @@ -1,5 +1,4 @@ - Microsoft.Data.Sqlite $(AssemblyName) @@ -23,7 +22,6 @@ Microsoft.Data.Sqlite.SqliteTransaction https://docs.microsoft.com/dotnet/standard/data/sqlite/ true - TextTemplatingFileGenerator @@ -38,11 +36,9 @@ Microsoft.Data.Sqlite.SqliteTransaction SqliteConnection.CreateFunction.cs - - True @@ -62,9 +58,7 @@ Microsoft.Data.Sqlite.SqliteTransaction - - diff --git a/efcore/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj b/efcore/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj index 34cd41f43ec..3746ad4e1f9 100644 --- a/efcore/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj +++ b/efcore/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj @@ -1,7 +1,5 @@ - - Microsoft.Data.Sqlite is a lightweight ADO.NET provider for SQLite. @@ -22,25 +20,19 @@ Microsoft.Data.Sqlite.SqliteTransaction true https://docs.microsoft.com/dotnet/standard/data/sqlite/ - - - True lib - - - diff --git a/efcore/src/dotnet-ef/Resources/EntityFrameworkCore.targets b/efcore/src/dotnet-ef/Resources/EntityFrameworkCore.targets index 7d6485dcc7c..912f534d43d 100644 --- a/efcore/src/dotnet-ef/Resources/EntityFrameworkCore.targets +++ b/efcore/src/dotnet-ef/Resources/EntityFrameworkCore.targets @@ -1,10 +1,12 @@  - + @@ -21,8 +23,10 @@ - + diff --git a/efcore/src/dotnet-ef/dotnet-ef.csproj b/efcore/src/dotnet-ef/dotnet-ef.csproj index 95d018b0859..f4c3b168936 100644 --- a/efcore/src/dotnet-ef/dotnet-ef.csproj +++ b/efcore/src/dotnet-ef/dotnet-ef.csproj @@ -1,5 +1,4 @@  - Entity Framework Core Tools for the .NET Command-Line Interface. @@ -25,7 +24,6 @@ dotnet ef database update $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset true - @@ -42,29 +40,27 @@ dotnet ef database update - + - - - TextTemplatingFileGenerator Resources.Designer.cs - - True @@ -72,17 +68,18 @@ dotnet ef database update Resources.Designer.tt - - + true - - diff --git a/efcore/src/ef/ef.csproj b/efcore/src/ef/ef.csproj index 0bc0ba69b04..da477da3ff8 100644 --- a/efcore/src/ef/ef.csproj +++ b/efcore/src/ef/ef.csproj @@ -1,5 +1,4 @@  - netcoreapp2.0;net461 Entity Framework Core Command-line Tools @@ -10,7 +9,6 @@ $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset Major - @@ -21,12 +19,10 @@ - - TextTemplatingFilePreprocessor @@ -41,11 +37,9 @@ Resources.Designer.cs - - True @@ -63,10 +57,20 @@ Resources.Designer.tt - - - - + + + - diff --git a/efcore/test/Directory.Build.props b/efcore/test/Directory.Build.props index 9ccfadee78d..8451604286e 100644 --- a/efcore/test/Directory.Build.props +++ b/efcore/test/Directory.Build.props @@ -1,10 +1,8 @@ - $(NoWarn);CA1707;1591;xUnit1000;xUnit1003;xUnit1004;xUnit1010;xUnit1013;xUnit1026;xUnit2013;xUnit1024 $(MSBuildThisFileDirectory)..\rulesets\EFCore.test.ruleset preview - diff --git a/efcore/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj b/efcore/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj index d6d3557f289..d29b236234b 100644 --- a/efcore/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj +++ b/efcore/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj @@ -1,5 +1,4 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.Analyzers.Tests @@ -7,7 +6,6 @@ true true - @@ -34,18 +32,27 @@ - - + - - + + - - - + + - diff --git a/efcore/test/EFCore.AspNet.InMemory.FunctionalTests/EFCore.AspNet.InMemory.FunctionalTests.csproj b/efcore/test/EFCore.AspNet.InMemory.FunctionalTests/EFCore.AspNet.InMemory.FunctionalTests.csproj index da09e326c08..8bb403b9c41 100644 --- a/efcore/test/EFCore.AspNet.InMemory.FunctionalTests/EFCore.AspNet.InMemory.FunctionalTests.csproj +++ b/efcore/test/EFCore.AspNet.InMemory.FunctionalTests/EFCore.AspNet.InMemory.FunctionalTests.csproj @@ -1,12 +1,10 @@ - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.AspNet.InMemory.FunctionalTests Microsoft.EntityFrameworkCore true - @@ -33,16 +31,13 @@ - PreserveNewest - - diff --git a/efcore/test/EFCore.AspNet.Specification.Tests/EFCore.AspNet.Specification.Tests.csproj b/efcore/test/EFCore.AspNet.Specification.Tests/EFCore.AspNet.Specification.Tests.csproj index 7035822855e..e424a7555fb 100644 --- a/efcore/test/EFCore.AspNet.Specification.Tests/EFCore.AspNet.Specification.Tests.csproj +++ b/efcore/test/EFCore.AspNet.Specification.Tests/EFCore.AspNet.Specification.Tests.csproj @@ -1,5 +1,4 @@ - Shared ASP.NET test suite for Entity Framework Core database providers. $(DefaultNetCoreTargetFramework) @@ -11,7 +10,6 @@ true $(NoWarn);8981 - @@ -39,11 +37,9 @@ - - @@ -52,9 +48,7 @@ - - diff --git a/efcore/test/EFCore.AspNet.SqlServer.FunctionalTests/EFCore.AspNet.SqlServer.FunctionalTests.csproj b/efcore/test/EFCore.AspNet.SqlServer.FunctionalTests/EFCore.AspNet.SqlServer.FunctionalTests.csproj index 83cbc105f32..7d58696ba98 100644 --- a/efcore/test/EFCore.AspNet.SqlServer.FunctionalTests/EFCore.AspNet.SqlServer.FunctionalTests.csproj +++ b/efcore/test/EFCore.AspNet.SqlServer.FunctionalTests/EFCore.AspNet.SqlServer.FunctionalTests.csproj @@ -1,13 +1,13 @@ - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.AspNet.SqlServer.FunctionalTests Microsoft.EntityFrameworkCore - True + True true - @@ -39,16 +39,13 @@ - PreserveNewest - - diff --git a/efcore/test/EFCore.AspNet.Sqlite.FunctionalTests/EFCore.AspNet.Sqlite.FunctionalTests.csproj b/efcore/test/EFCore.AspNet.Sqlite.FunctionalTests/EFCore.AspNet.Sqlite.FunctionalTests.csproj index ab815f173c7..bb3e71f65e5 100644 --- a/efcore/test/EFCore.AspNet.Sqlite.FunctionalTests/EFCore.AspNet.Sqlite.FunctionalTests.csproj +++ b/efcore/test/EFCore.AspNet.Sqlite.FunctionalTests/EFCore.AspNet.Sqlite.FunctionalTests.csproj @@ -1,12 +1,10 @@ - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.AspNet.Sqlite.FunctionalTests Microsoft.EntityFrameworkCore true - @@ -38,16 +36,13 @@ - PreserveNewest - - diff --git a/efcore/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj b/efcore/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj index de07aa034e6..c875fcf0871 100644 --- a/efcore/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj +++ b/efcore/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj @@ -1,5 +1,4 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.Cosmos.FunctionalTests @@ -9,15 +8,12 @@ true - - - @@ -45,7 +41,6 @@ - PreserveNewest @@ -54,17 +49,14 @@ PreserveNewest - - - @@ -73,11 +65,15 @@ - - - + + - diff --git a/efcore/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj b/efcore/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj index 56efd6ccf89..ef26ea72942 100644 --- a/efcore/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj +++ b/efcore/test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj @@ -1,5 +1,4 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.Cosmos.Tests @@ -8,7 +7,6 @@ true - @@ -36,7 +34,6 @@ - @@ -47,5 +44,4 @@ - diff --git a/efcore/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj b/efcore/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj index 50f9db27324..b0356e4354e 100644 --- a/efcore/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj +++ b/efcore/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj @@ -1,12 +1,10 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.CrossStore.FunctionalTests Microsoft.EntityFrameworkCore true - @@ -38,12 +36,10 @@ - - diff --git a/efcore/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj b/efcore/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj index 06452c6407c..0755a95d746 100644 --- a/efcore/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj +++ b/efcore/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj @@ -1,5 +1,4 @@ - $(DefaultNetCoreTargetFramework) true @@ -7,12 +6,16 @@ Microsoft.EntityFrameworkCore true - - - + + - @@ -43,7 +46,6 @@ - @@ -53,11 +55,15 @@ - - - + + - diff --git a/efcore/test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj b/efcore/test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj index a444262ee83..678f8582eac 100644 --- a/efcore/test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj +++ b/efcore/test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj @@ -1,5 +1,4 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.InMemory.FunctionalTests @@ -9,15 +8,12 @@ true - - - @@ -45,7 +41,6 @@ - @@ -54,5 +49,4 @@ - diff --git a/efcore/test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj b/efcore/test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj index 3400be62f97..4ea0d61c14c 100644 --- a/efcore/test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj +++ b/efcore/test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj @@ -1,12 +1,10 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.InMemory.Tests Microsoft.EntityFrameworkCore true - @@ -34,11 +32,9 @@ - - diff --git a/efcore/test/EFCore.NativeAotTests/EFCore.NativeAotTests.csproj b/efcore/test/EFCore.NativeAotTests/EFCore.NativeAotTests.csproj index 1dd35abe704..ea6e343caaf 100644 --- a/efcore/test/EFCore.NativeAotTests/EFCore.NativeAotTests.csproj +++ b/efcore/test/EFCore.NativeAotTests/EFCore.NativeAotTests.csproj @@ -1,5 +1,4 @@ - Exe $(DefaultNetCoreTargetFramework) @@ -9,17 +8,20 @@ Microsoft.EntityFrameworkCore.NativeAotTests Microsoft.EntityFrameworkCore.NativeAotTests - - - - + + - diff --git a/efcore/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj b/efcore/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj index 1c6161f1e2d..4e08b7cb5e5 100644 --- a/efcore/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj +++ b/efcore/test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj @@ -1,13 +1,13 @@ - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.OData.FunctionalTests Microsoft.EntityFrameworkCore - True + True true - @@ -35,17 +35,13 @@ - - - - diff --git a/efcore/test/EFCore.Proxies.Tests/EFCore.Proxies.Tests.csproj b/efcore/test/EFCore.Proxies.Tests/EFCore.Proxies.Tests.csproj index 3dd0e3411e3..53c011fee05 100644 --- a/efcore/test/EFCore.Proxies.Tests/EFCore.Proxies.Tests.csproj +++ b/efcore/test/EFCore.Proxies.Tests/EFCore.Proxies.Tests.csproj @@ -1,12 +1,10 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.Proxies.Tests Microsoft.EntityFrameworkCore true - @@ -33,10 +31,8 @@ - - diff --git a/efcore/test/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj b/efcore/test/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj index c4b531fd2ad..51278db5a72 100644 --- a/efcore/test/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj +++ b/efcore/test/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj @@ -1,5 +1,4 @@  - Shared test suite for Entity Framework Core relational database providers. $(DefaultNetCoreTargetFramework) @@ -10,7 +9,6 @@ true true - @@ -42,21 +40,23 @@ - - - - + + - - diff --git a/efcore/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj b/efcore/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj index 2a07f18b847..469a81d11a4 100644 --- a/efcore/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj +++ b/efcore/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj @@ -1,12 +1,10 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.Relational.Tests Microsoft.EntityFrameworkCore true - @@ -38,19 +36,18 @@ - - - + - - diff --git a/efcore/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj b/efcore/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj index 82ce956b506..7b719d53a54 100644 --- a/efcore/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj +++ b/efcore/test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj @@ -1,5 +1,4 @@ - Shared test suite for Entity Framework Core database providers. $(DefaultNetCoreTargetFramework) @@ -14,7 +13,6 @@ true - @@ -41,27 +39,30 @@ - - - + - - + - diff --git a/efcore/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj b/efcore/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj index 15c599dc131..6eebbd08cf8 100644 --- a/efcore/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj +++ b/efcore/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj @@ -1,22 +1,20 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.SqlServer.FunctionalTests Microsoft.EntityFrameworkCore true - True + True true - - - @@ -49,7 +47,6 @@ - PreserveNewest @@ -64,14 +61,18 @@ PreserveNewest - - - - + + diff --git a/efcore/test/EFCore.SqlServer.HierarchyId.Tests/EFCore.SqlServer.HierarchyId.Tests.csproj b/efcore/test/EFCore.SqlServer.HierarchyId.Tests/EFCore.SqlServer.HierarchyId.Tests.csproj index 9fc575a59e1..c79d0f5eed2 100644 --- a/efcore/test/EFCore.SqlServer.HierarchyId.Tests/EFCore.SqlServer.HierarchyId.Tests.csproj +++ b/efcore/test/EFCore.SqlServer.HierarchyId.Tests/EFCore.SqlServer.HierarchyId.Tests.csproj @@ -1,18 +1,16 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.SqlServer.HierarchyId.Tests Microsoft.EntityFrameworkCore.SqlServer - True + True true - - - diff --git a/efcore/test/EFCore.SqlServer.Tests/EFCore.SqlServer.Tests.csproj b/efcore/test/EFCore.SqlServer.Tests/EFCore.SqlServer.Tests.csproj index 1cf27a309b4..2f297c92151 100644 --- a/efcore/test/EFCore.SqlServer.Tests/EFCore.SqlServer.Tests.csproj +++ b/efcore/test/EFCore.SqlServer.Tests/EFCore.SqlServer.Tests.csproj @@ -1,12 +1,10 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.SqlServer.Tests Microsoft.EntityFrameworkCore true - @@ -39,11 +37,9 @@ - - diff --git a/efcore/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj b/efcore/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj index ca618c3ae1b..49791e48d7f 100644 --- a/efcore/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj +++ b/efcore/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj @@ -1,5 +1,4 @@ - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.Sqlite.FunctionalTests @@ -7,15 +6,12 @@ true true - - - @@ -48,20 +44,16 @@ - PreserveNewest - - - diff --git a/efcore/test/EFCore.Sqlite.Tests/EFCore.Sqlite.Tests.csproj b/efcore/test/EFCore.Sqlite.Tests/EFCore.Sqlite.Tests.csproj index 749df3766b1..9b93f94f98f 100644 --- a/efcore/test/EFCore.Sqlite.Tests/EFCore.Sqlite.Tests.csproj +++ b/efcore/test/EFCore.Sqlite.Tests/EFCore.Sqlite.Tests.csproj @@ -1,12 +1,10 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.Sqlite.Tests Microsoft.EntityFrameworkCore true - @@ -39,11 +37,9 @@ - - diff --git a/efcore/test/EFCore.Tests/EFCore.Tests.csproj b/efcore/test/EFCore.Tests/EFCore.Tests.csproj index e8e130056ff..9174ad8c748 100644 --- a/efcore/test/EFCore.Tests/EFCore.Tests.csproj +++ b/efcore/test/EFCore.Tests/EFCore.Tests.csproj @@ -1,12 +1,10 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.Tests Microsoft.EntityFrameworkCore true - @@ -33,41 +31,34 @@ - <_Parameter1>PackageVersion <_Parameter2>$(PackageVersion) - - - TextTemplatingFileGenerator GiantModel.cs - True True GiantModel.tt - TextTemplatingFileGenerator GiantModel.cs - diff --git a/efcore/test/EFCore.TrimmingTests/EFCore.TrimmingTests.csproj b/efcore/test/EFCore.TrimmingTests/EFCore.TrimmingTests.csproj index bacc38a4e78..c1c8ee2d006 100644 --- a/efcore/test/EFCore.TrimmingTests/EFCore.TrimmingTests.csproj +++ b/efcore/test/EFCore.TrimmingTests/EFCore.TrimmingTests.csproj @@ -1,5 +1,4 @@ - Exe $(DefaultNetCoreTargetFramework) @@ -9,16 +8,19 @@ Microsoft.EntityFrameworkCore.TrimmingTests Microsoft.EntityFrameworkCore.TrimmingTests - - - - + + - diff --git a/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj b/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj index 2d4105b10d2..28e525e6c78 100644 --- a/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj +++ b/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj @@ -1,17 +1,13 @@ - $(DefaultNetCoreTargetFramework);net462 $(DefineConstants);E_SQLITE3 enable - - - diff --git a/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj b/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj index 71c22ec4806..e6a49b3539c 100644 --- a/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj +++ b/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj @@ -1,17 +1,13 @@ - $(DefaultNetCoreTargetFramework);net462 $(DefineConstants);E_SQLCIPHER enable - - - diff --git a/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj b/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj index 26e733f085e..bc9aa345997 100644 --- a/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj +++ b/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj @@ -1,17 +1,13 @@ - $(DefaultNetCoreTargetFramework);net462 $(DefineConstants);SQLITE3 enable - - - diff --git a/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj b/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj index 7a8b5f7933a..664b03dd25b 100644 --- a/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj +++ b/efcore/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj @@ -1,17 +1,13 @@ - $(DefaultNetCoreTargetFramework);net462 $(DefineConstants);WINSQLITE3 enable - - - diff --git a/efcore/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj b/efcore/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj index 40f283d294f..a526c366c0f 100644 --- a/efcore/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj +++ b/efcore/test/dotnet-ef.Tests/dotnet-ef.Tests.csproj @@ -1,11 +1,9 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.Tools true - @@ -14,9 +12,7 @@ - - diff --git a/efcore/test/ef.Tests/ef.Tests.csproj b/efcore/test/ef.Tests/ef.Tests.csproj index a0c282eaf1f..4510c71e407 100644 --- a/efcore/test/ef.Tests/ef.Tests.csproj +++ b/efcore/test/ef.Tests/ef.Tests.csproj @@ -1,11 +1,9 @@  - $(DefaultNetCoreTargetFramework) Microsoft.EntityFrameworkCore.Tools true - @@ -28,23 +26,25 @@ - - - - - + + -