From ba1949671a49059d26949cf5bf0e0eebcc49b25f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 2 Mar 2026 21:44:44 +0000 Subject: [PATCH 01/21] Initial plan From 36dcbdba8a78b967681edc43c5a88696192a7606 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 2 Mar 2026 22:10:23 +0000 Subject: [PATCH 02/21] Remove checked-in nuspec files and convert to MSBuild properties - Remove dotnet-ef.nuspec, EFCore.Tools.nuspec, EFCore.Tasks.nuspec - Convert package customizations to MSBuild properties and targets - Add Microsoft.EntityFrameworkCore.Design to Directory.Packages.props - Use _PackageFiles items in targets to include ef project outputs - Add PrivateAssets="all" to ef ProjectReference to prevent dependency leakage - Use ProjectReference to EFCore.Design for Tasks dependency Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- Directory.Packages.props | 1 + src/EFCore.Tasks/EFCore.Tasks.csproj | 26 ++++++++++----------- src/EFCore.Tasks/EFCore.Tasks.nuspec | 23 ------------------ src/EFCore.Tools/EFCore.Tools.csproj | 25 ++++++++++++-------- src/EFCore.Tools/EFCore.Tools.nuspec | 29 ----------------------- src/dotnet-ef/dotnet-ef.csproj | 35 ++++++++++------------------ src/dotnet-ef/dotnet-ef.nuspec | 27 --------------------- 7 files changed, 41 insertions(+), 125 deletions(-) delete mode 100644 src/EFCore.Tasks/EFCore.Tasks.nuspec delete mode 100644 src/EFCore.Tools/EFCore.Tools.nuspec delete mode 100644 src/dotnet-ef/dotnet-ef.nuspec diff --git a/Directory.Packages.props b/Directory.Packages.props index df64892142d..acadd66e943 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -34,6 +34,7 @@ + diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index b6792f58403..b4585584957 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -6,9 +6,9 @@ Microsoft.EntityFrameworkCore.Tasks Microsoft.EntityFrameworkCore false + false true true - true true $(NoWarn);NU5100;NU5128 true @@ -45,7 +45,11 @@ - + + + + + @@ -61,22 +65,18 @@ - true - $(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec - + - - - - - + <_PackageFiles Include="$(OutputPath)$(NetCurrent)\$(AssemblyName).dll" PackagePath="tasks\$(NetCurrent)\" /> + <_PackageFiles Include="$(OutputPath)$(NetCurrent)\$(AssemblyName).pdb" PackagePath="tasks\$(NetCurrent)\" /> + <_PackageFiles Include="$(OutputPath)$(NetCurrent)\$(AssemblyName).deps.json" PackagePath="tasks\$(NetCurrent)\" /> + <_PackageFiles Include="$(OutputPath)$(NetFrameworkToolCurrent)\*" PackagePath="tasks\$(NetFrameworkToolCurrent)\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(NetMinimum)\*" PackagePath="tools\$(NetCurrent)\" /> + <_PackageFiles Include="buildTransitive\*" PackagePath="buildTransitive\" /> diff --git a/src/EFCore.Tasks/EFCore.Tasks.nuspec b/src/EFCore.Tasks/EFCore.Tasks.nuspec deleted file mode 100644 index 1bdc73455cf..00000000000 --- a/src/EFCore.Tasks/EFCore.Tasks.nuspec +++ /dev/null @@ -1,23 +0,0 @@ - - - - - $CommonMetadataElements$ - - - - - - docs\PACKAGE.md - - - $CommonFileElements$ - - - - - - - - - \ No newline at end of file diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj index 19427b0c1c2..fedc5bc78e9 100644 --- a/src/EFCore.Tools/EFCore.Tools.csproj +++ b/src/EFCore.Tools/EFCore.Tools.csproj @@ -5,9 +5,7 @@ $(NetMinimum) Microsoft.EntityFrameworkCore.Tools - $(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec true - true true true false @@ -31,25 +29,32 @@ Update-Database - + + - - + - - - + <_PackageFiles Include="lib\**\*" PackagePath="lib\" /> + <_PackageFiles Include="tools\**\*" PackagePath="tools\" /> + <_PackageFiles Include="$(IntermediateOutputPath)*.psd1" PackagePath="tools\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\any\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\any\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\win-x86\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\win-x86\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\win-arm64\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\win-arm64\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.dll" PackagePath="tools\$(TargetFramework)\any\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.pdb" PackagePath="tools\$(TargetFramework)\any\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.runtimeconfig.json" PackagePath="tools\$(TargetFramework)\any\" /> diff --git a/src/EFCore.Tools/EFCore.Tools.nuspec b/src/EFCore.Tools/EFCore.Tools.nuspec deleted file mode 100644 index 7201a3eff73..00000000000 --- a/src/EFCore.Tools/EFCore.Tools.nuspec +++ /dev/null @@ -1,29 +0,0 @@ - - - - - $CommonMetadataElements$ - - - - - - docs\PACKAGE.md - - - $CommonFileElements$ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj index 598f35dde1b..12ffdd14dc0 100644 --- a/src/dotnet-ef/dotnet-ef.csproj +++ b/src/dotnet-ef/dotnet-ef.csproj @@ -17,11 +17,9 @@ Exe true win-x64;win-x86;win-arm64 - - $(OutDir) Microsoft.EntityFrameworkCore.Tools false - $(MSBuildProjectName).nuspec + true Major $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset true @@ -48,7 +46,7 @@ - + @@ -70,26 +68,17 @@ - - - - true - - + - - - - - - - - - - - - - + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.dll" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.runtimeconfig.json" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\any\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\any\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-x86\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-x86\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-arm64\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-arm64\" /> \ No newline at end of file diff --git a/src/dotnet-ef/dotnet-ef.nuspec b/src/dotnet-ef/dotnet-ef.nuspec deleted file mode 100644 index 40cfb6c7f26..00000000000 --- a/src/dotnet-ef/dotnet-ef.nuspec +++ /dev/null @@ -1,27 +0,0 @@ - - - - - $CommonMetadataElements$ - - - - docs\PACKAGE.md - - - - $CommonFileElements$ - - - - - - - - - - - - - - \ No newline at end of file From c01eba6575af19baf261e07883db0f2c51ede4c1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 2 Mar 2026 22:32:54 +0000 Subject: [PATCH 03/21] Changes before error encountered Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- src/EFCore.Tasks/EFCore.Tasks.csproj | 3 ++- src/EFCore.Tools/EFCore.Tools.csproj | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index b4585584957..326ee4ae907 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -9,6 +9,7 @@ false true true + false true $(NoWarn);NU5100;NU5128 true @@ -49,7 +50,7 @@ - + diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj index fedc5bc78e9..8bebea953e3 100644 --- a/src/EFCore.Tools/EFCore.Tools.csproj +++ b/src/EFCore.Tools/EFCore.Tools.csproj @@ -6,6 +6,7 @@ $(NetMinimum) Microsoft.EntityFrameworkCore.Tools true + false true true false @@ -34,7 +35,7 @@ Update-Database - + From ccbce7a4746d4ab23812ab25fa5d9cc86bc34e8a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 2 Mar 2026 22:52:18 +0000 Subject: [PATCH 04/21] Fix package content: restore PDB entries, suppress net472 deps in Tasks, add Pack=false to framework refs Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- src/EFCore.Tasks/EFCore.Tasks.csproj | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index 326ee4ae907..eca9c144dde 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -59,13 +59,17 @@ - - - - - + + + + + + + true + + true From b22182a827681a42467ea908d8d39e61285ae56b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 2 Mar 2026 22:59:16 +0000 Subject: [PATCH 05/21] Rename all PACKAGE.md files to README.md Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- Directory.Build.targets | 2 +- src/EFCore.Abstractions/{PACKAGE.md => README.md} | 0 src/EFCore.Cosmos/{PACKAGE.md => README.md} | 0 src/EFCore.Design/{PACKAGE.md => README.md} | 0 src/EFCore.InMemory/{PACKAGE.md => README.md} | 0 src/EFCore.Proxies/{PACKAGE.md => README.md} | 0 src/EFCore.Relational/{PACKAGE.md => README.md} | 0 src/EFCore.SqlServer.Abstractions/{PACKAGE.md => README.md} | 0 src/EFCore.SqlServer.HierarchyId/{PACKAGE.md => README.md} | 0 src/EFCore.SqlServer.NTS/{PACKAGE.md => README.md} | 0 src/EFCore.SqlServer/{PACKAGE.md => README.md} | 0 src/EFCore.Sqlite.Core/{PACKAGE.md => README.md} | 0 src/EFCore.Sqlite.NTS/{PACKAGE.md => README.md} | 0 src/EFCore.Sqlite/{PACKAGE.md => README.md} | 0 src/EFCore.Tasks/{PACKAGE.md => README.md} | 0 src/EFCore.Templates/{PACKAGE.md => README.md} | 0 src/EFCore.Tools/{PACKAGE.md => README.md} | 0 src/EFCore/{PACKAGE.md => README.md} | 0 src/Microsoft.Data.Sqlite/{PACKAGE.md => README.md} | 0 src/dotnet-ef/{PACKAGE.md => README.md} | 0 .../EFCore.AspNet.Specification.Tests/{PACKAGE.md => README.md} | 0 .../{PACKAGE.md => README.md} | 0 test/EFCore.Specification.Tests/{PACKAGE.md => README.md} | 0 23 files changed, 1 insertion(+), 1 deletion(-) rename src/EFCore.Abstractions/{PACKAGE.md => README.md} (100%) rename src/EFCore.Cosmos/{PACKAGE.md => README.md} (100%) rename src/EFCore.Design/{PACKAGE.md => README.md} (100%) rename src/EFCore.InMemory/{PACKAGE.md => README.md} (100%) rename src/EFCore.Proxies/{PACKAGE.md => README.md} (100%) rename src/EFCore.Relational/{PACKAGE.md => README.md} (100%) rename src/EFCore.SqlServer.Abstractions/{PACKAGE.md => README.md} (100%) rename src/EFCore.SqlServer.HierarchyId/{PACKAGE.md => README.md} (100%) rename src/EFCore.SqlServer.NTS/{PACKAGE.md => README.md} (100%) rename src/EFCore.SqlServer/{PACKAGE.md => README.md} (100%) rename src/EFCore.Sqlite.Core/{PACKAGE.md => README.md} (100%) rename src/EFCore.Sqlite.NTS/{PACKAGE.md => README.md} (100%) rename src/EFCore.Sqlite/{PACKAGE.md => README.md} (100%) rename src/EFCore.Tasks/{PACKAGE.md => README.md} (100%) rename src/EFCore.Templates/{PACKAGE.md => README.md} (100%) rename src/EFCore.Tools/{PACKAGE.md => README.md} (100%) rename src/EFCore/{PACKAGE.md => README.md} (100%) rename src/Microsoft.Data.Sqlite/{PACKAGE.md => README.md} (100%) rename src/dotnet-ef/{PACKAGE.md => README.md} (100%) rename test/EFCore.AspNet.Specification.Tests/{PACKAGE.md => README.md} (100%) rename test/EFCore.Relational.Specification.Tests/{PACKAGE.md => README.md} (100%) rename test/EFCore.Specification.Tests/{PACKAGE.md => README.md} (100%) diff --git a/Directory.Build.targets b/Directory.Build.targets index b2b7913a657..3020ae882fe 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -2,7 +2,7 @@ - PACKAGE.md + README.md diff --git a/src/EFCore.Abstractions/PACKAGE.md b/src/EFCore.Abstractions/README.md similarity index 100% rename from src/EFCore.Abstractions/PACKAGE.md rename to src/EFCore.Abstractions/README.md diff --git a/src/EFCore.Cosmos/PACKAGE.md b/src/EFCore.Cosmos/README.md similarity index 100% rename from src/EFCore.Cosmos/PACKAGE.md rename to src/EFCore.Cosmos/README.md diff --git a/src/EFCore.Design/PACKAGE.md b/src/EFCore.Design/README.md similarity index 100% rename from src/EFCore.Design/PACKAGE.md rename to src/EFCore.Design/README.md diff --git a/src/EFCore.InMemory/PACKAGE.md b/src/EFCore.InMemory/README.md similarity index 100% rename from src/EFCore.InMemory/PACKAGE.md rename to src/EFCore.InMemory/README.md diff --git a/src/EFCore.Proxies/PACKAGE.md b/src/EFCore.Proxies/README.md similarity index 100% rename from src/EFCore.Proxies/PACKAGE.md rename to src/EFCore.Proxies/README.md diff --git a/src/EFCore.Relational/PACKAGE.md b/src/EFCore.Relational/README.md similarity index 100% rename from src/EFCore.Relational/PACKAGE.md rename to src/EFCore.Relational/README.md diff --git a/src/EFCore.SqlServer.Abstractions/PACKAGE.md b/src/EFCore.SqlServer.Abstractions/README.md similarity index 100% rename from src/EFCore.SqlServer.Abstractions/PACKAGE.md rename to src/EFCore.SqlServer.Abstractions/README.md diff --git a/src/EFCore.SqlServer.HierarchyId/PACKAGE.md b/src/EFCore.SqlServer.HierarchyId/README.md similarity index 100% rename from src/EFCore.SqlServer.HierarchyId/PACKAGE.md rename to src/EFCore.SqlServer.HierarchyId/README.md diff --git a/src/EFCore.SqlServer.NTS/PACKAGE.md b/src/EFCore.SqlServer.NTS/README.md similarity index 100% rename from src/EFCore.SqlServer.NTS/PACKAGE.md rename to src/EFCore.SqlServer.NTS/README.md diff --git a/src/EFCore.SqlServer/PACKAGE.md b/src/EFCore.SqlServer/README.md similarity index 100% rename from src/EFCore.SqlServer/PACKAGE.md rename to src/EFCore.SqlServer/README.md diff --git a/src/EFCore.Sqlite.Core/PACKAGE.md b/src/EFCore.Sqlite.Core/README.md similarity index 100% rename from src/EFCore.Sqlite.Core/PACKAGE.md rename to src/EFCore.Sqlite.Core/README.md diff --git a/src/EFCore.Sqlite.NTS/PACKAGE.md b/src/EFCore.Sqlite.NTS/README.md similarity index 100% rename from src/EFCore.Sqlite.NTS/PACKAGE.md rename to src/EFCore.Sqlite.NTS/README.md diff --git a/src/EFCore.Sqlite/PACKAGE.md b/src/EFCore.Sqlite/README.md similarity index 100% rename from src/EFCore.Sqlite/PACKAGE.md rename to src/EFCore.Sqlite/README.md diff --git a/src/EFCore.Tasks/PACKAGE.md b/src/EFCore.Tasks/README.md similarity index 100% rename from src/EFCore.Tasks/PACKAGE.md rename to src/EFCore.Tasks/README.md diff --git a/src/EFCore.Templates/PACKAGE.md b/src/EFCore.Templates/README.md similarity index 100% rename from src/EFCore.Templates/PACKAGE.md rename to src/EFCore.Templates/README.md diff --git a/src/EFCore.Tools/PACKAGE.md b/src/EFCore.Tools/README.md similarity index 100% rename from src/EFCore.Tools/PACKAGE.md rename to src/EFCore.Tools/README.md diff --git a/src/EFCore/PACKAGE.md b/src/EFCore/README.md similarity index 100% rename from src/EFCore/PACKAGE.md rename to src/EFCore/README.md diff --git a/src/Microsoft.Data.Sqlite/PACKAGE.md b/src/Microsoft.Data.Sqlite/README.md similarity index 100% rename from src/Microsoft.Data.Sqlite/PACKAGE.md rename to src/Microsoft.Data.Sqlite/README.md diff --git a/src/dotnet-ef/PACKAGE.md b/src/dotnet-ef/README.md similarity index 100% rename from src/dotnet-ef/PACKAGE.md rename to src/dotnet-ef/README.md diff --git a/test/EFCore.AspNet.Specification.Tests/PACKAGE.md b/test/EFCore.AspNet.Specification.Tests/README.md similarity index 100% rename from test/EFCore.AspNet.Specification.Tests/PACKAGE.md rename to test/EFCore.AspNet.Specification.Tests/README.md diff --git a/test/EFCore.Relational.Specification.Tests/PACKAGE.md b/test/EFCore.Relational.Specification.Tests/README.md similarity index 100% rename from test/EFCore.Relational.Specification.Tests/PACKAGE.md rename to test/EFCore.Relational.Specification.Tests/README.md diff --git a/test/EFCore.Specification.Tests/PACKAGE.md b/test/EFCore.Specification.Tests/README.md similarity index 100% rename from test/EFCore.Specification.Tests/PACKAGE.md rename to test/EFCore.Specification.Tests/README.md From 08c59e3fcb5bdef5a2ca1c504bdc2ba7b37f04b6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 2 Mar 2026 23:19:11 +0000 Subject: [PATCH 06/21] Remove PDB files from main packages, add RemovePdbFromMainPackage target Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- src/EFCore.Tools/EFCore.Tools.csproj | 4 ---- src/dotnet-ef/dotnet-ef.csproj | 10 ++++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj index 8bebea953e3..4d550e5e7bd 100644 --- a/src/EFCore.Tools/EFCore.Tools.csproj +++ b/src/EFCore.Tools/EFCore.Tools.csproj @@ -48,13 +48,9 @@ Update-Database <_PackageFiles Include="tools\**\*" PackagePath="tools\" /> <_PackageFiles Include="$(IntermediateOutputPath)*.psd1" PackagePath="tools\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\any\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\win-x86\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\win-x86\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\win-arm64\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\win-arm64\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.dll" PackagePath="tools\$(TargetFramework)\any\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.pdb" PackagePath="tools\$(TargetFramework)\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.runtimeconfig.json" PackagePath="tools\$(TargetFramework)\any\" /> diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj index 12ffdd14dc0..eb50bce9954 100644 --- a/src/dotnet-ef/dotnet-ef.csproj +++ b/src/dotnet-ef/dotnet-ef.csproj @@ -72,13 +72,15 @@ <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.dll" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.runtimeconfig.json" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\any\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-x86\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-x86\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-arm64\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-arm64\" /> + + + + + + <_PackageFiles Remove="@(_PackageFiles)" Condition="'%(Extension)' == '.pdb'" /> \ No newline at end of file From a1ba6f453303d350e0d00156ee3338962e9073d7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 2 Mar 2026 23:19:57 +0000 Subject: [PATCH 07/21] Rename RemovePdbFromMainPackage target to ExcludePdbFiles for clarity Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- src/dotnet-ef/dotnet-ef.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj index eb50bce9954..17f364c3342 100644 --- a/src/dotnet-ef/dotnet-ef.csproj +++ b/src/dotnet-ef/dotnet-ef.csproj @@ -78,7 +78,7 @@ - + <_PackageFiles Remove="@(_PackageFiles)" Condition="'%(Extension)' == '.pdb'" /> From a30459c50b48af58eb296c593f318e80fdb7fed4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 2 Mar 2026 23:48:19 +0000 Subject: [PATCH 08/21] Keep PDB files in symbols package only: add StripPdbFromMainPackage inline task Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- src/EFCore.Tools/EFCore.Tools.csproj | 36 ++++++++++++++++++++++++++ src/dotnet-ef/dotnet-ef.csproj | 38 +++++++++++++++++++++++++--- 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj index 4d550e5e7bd..5488b5b4a5f 100644 --- a/src/EFCore.Tools/EFCore.Tools.csproj +++ b/src/EFCore.Tools/EFCore.Tools.csproj @@ -48,13 +48,49 @@ Update-Database <_PackageFiles Include="tools\**\*" PackagePath="tools\" /> <_PackageFiles Include="$(IntermediateOutputPath)*.psd1" PackagePath="tools\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\any\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\win-x86\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\win-x86\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\win-arm64\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\win-arm64\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.dll" PackagePath="tools\$(TargetFramework)\any\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.pdb" PackagePath="tools\$(TargetFramework)\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.runtimeconfig.json" PackagePath="tools\$(TargetFramework)\any\" /> + + + + + + + + + e.FullName.EndsWith(".pdb", StringComparison.OrdinalIgnoreCase)) + .ToList(); + foreach (var entry in pdbEntries) + { + entry.Delete(); + } + } +} +]]> + + + + + + + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.dll" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.runtimeconfig.json" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\any\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-x86\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-x86\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-arm64\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-arm64\" /> - - - <_PackageFiles Remove="@(_PackageFiles)" Condition="'%(Extension)' == '.pdb'" /> - + + + + + + + + + e.FullName.EndsWith(".pdb", StringComparison.OrdinalIgnoreCase)) + .ToList(); + foreach (var entry in pdbEntries) + { + entry.Delete(); + } + } +} +]]> + + + + + \ No newline at end of file From 837e44c6d6ee0360b20cb286067d4bd9915ebda0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 2 Mar 2026 23:50:05 +0000 Subject: [PATCH 09/21] Extract StripPdbFromNupkg task to shared eng/StripPdbFromNupkg.targets Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- eng/StripPdbFromNupkg.targets | 35 ++++++++++++++++++++++++++++ src/EFCore.Tools/EFCore.Tools.csproj | 32 +------------------------ src/dotnet-ef/dotnet-ef.csproj | 32 +------------------------ 3 files changed, 37 insertions(+), 62 deletions(-) create mode 100644 eng/StripPdbFromNupkg.targets diff --git a/eng/StripPdbFromNupkg.targets b/eng/StripPdbFromNupkg.targets new file mode 100644 index 00000000000..999b8ec2671 --- /dev/null +++ b/eng/StripPdbFromNupkg.targets @@ -0,0 +1,35 @@ + + + + + + + + + + + e.FullName.EndsWith(".pdb", StringComparison.OrdinalIgnoreCase)) + .ToList(); + foreach (var entry in pdbEntries) + { + entry.Delete(); + } + } +} +]]> + + + + + + + + diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj index 5488b5b4a5f..a91b6f1c82a 100644 --- a/src/EFCore.Tools/EFCore.Tools.csproj +++ b/src/EFCore.Tools/EFCore.Tools.csproj @@ -59,37 +59,7 @@ Update-Database - - - - - - - - - e.FullName.EndsWith(".pdb", StringComparison.OrdinalIgnoreCase)) - .ToList(); - foreach (var entry in pdbEntries) - { - entry.Delete(); - } - } -} -]]> - - - - - - + diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj index da18d468fb2..a1999141b16 100644 --- a/src/dotnet-ef/dotnet-ef.csproj +++ b/src/dotnet-ef/dotnet-ef.csproj @@ -82,35 +82,5 @@ - - - - - - - - - e.FullName.EndsWith(".pdb", StringComparison.OrdinalIgnoreCase)) - .ToList(); - foreach (var entry in pdbEntries) - { - entry.Delete(); - } - } -} -]]> - - - - - - + \ No newline at end of file From 366d4fbadca266d1d9e1809469a5839f97981e98 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Mar 2026 00:39:36 +0000 Subject: [PATCH 10/21] Replace StripPdbFromNupkg with two-pass pack for correct PDB handling Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- eng/CreateSymbolsPackage.targets | 26 +++++++++++++++++++++ eng/StripPdbFromNupkg.targets | 35 ---------------------------- src/EFCore.Tools/EFCore.Tools.csproj | 12 +++++----- src/dotnet-ef/dotnet-ef.csproj | 21 ++++++++++++----- 4 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 eng/CreateSymbolsPackage.targets delete mode 100644 eng/StripPdbFromNupkg.targets diff --git a/eng/CreateSymbolsPackage.targets b/eng/CreateSymbolsPackage.targets new file mode 100644 index 00000000000..b37a40a5223 --- /dev/null +++ b/eng/CreateSymbolsPackage.targets @@ -0,0 +1,26 @@ + + + + + + + <_SymbolsPackTempDir>$(IntermediateOutputPath)symbolspkg\ + + + + + + + + diff --git a/eng/StripPdbFromNupkg.targets b/eng/StripPdbFromNupkg.targets deleted file mode 100644 index 999b8ec2671..00000000000 --- a/eng/StripPdbFromNupkg.targets +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - e.FullName.EndsWith(".pdb", StringComparison.OrdinalIgnoreCase)) - .ToList(); - foreach (var entry in pdbEntries) - { - entry.Delete(); - } - } -} -]]> - - - - - - - - diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj index a91b6f1c82a..8b7f79f8e79 100644 --- a/src/EFCore.Tools/EFCore.Tools.csproj +++ b/src/EFCore.Tools/EFCore.Tools.csproj @@ -11,7 +11,7 @@ true false false - true + false Entity Framework Core Tools for the NuGet Package Manager Console in Visual Studio. Enables these commonly used commands: @@ -48,18 +48,18 @@ Update-Database <_PackageFiles Include="tools\**\*" PackagePath="tools\" /> <_PackageFiles Include="$(IntermediateOutputPath)*.psd1" PackagePath="tools\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\any\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\any\" /> + <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\win-x86\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\win-x86\" /> + <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\win-x86\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\win-arm64\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\win-arm64\" /> + <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\win-arm64\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.dll" PackagePath="tools\$(TargetFramework)\any\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.pdb" PackagePath="tools\$(TargetFramework)\any\" /> + <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.pdb" PackagePath="tools\$(TargetFramework)\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.runtimeconfig.json" PackagePath="tools\$(TargetFramework)\any\" /> - + diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj index a1999141b16..2797c500540 100644 --- a/src/dotnet-ef/dotnet-ef.csproj +++ b/src/dotnet-ef/dotnet-ef.csproj @@ -19,7 +19,7 @@ win-x64;win-x86;win-arm64 Microsoft.EntityFrameworkCore.Tools false - true + false Major $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset true @@ -72,15 +72,24 @@ <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.dll" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.runtimeconfig.json" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> + <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\any\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\any\" /> + <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\any\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-x86\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-x86\" /> + <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-x86\" /> <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-arm64\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-arm64\" /> + <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-arm64\" /> - + + + + <_PackageFiles Remove="@(_PackageFiles)" Condition="'%(Extension)' == '.pdb'" /> + + + + \ No newline at end of file From 52d43d70f5a9327e3c3179902f73d7f98405529e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Mar 2026 01:10:40 +0000 Subject: [PATCH 11/21] Address reviewer feedback: revert Directory.Packages.props, fix paths, simplify PDB handling, add lib/_._ Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- Directory.Packages.props | 1 - eng/CreateSymbolsPackage.targets | 6 ++--- src/EFCore.Tasks/EFCore.Tasks.csproj | 19 ++++++++------ src/EFCore.Tasks/lib/net10.0/_._ | 0 src/EFCore.Tools/EFCore.Tools.csproj | 37 +++++++++++++++++----------- src/dotnet-ef/dotnet-ef.csproj | 23 ++++++++--------- 6 files changed, 49 insertions(+), 37 deletions(-) create mode 100644 src/EFCore.Tasks/lib/net10.0/_._ diff --git a/Directory.Packages.props b/Directory.Packages.props index acadd66e943..df64892142d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -34,7 +34,6 @@ - diff --git a/eng/CreateSymbolsPackage.targets b/eng/CreateSymbolsPackage.targets index b37a40a5223..30e15b943ff 100644 --- a/eng/CreateSymbolsPackage.targets +++ b/eng/CreateSymbolsPackage.targets @@ -4,14 +4,14 @@ Creates a symbols package (.symbols.nupkg) containing PDB files by running a second Pack with _IsSymbolsPack=true. Projects that import this file should: 1. Set IncludeSymbols=false - 2. Conditionally include PDB files in _PackageFiles only when _IsSymbolsPack=true - 3. Optionally strip SDK-added PDB files from _PackageFiles when _IsSymbolsPack!=true + 2. Include PDB files unconditionally in _PackageFiles + 3. Add an ExcludePdbFiles target that strips all .pdb files when _IsSymbolsPack!=true --> - <_SymbolsPackTempDir>$(IntermediateOutputPath)symbolspkg\ + <_SymbolsPackTempDir>$([MSBuild]::NormalizeDirectory('$(IntermediateOutputPath)', 'symbolspkg')) MSBuild tasks for Entity Framework Core projects. Microsoft.EntityFrameworkCore.Tasks Microsoft.EntityFrameworkCore + false false true true - false true $(NoWarn);NU5100;NU5128 true @@ -50,7 +50,9 @@ - + + + @@ -76,12 +78,13 @@ - <_PackageFiles Include="$(OutputPath)$(NetCurrent)\$(AssemblyName).dll" PackagePath="tasks\$(NetCurrent)\" /> - <_PackageFiles Include="$(OutputPath)$(NetCurrent)\$(AssemblyName).pdb" PackagePath="tasks\$(NetCurrent)\" /> - <_PackageFiles Include="$(OutputPath)$(NetCurrent)\$(AssemblyName).deps.json" PackagePath="tasks\$(NetCurrent)\" /> - <_PackageFiles Include="$(OutputPath)$(NetFrameworkToolCurrent)\*" PackagePath="tasks\$(NetFrameworkToolCurrent)\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(NetMinimum)\*" PackagePath="tools\$(NetCurrent)\" /> - <_PackageFiles Include="buildTransitive\*" PackagePath="buildTransitive\" /> + <_PackageFiles Include="lib/**/*" PackagePath="lib/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(NetMinimum)/*" PackagePath="tools/$(NetCurrent)/" /> + <_PackageFiles Include="buildTransitive/*" PackagePath="buildTransitive/" /> + <_PackageFiles Include="$(OutputPath)$(NetCurrent)/$(AssemblyName).dll" PackagePath="tasks/$(NetCurrent)/" /> + <_PackageFiles Include="$(OutputPath)$(NetCurrent)/$(AssemblyName).pdb" PackagePath="tasks/$(NetCurrent)/" /> + <_PackageFiles Include="$(OutputPath)$(NetCurrent)/$(AssemblyName).deps.json" PackagePath="tasks/$(NetCurrent)/" /> + <_PackageFiles Include="$(OutputPath)$(NetFrameworkToolCurrent)/*" PackagePath="tasks/$(NetFrameworkToolCurrent)/" /> diff --git a/src/EFCore.Tasks/lib/net10.0/_._ b/src/EFCore.Tasks/lib/net10.0/_._ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj index 8b7f79f8e79..825ff0cc55e 100644 --- a/src/EFCore.Tools/EFCore.Tools.csproj +++ b/src/EFCore.Tools/EFCore.Tools.csproj @@ -6,11 +6,11 @@ $(NetMinimum) Microsoft.EntityFrameworkCore.Tools true - false true true false false + false Entity Framework Core Tools for the NuGet Package Manager Console in Visual Studio. @@ -35,7 +35,7 @@ Update-Database - + @@ -44,18 +44,27 @@ Update-Database - <_PackageFiles Include="lib\**\*" PackagePath="lib\" /> - <_PackageFiles Include="tools\**\*" PackagePath="tools\" /> - <_PackageFiles Include="$(IntermediateOutputPath)*.psd1" PackagePath="tools\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\any\" /> - <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\any\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\win-x86\" /> - <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\win-x86\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.exe" PackagePath="tools\net472\win-arm64\" /> - <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.pdb" PackagePath="tools\net472\win-arm64\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.dll" PackagePath="tools\$(TargetFramework)\any\" /> - <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.pdb" PackagePath="tools\$(TargetFramework)\any\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.runtimeconfig.json" PackagePath="tools\$(TargetFramework)\any\" /> + <_PackageFiles Include="lib/**/*" PackagePath="lib/" /> + <_PackageFiles Include="tools/**/*" PackagePath="tools/" /> + <_PackageFiles Include="$(IntermediateOutputPath)*.psd1" PackagePath="tools/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/net472/ef.exe" PackagePath="tools/net472/any/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/net472/ef.pdb" PackagePath="tools/net472/any/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/x86/$(Configuration)/net472/ef.exe" PackagePath="tools/net472/win-x86/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/x86/$(Configuration)/net472/ef.pdb" PackagePath="tools/net472/win-x86/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/ARM64/$(Configuration)/net472/ef.exe" PackagePath="tools/net472/win-arm64/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/ARM64/$(Configuration)/net472/ef.pdb" PackagePath="tools/net472/win-arm64/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.dll" PackagePath="tools/$(TargetFramework)/any/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.pdb" PackagePath="tools/$(TargetFramework)/any/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.runtimeconfig.json" PackagePath="tools/$(TargetFramework)/any/" /> + + + + + + + <_PackageFiles Remove="@(_PackageFiles)" Condition="'%(Extension)' == '.pdb'" /> diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj index 2797c500540..a6397bf4e42 100644 --- a/src/dotnet-ef/dotnet-ef.csproj +++ b/src/dotnet-ef/dotnet-ef.csproj @@ -19,6 +19,7 @@ win-x64;win-x86;win-arm64 Microsoft.EntityFrameworkCore.Tools false + false Major $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset @@ -70,20 +71,20 @@ - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.dll" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.runtimeconfig.json" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> - <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\$(Configuration)\$(TargetFramework)\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\$(TargetFramework)\any\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\any\" /> - <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\any\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-x86\" /> - <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\x86\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-x86\" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.exe" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-arm64\" /> - <_PackageFiles Condition="'$(_IsSymbolsPack)' == 'true'" Include="$(ArtifactsBinDir)ef\ARM64\$(Configuration)\net472\ef.pdb" PackagePath="tools\$(TargetFramework)\any\tools\net472\win-arm64\" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.dll" PackagePath="tools/$(TargetFramework)/any/tools/$(TargetFramework)/any/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.runtimeconfig.json" PackagePath="tools/$(TargetFramework)/any/tools/$(TargetFramework)/any/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.pdb" PackagePath="tools/$(TargetFramework)/any/tools/$(TargetFramework)/any/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/net472/ef.exe" PackagePath="tools/$(TargetFramework)/any/tools/net472/any/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/net472/ef.pdb" PackagePath="tools/$(TargetFramework)/any/tools/net472/any/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/x86/$(Configuration)/net472/ef.exe" PackagePath="tools/$(TargetFramework)/any/tools/net472/win-x86/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/x86/$(Configuration)/net472/ef.pdb" PackagePath="tools/$(TargetFramework)/any/tools/net472/win-x86/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/ARM64/$(Configuration)/net472/ef.exe" PackagePath="tools/$(TargetFramework)/any/tools/net472/win-arm64/" /> + <_PackageFiles Include="$(ArtifactsBinDir)ef/ARM64/$(Configuration)/net472/ef.pdb" PackagePath="tools/$(TargetFramework)/any/tools/net472/win-arm64/" /> - - + From b89d49d8404d34ea94ef3e66332e5dbc011f0854 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Mar 2026 01:22:32 +0000 Subject: [PATCH 12/21] Add ExcludePdbFiles/CreateSymbolsPackage to EFCore.Tasks, fix Design version to 10.0.0, remove explicit PackageReadmeFile from Analyzers Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- eng/CreateSymbolsPackage.targets | 2 +- src/EFCore.Analyzers/EFCore.Analyzers.csproj | 1 - src/EFCore.Tasks/EFCore.Tasks.csproj | 15 +++++++++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/eng/CreateSymbolsPackage.targets b/eng/CreateSymbolsPackage.targets index 30e15b943ff..e19e0a70259 100644 --- a/eng/CreateSymbolsPackage.targets +++ b/eng/CreateSymbolsPackage.targets @@ -16,7 +16,7 @@ + Properties="_IsSymbolsPack=true;PackageOutputPath=$(_SymbolsPackTempDir)" /> diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.csproj b/src/EFCore.Analyzers/EFCore.Analyzers.csproj index 6bf55e95753..8022f3ad6ff 100644 --- a/src/EFCore.Analyzers/EFCore.Analyzers.csproj +++ b/src/EFCore.Analyzers/EFCore.Analyzers.csproj @@ -16,7 +16,6 @@ $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset true true - README.md $(NoWarn);NU5128 $(NoWarn);RS1038 diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index 90c0a59571f..5e378aa2631 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -5,7 +5,7 @@ MSBuild tasks for Entity Framework Core projects. Microsoft.EntityFrameworkCore.Tasks Microsoft.EntityFrameworkCore - + false false true @@ -52,7 +52,7 @@ - + @@ -88,6 +88,17 @@ + + + + <_PackageFiles Remove="@(_PackageFiles)" Condition="'%(Extension)' == '.pdb'" /> + + + + + From da71ac5380473fae354591edc4942f915210728c Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 3 Mar 2026 08:55:26 +0100 Subject: [PATCH 13/21] Use documented pack extension points --- eng/CreateSymbolsPackage.targets | 26 ---------------- src/EFCore.Tasks/EFCore.Tasks.csproj | 30 ++++++------------ src/EFCore.Tools/EFCore.Tools.csproj | 46 ++++++++++------------------ src/dotnet-ef/dotnet-ef.csproj | 30 +++++------------- 4 files changed, 35 insertions(+), 97 deletions(-) delete mode 100644 eng/CreateSymbolsPackage.targets diff --git a/eng/CreateSymbolsPackage.targets b/eng/CreateSymbolsPackage.targets deleted file mode 100644 index e19e0a70259..00000000000 --- a/eng/CreateSymbolsPackage.targets +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - <_SymbolsPackTempDir>$([MSBuild]::NormalizeDirectory('$(IntermediateOutputPath)', 'symbolspkg')) - - - - - - - - diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index 5e378aa2631..3a7c02affd9 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -5,7 +5,6 @@ MSBuild tasks for Entity Framework Core projects. Microsoft.EntityFrameworkCore.Tasks Microsoft.EntityFrameworkCore - false false true @@ -14,6 +13,7 @@ $(NoWarn);NU5100;NU5128 true $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset + $(TargetsForTfmSpecificContentInPackage);AddPackContent @@ -76,29 +76,19 @@ true - - - <_PackageFiles Include="lib/**/*" PackagePath="lib/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(NetMinimum)/*" PackagePath="tools/$(NetCurrent)/" /> - <_PackageFiles Include="buildTransitive/*" PackagePath="buildTransitive/" /> - <_PackageFiles Include="$(OutputPath)$(NetCurrent)/$(AssemblyName).dll" PackagePath="tasks/$(NetCurrent)/" /> - <_PackageFiles Include="$(OutputPath)$(NetCurrent)/$(AssemblyName).pdb" PackagePath="tasks/$(NetCurrent)/" /> - <_PackageFiles Include="$(OutputPath)$(NetCurrent)/$(AssemblyName).deps.json" PackagePath="tasks/$(NetCurrent)/" /> - <_PackageFiles Include="$(OutputPath)$(NetFrameworkToolCurrent)/*" PackagePath="tasks/$(NetFrameworkToolCurrent)/" /> + + + + + + + - - - - - - <_PackageFiles Remove="@(_PackageFiles)" Condition="'%(Extension)' == '.pdb'" /> + + - - diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj index 825ff0cc55e..bd5bd535f95 100644 --- a/src/EFCore.Tools/EFCore.Tools.csproj +++ b/src/EFCore.Tools/EFCore.Tools.csproj @@ -10,7 +10,6 @@ true false false - false Entity Framework Core Tools for the NuGet Package Manager Console in Visual Studio. @@ -25,8 +24,8 @@ Remove-Migration Scaffold-DbContext Script-Migration Update-Database - - False + + $(TargetsForTfmSpecificContentInPackage);GenerateContent;AddPackContent @@ -42,41 +41,30 @@ Update-Database - + - <_PackageFiles Include="lib/**/*" PackagePath="lib/" /> - <_PackageFiles Include="tools/**/*" PackagePath="tools/" /> - <_PackageFiles Include="$(IntermediateOutputPath)*.psd1" PackagePath="tools/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/net472/ef.exe" PackagePath="tools/net472/any/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/net472/ef.pdb" PackagePath="tools/net472/any/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/x86/$(Configuration)/net472/ef.exe" PackagePath="tools/net472/win-x86/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/x86/$(Configuration)/net472/ef.pdb" PackagePath="tools/net472/win-x86/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/ARM64/$(Configuration)/net472/ef.exe" PackagePath="tools/net472/win-arm64/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/ARM64/$(Configuration)/net472/ef.pdb" PackagePath="tools/net472/win-arm64/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.dll" PackagePath="tools/$(TargetFramework)/any/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.pdb" PackagePath="tools/$(TargetFramework)/any/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.runtimeconfig.json" PackagePath="tools/$(TargetFramework)/any/" /> + + + + + + + - - - - <_PackageFiles Remove="@(_PackageFiles)" Condition="'%(Extension)' == '.pdb'" /> - - - - - - + + + + + + + diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj index a6397bf4e42..8faaf0c98a0 100644 --- a/src/dotnet-ef/dotnet-ef.csproj +++ b/src/dotnet-ef/dotnet-ef.csproj @@ -1,6 +1,7 @@  + $(NetMinimum) Entity Framework Core Tools for the .NET Command-Line Interface. @@ -13,17 +14,16 @@ dotnet ef database drop dotnet ef database update - $(NetMinimum) Exe true win-x64;win-x86;win-arm64 Microsoft.EntityFrameworkCore.Tools false - false Major $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset true + $(TargetsForTfmSpecificContentInPackage);AddEfProjectOutput @@ -69,28 +69,14 @@ - - - <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.dll" PackagePath="tools/$(TargetFramework)/any/tools/$(TargetFramework)/any/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.runtimeconfig.json" PackagePath="tools/$(TargetFramework)/any/tools/$(TargetFramework)/any/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.pdb" PackagePath="tools/$(TargetFramework)/any/tools/$(TargetFramework)/any/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/net472/ef.exe" PackagePath="tools/$(TargetFramework)/any/tools/net472/any/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/net472/ef.pdb" PackagePath="tools/$(TargetFramework)/any/tools/net472/any/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/x86/$(Configuration)/net472/ef.exe" PackagePath="tools/$(TargetFramework)/any/tools/net472/win-x86/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/x86/$(Configuration)/net472/ef.pdb" PackagePath="tools/$(TargetFramework)/any/tools/net472/win-x86/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/ARM64/$(Configuration)/net472/ef.exe" PackagePath="tools/$(TargetFramework)/any/tools/net472/win-arm64/" /> - <_PackageFiles Include="$(ArtifactsBinDir)ef/ARM64/$(Configuration)/net472/ef.pdb" PackagePath="tools/$(TargetFramework)/any/tools/net472/win-arm64/" /> - - - - - + - <_PackageFiles Remove="@(_PackageFiles)" Condition="'%(Extension)' == '.pdb'" /> + + + + + - \ No newline at end of file From 13cd22523b406c77ff3bc9bfdef040931d39bde6 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 3 Mar 2026 09:52:46 +0100 Subject: [PATCH 14/21] Simplify EFCore.Tools --- global.json | 3 +- src/EFCore.Tools/EFCore.Tools.csproj | 43 ++++++++++------------------ 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/global.json b/global.json index 236c4a4357e..c9231219596 100644 --- a/global.json +++ b/global.json @@ -19,6 +19,7 @@ }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26151.104", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26151.104" + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26151.104", + "Microsoft.Build.NoTargets": "3.7.0" } } diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj index bd5bd535f95..540eac34393 100644 --- a/src/EFCore.Tools/EFCore.Tools.csproj +++ b/src/EFCore.Tools/EFCore.Tools.csproj @@ -1,16 +1,10 @@ - - - + $(NetMinimum) Microsoft.EntityFrameworkCore.Tools - true - true true - false - false - false + $(NoWarn);NU5128 Entity Framework Core Tools for the NuGet Package Manager Console in Visual Studio. Enables these commonly used commands: @@ -29,11 +23,11 @@ Update-Database - + - + @@ -41,10 +35,20 @@ Update-Database - + + + + + + @@ -53,21 +57,4 @@ Update-Database - - - - - - - - - - - - - - - From 236ac438c6396339ffae05e72f6bccd696785d86 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 3 Mar 2026 10:27:32 +0100 Subject: [PATCH 15/21] Fix symbols for EFCore.Tools --- src/EFCore.Tools/EFCore.Tools.csproj | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj index 540eac34393..75450142eca 100644 --- a/src/EFCore.Tools/EFCore.Tools.csproj +++ b/src/EFCore.Tools/EFCore.Tools.csproj @@ -19,7 +19,10 @@ Scaffold-DbContext Script-Migration Update-Database - $(TargetsForTfmSpecificContentInPackage);GenerateContent;AddPackContent + $(TargetsForTfmSpecificContentInPackage);AddPackContent + + true + false @@ -49,11 +52,21 @@ Update-Database - - - - - + + + + + + + + + + + + From fc86041654e8fc2483be34046d17e795b605a1a1 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 3 Mar 2026 10:48:25 +0100 Subject: [PATCH 16/21] dotnet-ef.csproj --- src/dotnet-ef/dotnet-ef.csproj | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj index 8faaf0c98a0..1eadf0c643d 100644 --- a/src/dotnet-ef/dotnet-ef.csproj +++ b/src/dotnet-ef/dotnet-ef.csproj @@ -18,8 +18,6 @@ true win-x64;win-x86;win-arm64 Microsoft.EntityFrameworkCore.Tools - false - false Major $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset true @@ -71,11 +69,12 @@ - - - - - + + + + + + From c629829fb438a8197512edb1e5561083e29b9648 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 3 Mar 2026 11:16:03 +0100 Subject: [PATCH 17/21] EFCore.Tasks --- src/EFCore.Tasks/EFCore.Tasks.csproj | 43 +++++++++++++++++----------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index 3a7c02affd9..805cd3eaa6c 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -5,15 +5,18 @@ MSBuild tasks for Entity Framework Core projects. Microsoft.EntityFrameworkCore.Tasks Microsoft.EntityFrameworkCore - false - false true - true true $(NoWarn);NU5100;NU5128 true $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset $(TargetsForTfmSpecificContentInPackage);AddPackContent + true + tasks + + + + true @@ -33,6 +36,13 @@ + + + + + True @@ -68,24 +78,23 @@ - - true - - - - true - - - - - - - + + + - + + + + + + + From 4727cb0c937ae432d2e67555a655eb71442f7d7a Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 3 Mar 2026 11:19:09 +0100 Subject: [PATCH 18/21] Add comment --- src/dotnet-ef/dotnet-ef.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/dotnet-ef/dotnet-ef.csproj b/src/dotnet-ef/dotnet-ef.csproj index 1eadf0c643d..9e103d02378 100644 --- a/src/dotnet-ef/dotnet-ef.csproj +++ b/src/dotnet-ef/dotnet-ef.csproj @@ -67,6 +67,8 @@ + From ead25ac84f954875405445e8df3459a47fdc6a2d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 3 Mar 2026 11:36:42 +0100 Subject: [PATCH 19/21] Remove temp change --- src/EFCore.Tasks/EFCore.Tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index 805cd3eaa6c..c025ba82658 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -15,7 +15,7 @@ tasks - + true From 824aca14e11372d6ca36305458bda96cdf7d7cc0 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 3 Mar 2026 11:38:15 +0100 Subject: [PATCH 20/21] Remove prop --- src/EFCore.Tasks/EFCore.Tasks.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index c025ba82658..c1fa2f6a92b 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -11,7 +11,6 @@ true $(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset $(TargetsForTfmSpecificContentInPackage);AddPackContent - true tasks From 13b350d296461d456ef4979016f6184d8abdc9d5 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 3 Mar 2026 12:44:44 +0100 Subject: [PATCH 21/21] Use live dependency on EFCore.Design --- src/EFCore.Tasks/EFCore.Tasks.csproj | 7 +------ src/EFCore.Tools/EFCore.Tools.csproj | 4 +++- src/stubs/EFCore.Design.csproj | 22 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 src/stubs/EFCore.Design.csproj diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index c1fa2f6a92b..2f8ab7f674d 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -56,12 +56,7 @@ - - - - - - + diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj index 75450142eca..9d4949fc81f 100644 --- a/src/EFCore.Tools/EFCore.Tools.csproj +++ b/src/EFCore.Tools/EFCore.Tools.csproj @@ -27,11 +27,13 @@ Update-Database + + - diff --git a/src/stubs/EFCore.Design.csproj b/src/stubs/EFCore.Design.csproj new file mode 100644 index 00000000000..0d45e0f0ee8 --- /dev/null +++ b/src/stubs/EFCore.Design.csproj @@ -0,0 +1,22 @@ + + + + + + $(MSBuildProjectName)$([System.IO.Path]::DirectorySeparatorChar)stub + + + + + + net10.0 + Microsoft.EntityFrameworkCore.Design + true + $(NoWarn);NU5128 + false + + + + + \ No newline at end of file