From 0d3fa35fc47168cfdc3b284798490a9cf6813d4f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 15 Apr 2026 17:54:54 +0000
Subject: [PATCH 1/8] Add upper bounds on inter-project NuGet package
 references to require same major version

Agent-Logs-Url: https://github.com/dotnet/efcore/sessions/ff2d320a-c5bc-4702-9474-118456fa3f9e

Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
---
 Directory.Build.targets | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 3020ae882fe..523c2439f0d 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -36,4 +36,23 @@
       </AssemblyAttribute>
     </ItemGroup>
   </Target>
+
+  <!--
+    Add upper bounds to NuGet package dependencies generated from ProjectReference items.
+    This ensures packages built from this repo require their sibling dependencies to be
+    within the same major version. For example, version 11.0.1 will depend on [11.0.1, 12.0.0).
+  -->
+  <Target Name="_AddUpperBoundToProjectReferences"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec"
+          Condition="'$(IsPackable)' == 'true' AND '@(_ProjectReferencesWithVersions)' != ''">
+    <PropertyGroup>
+      <_EFCoreNextMajorVersion>$([MSBuild]::Add($([System.Version]::Parse('$(VersionPrefix)').Major), 1))</_EFCoreNextMajorVersion>
+    </PropertyGroup>
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(_EFCoreNextMajorVersion).0.0)</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file

From f3cb6e89b70317c8dfd69b60c6125b085d6a9b6d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 15 Apr 2026 18:15:38 +0000
Subject: [PATCH 2/8] Replace central target with per-project targets and
 hardcoded EFCorePackageDependencyUpperBound property

Agent-Logs-Url: https://github.com/dotnet/efcore/sessions/13466f2d-2d65-4c9c-b3d0-747244ca9f81

Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
---
 Directory.Build.targets                       | 19 +------------------
 eng/Versions.props                            |  7 +++++++
 src/EFCore.Cosmos/EFCore.Cosmos.csproj        | 10 ++++++++++
 src/EFCore.Design/EFCore.Design.csproj        | 10 ++++++++++
 src/EFCore.InMemory/EFCore.InMemory.csproj    | 10 ++++++++++
 src/EFCore.Proxies/EFCore.Proxies.csproj      | 10 ++++++++++
 .../EFCore.Relational.csproj                  | 10 ++++++++++
 .../EFCore.SqlServer.HierarchyId.csproj       | 10 ++++++++++
 .../EFCore.SqlServer.NTS.csproj               | 10 ++++++++++
 src/EFCore.SqlServer/EFCore.SqlServer.csproj  | 10 ++++++++++
 .../EFCore.Sqlite.Core.csproj                 | 10 ++++++++++
 .../EFCore.Sqlite.NTS.csproj                  | 10 ++++++++++
 src/EFCore.Sqlite/EFCore.Sqlite.csproj        | 10 ++++++++++
 src/EFCore/EFCore.csproj                      | 10 ++++++++++
 .../Microsoft.Data.Sqlite.csproj              | 10 ++++++++++
 15 files changed, 138 insertions(+), 18 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 523c2439f0d..76af4433dc9 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -37,22 +37,5 @@
     </ItemGroup>
   </Target>
 
-  <!--
-    Add upper bounds to NuGet package dependencies generated from ProjectReference items.
-    This ensures packages built from this repo require their sibling dependencies to be
-    within the same major version. For example, version 11.0.1 will depend on [11.0.1, 12.0.0).
-  -->
-  <Target Name="_AddUpperBoundToProjectReferences"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec"
-          Condition="'$(IsPackable)' == 'true' AND '@(_ProjectReferencesWithVersions)' != ''">
-    <PropertyGroup>
-      <_EFCoreNextMajorVersion>$([MSBuild]::Add($([System.Version]::Parse('$(VersionPrefix)').Major), 1))</_EFCoreNextMajorVersion>
-    </PropertyGroup>
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(_EFCoreNextMajorVersion).0.0)</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
+
 </Project>
\ No newline at end of file
diff --git a/eng/Versions.props b/eng/Versions.props
index 1fb510f2014..541eaaadc62 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -15,6 +15,13 @@
     <UsingToolXliff>false</UsingToolXliff>
 
     <ShouldUseLiveRoslyn Condition="'$(PreReleaseVersionLabel)' == 'servicing' And !$(VersionPrefix.EndsWith('.0')) And !$(VersionPrefix.EndsWith('.1'))">true</ShouldUseLiveRoslyn>
+
+    <!--
+      Upper bound for NuGet dependency version ranges on packages built from this repo.
+      Using 12.0.0-0 as the upper bound ensures pre-release versions of the next major
+      (like 12.0.0-preview1) are not accepted, since 12.0.0-preview1 > 12.0.0-0 in SemVer.
+    -->
+    <EFCorePackageDependencyUpperBound>12.0.0-0</EFCorePackageDependencyUpperBound>
   </PropertyGroup>
 
   <PropertyGroup Label="MSBuild and Roslyn" Condition="'$(ShouldUseLiveRoslyn)' != 'true'">
diff --git a/src/EFCore.Cosmos/EFCore.Cosmos.csproj b/src/EFCore.Cosmos/EFCore.Cosmos.csproj
index 6ed6c586518..5c4b4e26a7d 100644
--- a/src/EFCore.Cosmos/EFCore.Cosmos.csproj
+++ b/src/EFCore.Cosmos/EFCore.Cosmos.csproj
@@ -72,4 +72,14 @@
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
 
+  <Target Name="_SetProjectReferenceDependencyVersionRange"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/EFCore.Design/EFCore.Design.csproj b/src/EFCore.Design/EFCore.Design.csproj
index 981497651ac..3e93622d7ae 100644
--- a/src/EFCore.Design/EFCore.Design.csproj
+++ b/src/EFCore.Design/EFCore.Design.csproj
@@ -102,4 +102,14 @@
     </Compile>
   </ItemGroup>
 
+  <Target Name="_SetProjectReferenceDependencyVersionRange"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/EFCore.InMemory/EFCore.InMemory.csproj b/src/EFCore.InMemory/EFCore.InMemory.csproj
index 17c05bf18d1..6f15bb41b2c 100644
--- a/src/EFCore.InMemory/EFCore.InMemory.csproj
+++ b/src/EFCore.InMemory/EFCore.InMemory.csproj
@@ -64,4 +64,14 @@
     </Compile>
   </ItemGroup>
 
+  <Target Name="_SetProjectReferenceDependencyVersionRange"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/EFCore.Proxies/EFCore.Proxies.csproj b/src/EFCore.Proxies/EFCore.Proxies.csproj
index 2e52b366daf..3bdb52987f2 100644
--- a/src/EFCore.Proxies/EFCore.Proxies.csproj
+++ b/src/EFCore.Proxies/EFCore.Proxies.csproj
@@ -67,4 +67,14 @@
     </Compile>
   </ItemGroup>
 
+  <Target Name="_SetProjectReferenceDependencyVersionRange"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/EFCore.Relational/EFCore.Relational.csproj b/src/EFCore.Relational/EFCore.Relational.csproj
index 2f0010093e7..eb852a5eb4a 100644
--- a/src/EFCore.Relational/EFCore.Relational.csproj
+++ b/src/EFCore.Relational/EFCore.Relational.csproj
@@ -73,4 +73,14 @@
     </Compile>
   </ItemGroup>
 
+  <Target Name="_SetProjectReferenceDependencyVersionRange"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj b/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
index 24fc80cb15c..fe414a8c02c 100644
--- a/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
+++ b/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
@@ -67,4 +67,14 @@
     </Compile>
   </ItemGroup>
 
+  <Target Name="_SetProjectReferenceDependencyVersionRange"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj b/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj
index 9a775d6e018..698d48ae7a3 100644
--- a/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj
+++ b/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj
@@ -79,4 +79,14 @@
     </Compile>
   </ItemGroup>
 
+  <Target Name="_SetProjectReferenceDependencyVersionRange"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/EFCore.SqlServer/EFCore.SqlServer.csproj b/src/EFCore.SqlServer/EFCore.SqlServer.csproj
index 44d112afc9e..2df1a3a76ed 100644
--- a/src/EFCore.SqlServer/EFCore.SqlServer.csproj
+++ b/src/EFCore.SqlServer/EFCore.SqlServer.csproj
@@ -73,4 +73,14 @@
     </Compile>
   </ItemGroup>
 
+  <Target Name="_SetProjectReferenceDependencyVersionRange"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj
index b916b92851a..b5d8d8af0e9 100644
--- a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj
+++ b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj
@@ -74,4 +74,14 @@
     </Compile>
   </ItemGroup>
 
+  <Target Name="_SetProjectReferenceDependencyVersionRange"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj b/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj
index c15872f5600..d511ff0408a 100644
--- a/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj
+++ b/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj
@@ -81,4 +81,14 @@
     </Compile>
   </ItemGroup>
 
+  <Target Name="_SetProjectReferenceDependencyVersionRange"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/EFCore.Sqlite/EFCore.Sqlite.csproj b/src/EFCore.Sqlite/EFCore.Sqlite.csproj
index 5e7afc5b865..8658711778a 100644
--- a/src/EFCore.Sqlite/EFCore.Sqlite.csproj
+++ b/src/EFCore.Sqlite/EFCore.Sqlite.csproj
@@ -62,4 +62,14 @@
   <Target Name="Compile" />
   <Target Name="CopyFilesToOutputDirectory" />
 
+  <Target Name="_SetProjectReferenceDependencyVersionRange"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/EFCore/EFCore.csproj b/src/EFCore/EFCore.csproj
index 359324146f2..8eada2251bf 100644
--- a/src/EFCore/EFCore.csproj
+++ b/src/EFCore/EFCore.csproj
@@ -129,4 +129,14 @@ Microsoft.EntityFrameworkCore.DbSet
     </Compile>
   </ItemGroup>
 
+  <Target Name="_SetProjectReferenceDependencyVersionRange"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj
index 90b848797e7..e1b475c649b 100644
--- a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj
+++ b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj
@@ -43,4 +43,14 @@ Microsoft.Data.Sqlite.SqliteTransaction</Description>
   <Target Name="Compile" />
   <Target Name="CopyFilesToOutputDirectory" />
 
+  <Target Name="_SetProjectReferenceDependencyVersionRange"
+          AfterTargets="_GetProjectReferenceVersions"
+          BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
+        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>

From 7f1b7efc3b8d6a59739d3ca4ac686236300d6cfc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 15 Apr 2026 18:16:35 +0000
Subject: [PATCH 3/8] Fix trailing blank line in Directory.Build.targets

Agent-Logs-Url: https://github.com/dotnet/efcore/sessions/13466f2d-2d65-4c9c-b3d0-747244ca9f81

Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
---
 Directory.Build.targets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 76af4433dc9..7cb11b37000 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -37,5 +37,4 @@
     </ItemGroup>
   </Target>
 
-
 </Project>
\ No newline at end of file

From 791fd338a43c98049c74a9afa5d40bbbe61dfcd3 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 15 Apr 2026 19:04:06 +0000
Subject: [PATCH 4/8] Calculate EFCorePackageDependencyUpperBound from
 VersionPrefix in eng/Versions.props

Agent-Logs-Url: https://github.com/dotnet/efcore/sessions/f4e8a257-37b6-4ed4-b4b9-7948be16d57e

Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
---
 eng/Versions.props | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 541eaaadc62..c56d3d8f1a4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -18,10 +18,12 @@
 
     <!--
       Upper bound for NuGet dependency version ranges on packages built from this repo.
-      Using 12.0.0-0 as the upper bound ensures pre-release versions of the next major
-      (like 12.0.0-preview1) are not accepted, since 12.0.0-preview1 > 12.0.0-0 in SemVer.
+      Calculated as (major+1).0.0-0, where the -0 pre-release suffix ensures that pre-release
+      versions of the next major (like 12.0.0-preview1) are excluded, since in NuGet SemVer 2.0
+      ordering 12.0.0-preview1 > 12.0.0-0.
     -->
-    <EFCorePackageDependencyUpperBound>12.0.0-0</EFCorePackageDependencyUpperBound>
+    <EFCoreNextMajorVersion>$([MSBuild]::Add($([System.Version]::Parse('$(VersionPrefix)').Major), 1))</EFCoreNextMajorVersion>
+    <EFCorePackageDependencyUpperBound>$(EFCoreNextMajorVersion).0.0-0</EFCorePackageDependencyUpperBound>
   </PropertyGroup>
 
   <PropertyGroup Label="MSBuild and Roslyn" Condition="'$(ShouldUseLiveRoslyn)' != 'true'">

From aee32ffb9dcae73297ed75195e79f0301f12abcb Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 15 Apr 2026 19:51:04 +0000
Subject: [PATCH 5/8] Refactor NuGet version bounding: use PackageVersion on
 ProjectReferences and central UseExplicitPackageVersions target

Agent-Logs-Url: https://github.com/dotnet/efcore/sessions/16f92744-3ba6-41e4-a2ff-d21d9b3ed385

Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
---
 Directory.Build.targets                          | 11 +++++++++++
 eng/Versions.props                               |  3 +--
 src/EFCore.Cosmos/EFCore.Cosmos.csproj           | 14 ++------------
 src/EFCore.Design/EFCore.Design.csproj           | 12 +-----------
 src/EFCore.InMemory/EFCore.InMemory.csproj       | 14 ++------------
 src/EFCore.Proxies/EFCore.Proxies.csproj         | 14 ++------------
 src/EFCore.Relational/EFCore.Relational.csproj   | 14 ++------------
 .../EFCore.SqlServer.HierarchyId.csproj          | 16 +++-------------
 .../EFCore.SqlServer.NTS.csproj                  | 14 ++------------
 src/EFCore.SqlServer/EFCore.SqlServer.csproj     | 14 ++------------
 src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj | 16 +++-------------
 src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj   | 14 ++------------
 src/EFCore.Sqlite/EFCore.Sqlite.csproj           | 14 ++------------
 src/EFCore/EFCore.csproj                         | 14 ++------------
 .../Microsoft.Data.Sqlite.csproj                 | 12 +-----------
 15 files changed, 38 insertions(+), 158 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 7cb11b37000..2c5094ecbe2 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -37,4 +37,15 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferencesWithVersions Condition="'%(FullPath)' != ''">
+        <PackageVersion>@(ProjectReference->'%(PackageVersion)')</PackageVersion>
+      </_ProjectReferencesWithVersions>
+      <_ProjectReferencesWithVersions Condition="'%(Identity)' != '' And '%(PackageVersion)' != ''">
+        <ProjectVersion>%(PackageVersion)</ProjectVersion>
+      </_ProjectReferencesWithVersions>
+    </ItemGroup>
+  </Target>
+
 </Project>
\ No newline at end of file
diff --git a/eng/Versions.props b/eng/Versions.props
index c56d3d8f1a4..61329614c83 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -22,8 +22,7 @@
       versions of the next major (like 12.0.0-preview1) are excluded, since in NuGet SemVer 2.0
       ordering 12.0.0-preview1 > 12.0.0-0.
     -->
-    <EFCoreNextMajorVersion>$([MSBuild]::Add($([System.Version]::Parse('$(VersionPrefix)').Major), 1))</EFCoreNextMajorVersion>
-    <EFCorePackageDependencyUpperBound>$(EFCoreNextMajorVersion).0.0-0</EFCorePackageDependencyUpperBound>
+    <NextMajorVersion>$([MSBuild]::Add($([System.Version]::Parse('$(VersionPrefix)').Major), 1)).0.0-0</NextMajorVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="MSBuild and Roslyn" Condition="'$(ShouldUseLiveRoslyn)' != 'true'">
diff --git a/src/EFCore.Cosmos/EFCore.Cosmos.csproj b/src/EFCore.Cosmos/EFCore.Cosmos.csproj
index 5c4b4e26a7d..8daa912a407 100644
--- a/src/EFCore.Cosmos/EFCore.Cosmos.csproj
+++ b/src/EFCore.Cosmos/EFCore.Cosmos.csproj
@@ -42,8 +42,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore\EFCore.csproj" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\EFCore\EFCore.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -72,14 +72,4 @@
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
 
-  <Target Name="_SetProjectReferenceDependencyVersionRange"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/EFCore.Design/EFCore.Design.csproj b/src/EFCore.Design/EFCore.Design.csproj
index 3e93622d7ae..4df1df440e2 100644
--- a/src/EFCore.Design/EFCore.Design.csproj
+++ b/src/EFCore.Design/EFCore.Design.csproj
@@ -52,7 +52,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" />
+    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -102,14 +102,4 @@
     </Compile>
   </ItemGroup>
 
-  <Target Name="_SetProjectReferenceDependencyVersionRange"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/EFCore.InMemory/EFCore.InMemory.csproj b/src/EFCore.InMemory/EFCore.InMemory.csproj
index 6f15bb41b2c..e1bb0fa9d6f 100644
--- a/src/EFCore.InMemory/EFCore.InMemory.csproj
+++ b/src/EFCore.InMemory/EFCore.InMemory.csproj
@@ -40,8 +40,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore\EFCore.csproj" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\EFCore\EFCore.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -64,14 +64,4 @@
     </Compile>
   </ItemGroup>
 
-  <Target Name="_SetProjectReferenceDependencyVersionRange"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/EFCore.Proxies/EFCore.Proxies.csproj b/src/EFCore.Proxies/EFCore.Proxies.csproj
index 3bdb52987f2..f0b34a37c8d 100644
--- a/src/EFCore.Proxies/EFCore.Proxies.csproj
+++ b/src/EFCore.Proxies/EFCore.Proxies.csproj
@@ -43,8 +43,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore\EFCore.csproj" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\EFCore\EFCore.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -67,14 +67,4 @@
     </Compile>
   </ItemGroup>
 
-  <Target Name="_SetProjectReferenceDependencyVersionRange"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/EFCore.Relational/EFCore.Relational.csproj b/src/EFCore.Relational/EFCore.Relational.csproj
index eb852a5eb4a..86a51d9dd47 100644
--- a/src/EFCore.Relational/EFCore.Relational.csproj
+++ b/src/EFCore.Relational/EFCore.Relational.csproj
@@ -45,8 +45,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore\EFCore.csproj" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\EFCore\EFCore.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -73,14 +73,4 @@
     </Compile>
   </ItemGroup>
 
-  <Target Name="_SetProjectReferenceDependencyVersionRange"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj b/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
index fe414a8c02c..8240080ade1 100644
--- a/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
+++ b/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
@@ -42,9 +42,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.SqlServer\EFCore.SqlServer.csproj" PrivateAssets="contentfiles;build" />
-    <ProjectReference Include="..\EFCore.SqlServer.Abstractions\EFCore.SqlServer.Abstractions.csproj" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\EFCore.SqlServer\EFCore.SqlServer.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.SqlServer.Abstractions\EFCore.SqlServer.Abstractions.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -67,14 +67,4 @@
     </Compile>
   </ItemGroup>
 
-  <Target Name="_SetProjectReferenceDependencyVersionRange"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj b/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj
index 698d48ae7a3..b3982028db2 100644
--- a/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj
+++ b/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj
@@ -51,8 +51,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.SqlServer\EFCore.SqlServer.csproj" PrivateAssets="contentfiles;build" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\EFCore.SqlServer\EFCore.SqlServer.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -79,14 +79,4 @@
     </Compile>
   </ItemGroup>
 
-  <Target Name="_SetProjectReferenceDependencyVersionRange"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/EFCore.SqlServer/EFCore.SqlServer.csproj b/src/EFCore.SqlServer/EFCore.SqlServer.csproj
index 2df1a3a76ed..cff116733a4 100644
--- a/src/EFCore.SqlServer/EFCore.SqlServer.csproj
+++ b/src/EFCore.SqlServer/EFCore.SqlServer.csproj
@@ -45,8 +45,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -73,14 +73,4 @@
     </Compile>
   </ItemGroup>
 
-  <Target Name="_SetProjectReferenceDependencyVersionRange"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj
index b5d8d8af0e9..330729de827 100644
--- a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj
+++ b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj
@@ -45,9 +45,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" />
-    <ProjectReference Include="..\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -74,14 +74,4 @@
     </Compile>
   </ItemGroup>
 
-  <Target Name="_SetProjectReferenceDependencyVersionRange"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj b/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj
index d511ff0408a..eca73bebcb7 100644
--- a/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj
+++ b/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj
@@ -52,8 +52,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" PrivateAssets="contentfiles;build" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -81,14 +81,4 @@
     </Compile>
   </ItemGroup>
 
-  <Target Name="_SetProjectReferenceDependencyVersionRange"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/EFCore.Sqlite/EFCore.Sqlite.csproj b/src/EFCore.Sqlite/EFCore.Sqlite.csproj
index 8658711778a..fd127d70678 100644
--- a/src/EFCore.Sqlite/EFCore.Sqlite.csproj
+++ b/src/EFCore.Sqlite/EFCore.Sqlite.csproj
@@ -42,8 +42,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" PrivateAssets="contentfiles;build" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -62,14 +62,4 @@
   <Target Name="Compile" />
   <Target Name="CopyFilesToOutputDirectory" />
 
-  <Target Name="_SetProjectReferenceDependencyVersionRange"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/EFCore/EFCore.csproj b/src/EFCore/EFCore.csproj
index 8eada2251bf..2df8cb5b702 100644
--- a/src/EFCore/EFCore.csproj
+++ b/src/EFCore/EFCore.csproj
@@ -52,8 +52,8 @@ Microsoft.EntityFrameworkCore.DbSet
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Abstractions\EFCore.Abstractions.csproj" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" PrivateAssets="contentfiles;build" />
+    <ProjectReference Include="..\EFCore.Abstractions\EFCore.Abstractions.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -129,14 +129,4 @@ Microsoft.EntityFrameworkCore.DbSet
     </Compile>
   </ItemGroup>
 
-  <Target Name="_SetProjectReferenceDependencyVersionRange"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj
index e1b475c649b..4b787675a18 100644
--- a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj
+++ b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj
@@ -28,7 +28,7 @@ Microsoft.Data.Sqlite.SqliteTransaction</Description>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" />
+    <ProjectReference Include="..\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
@@ -43,14 +43,4 @@ Microsoft.Data.Sqlite.SqliteTransaction</Description>
   <Target Name="Compile" />
   <Target Name="CopyFilesToOutputDirectory" />
 
-  <Target Name="_SetProjectReferenceDependencyVersionRange"
-          AfterTargets="_GetProjectReferenceVersions"
-          BeforeTargets="GenerateNuspec">
-    <ItemGroup>
-      <_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
-        <ProjectVersion>[%(ProjectVersion), $(EFCorePackageDependencyUpperBound))</ProjectVersion>
-      </_ProjectReferencesWithVersions>
-    </ItemGroup>
-  </Target>
-
 </Project>

From b0b74e631bfad28e380def7f03e7da922a968a4e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 15 Apr 2026 20:04:40 +0000
Subject: [PATCH 6/8] Use Version instead of PackageVersion on
 ProjectReferences to avoid import order issue

Agent-Logs-Url: https://github.com/dotnet/efcore/sessions/c6c7a825-392c-4345-a8d1-5c09b849fd0f

Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
---
 Directory.Build.targets                                     | 2 +-
 src/EFCore.Cosmos/EFCore.Cosmos.csproj                      | 4 ++--
 src/EFCore.Design/EFCore.Design.csproj                      | 2 +-
 src/EFCore.InMemory/EFCore.InMemory.csproj                  | 4 ++--
 src/EFCore.Proxies/EFCore.Proxies.csproj                    | 4 ++--
 src/EFCore.Relational/EFCore.Relational.csproj              | 4 ++--
 .../EFCore.SqlServer.HierarchyId.csproj                     | 6 +++---
 src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj        | 4 ++--
 src/EFCore.SqlServer/EFCore.SqlServer.csproj                | 4 ++--
 src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj            | 6 +++---
 src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj              | 4 ++--
 src/EFCore.Sqlite/EFCore.Sqlite.csproj                      | 4 ++--
 src/EFCore/EFCore.csproj                                    | 4 ++--
 src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj      | 2 +-
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 2c5094ecbe2..21c45cae11c 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -40,7 +40,7 @@
   <Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec">
     <ItemGroup>
       <_ProjectReferencesWithVersions Condition="'%(FullPath)' != ''">
-        <PackageVersion>@(ProjectReference->'%(PackageVersion)')</PackageVersion>
+        <PackageVersion>@(ProjectReference->'%(Version)')</PackageVersion>
       </_ProjectReferencesWithVersions>
       <_ProjectReferencesWithVersions Condition="'%(Identity)' != '' And '%(PackageVersion)' != ''">
         <ProjectVersion>%(PackageVersion)</ProjectVersion>
diff --git a/src/EFCore.Cosmos/EFCore.Cosmos.csproj b/src/EFCore.Cosmos/EFCore.Cosmos.csproj
index 8daa912a407..d401549e478 100644
--- a/src/EFCore.Cosmos/EFCore.Cosmos.csproj
+++ b/src/EFCore.Cosmos/EFCore.Cosmos.csproj
@@ -42,8 +42,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore\EFCore.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore\EFCore.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Design/EFCore.Design.csproj b/src/EFCore.Design/EFCore.Design.csproj
index 4df1df440e2..fb7a7853f2e 100644
--- a/src/EFCore.Design/EFCore.Design.csproj
+++ b/src/EFCore.Design/EFCore.Design.csproj
@@ -52,7 +52,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.InMemory/EFCore.InMemory.csproj b/src/EFCore.InMemory/EFCore.InMemory.csproj
index e1bb0fa9d6f..13b2370baf5 100644
--- a/src/EFCore.InMemory/EFCore.InMemory.csproj
+++ b/src/EFCore.InMemory/EFCore.InMemory.csproj
@@ -40,8 +40,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore\EFCore.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore\EFCore.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Proxies/EFCore.Proxies.csproj b/src/EFCore.Proxies/EFCore.Proxies.csproj
index f0b34a37c8d..118c1cc6d58 100644
--- a/src/EFCore.Proxies/EFCore.Proxies.csproj
+++ b/src/EFCore.Proxies/EFCore.Proxies.csproj
@@ -43,8 +43,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore\EFCore.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore\EFCore.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Relational/EFCore.Relational.csproj b/src/EFCore.Relational/EFCore.Relational.csproj
index 86a51d9dd47..01637664a9d 100644
--- a/src/EFCore.Relational/EFCore.Relational.csproj
+++ b/src/EFCore.Relational/EFCore.Relational.csproj
@@ -45,8 +45,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore\EFCore.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore\EFCore.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj b/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
index 8240080ade1..05da3bce309 100644
--- a/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
+++ b/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
@@ -42,9 +42,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.SqlServer\EFCore.SqlServer.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.SqlServer.Abstractions\EFCore.SqlServer.Abstractions.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.SqlServer\EFCore.SqlServer.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.SqlServer.Abstractions\EFCore.SqlServer.Abstractions.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj b/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj
index b3982028db2..267e484a135 100644
--- a/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj
+++ b/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj
@@ -51,8 +51,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.SqlServer\EFCore.SqlServer.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.SqlServer\EFCore.SqlServer.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.SqlServer/EFCore.SqlServer.csproj b/src/EFCore.SqlServer/EFCore.SqlServer.csproj
index cff116733a4..2abd5e633e6 100644
--- a/src/EFCore.SqlServer/EFCore.SqlServer.csproj
+++ b/src/EFCore.SqlServer/EFCore.SqlServer.csproj
@@ -45,8 +45,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj
index 330729de827..da414d09f39 100644
--- a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj
+++ b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj
@@ -45,9 +45,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj b/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj
index eca73bebcb7..e43b2a6bee6 100644
--- a/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj
+++ b/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj
@@ -52,8 +52,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Sqlite/EFCore.Sqlite.csproj b/src/EFCore.Sqlite/EFCore.Sqlite.csproj
index fd127d70678..261ef5012d3 100644
--- a/src/EFCore.Sqlite/EFCore.Sqlite.csproj
+++ b/src/EFCore.Sqlite/EFCore.Sqlite.csproj
@@ -42,8 +42,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore/EFCore.csproj b/src/EFCore/EFCore.csproj
index 2df8cb5b702..9fb0bbbd290 100644
--- a/src/EFCore/EFCore.csproj
+++ b/src/EFCore/EFCore.csproj
@@ -52,8 +52,8 @@ Microsoft.EntityFrameworkCore.DbSet
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Abstractions\EFCore.Abstractions.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Abstractions\EFCore.Abstractions.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj
index 4b787675a18..555ee47d20c 100644
--- a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj
+++ b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj
@@ -28,7 +28,7 @@ Microsoft.Data.Sqlite.SqliteTransaction</Description>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" PackageVersion="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>

From b6afe2a326a33b020c2e43cc15ac4efdbac91531 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 15 Apr 2026 20:29:47 +0000
Subject: [PATCH 7/8] Address review: use PackageVersion attribute and
 $(Version) in ProjectReference items

Agent-Logs-Url: https://github.com/dotnet/efcore/sessions/60788937-58f7-4241-9b1c-6aba77ab6481

Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
---
 Directory.Build.targets                                     | 2 +-
 src/EFCore.Cosmos/EFCore.Cosmos.csproj                      | 4 ++--
 src/EFCore.Design/EFCore.Design.csproj                      | 2 +-
 src/EFCore.InMemory/EFCore.InMemory.csproj                  | 4 ++--
 src/EFCore.Proxies/EFCore.Proxies.csproj                    | 4 ++--
 src/EFCore.Relational/EFCore.Relational.csproj              | 4 ++--
 .../EFCore.SqlServer.HierarchyId.csproj                     | 6 +++---
 src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj        | 4 ++--
 src/EFCore.SqlServer/EFCore.SqlServer.csproj                | 4 ++--
 src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj            | 6 +++---
 src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj              | 4 ++--
 src/EFCore.Sqlite/EFCore.Sqlite.csproj                      | 4 ++--
 src/EFCore/EFCore.csproj                                    | 4 ++--
 src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj      | 2 +-
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 21c45cae11c..2c5094ecbe2 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -40,7 +40,7 @@
   <Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec">
     <ItemGroup>
       <_ProjectReferencesWithVersions Condition="'%(FullPath)' != ''">
-        <PackageVersion>@(ProjectReference->'%(Version)')</PackageVersion>
+        <PackageVersion>@(ProjectReference->'%(PackageVersion)')</PackageVersion>
       </_ProjectReferencesWithVersions>
       <_ProjectReferencesWithVersions Condition="'%(Identity)' != '' And '%(PackageVersion)' != ''">
         <ProjectVersion>%(PackageVersion)</ProjectVersion>
diff --git a/src/EFCore.Cosmos/EFCore.Cosmos.csproj b/src/EFCore.Cosmos/EFCore.Cosmos.csproj
index d401549e478..dbd0cd838e7 100644
--- a/src/EFCore.Cosmos/EFCore.Cosmos.csproj
+++ b/src/EFCore.Cosmos/EFCore.Cosmos.csproj
@@ -42,8 +42,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore\EFCore.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore\EFCore.csproj" PackageVersion="[$(Version), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(Version), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Design/EFCore.Design.csproj b/src/EFCore.Design/EFCore.Design.csproj
index fb7a7853f2e..bbd1d5a3740 100644
--- a/src/EFCore.Design/EFCore.Design.csproj
+++ b/src/EFCore.Design/EFCore.Design.csproj
@@ -52,7 +52,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(Version), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.InMemory/EFCore.InMemory.csproj b/src/EFCore.InMemory/EFCore.InMemory.csproj
index 13b2370baf5..c9b25462e86 100644
--- a/src/EFCore.InMemory/EFCore.InMemory.csproj
+++ b/src/EFCore.InMemory/EFCore.InMemory.csproj
@@ -40,8 +40,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore\EFCore.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore\EFCore.csproj" PackageVersion="[$(Version), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(Version), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Proxies/EFCore.Proxies.csproj b/src/EFCore.Proxies/EFCore.Proxies.csproj
index 118c1cc6d58..509f73e0145 100644
--- a/src/EFCore.Proxies/EFCore.Proxies.csproj
+++ b/src/EFCore.Proxies/EFCore.Proxies.csproj
@@ -43,8 +43,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore\EFCore.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore\EFCore.csproj" PackageVersion="[$(Version), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(Version), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Relational/EFCore.Relational.csproj b/src/EFCore.Relational/EFCore.Relational.csproj
index 01637664a9d..8bf55bf51e7 100644
--- a/src/EFCore.Relational/EFCore.Relational.csproj
+++ b/src/EFCore.Relational/EFCore.Relational.csproj
@@ -45,8 +45,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore\EFCore.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore\EFCore.csproj" PackageVersion="[$(Version), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(Version), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj b/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
index 05da3bce309..69d56785140 100644
--- a/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
+++ b/src/EFCore.SqlServer.HierarchyId/EFCore.SqlServer.HierarchyId.csproj
@@ -42,9 +42,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.SqlServer\EFCore.SqlServer.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.SqlServer.Abstractions\EFCore.SqlServer.Abstractions.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.SqlServer\EFCore.SqlServer.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(Version), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.SqlServer.Abstractions\EFCore.SqlServer.Abstractions.csproj" PackageVersion="[$(Version), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(Version), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj b/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj
index 267e484a135..5ef1492c5b6 100644
--- a/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj
+++ b/src/EFCore.SqlServer.NTS/EFCore.SqlServer.NTS.csproj
@@ -51,8 +51,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.SqlServer\EFCore.SqlServer.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.SqlServer\EFCore.SqlServer.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(Version), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(Version), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.SqlServer/EFCore.SqlServer.csproj b/src/EFCore.SqlServer/EFCore.SqlServer.csproj
index 2abd5e633e6..9c5325bb75c 100644
--- a/src/EFCore.SqlServer/EFCore.SqlServer.csproj
+++ b/src/EFCore.SqlServer/EFCore.SqlServer.csproj
@@ -45,8 +45,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(Version), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(Version), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj
index da414d09f39..98a17bfb2c7 100644
--- a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj
+++ b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj
@@ -45,9 +45,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Relational\EFCore.Relational.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(Version), $(NextMajorVersion))" />
+    <ProjectReference Include="..\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" PackageVersion="[$(Version), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(Version), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj b/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj
index e43b2a6bee6..0d847a4b2a2 100644
--- a/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj
+++ b/src/EFCore.Sqlite.NTS/EFCore.Sqlite.NTS.csproj
@@ -52,8 +52,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(Version), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(Version), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore.Sqlite/EFCore.Sqlite.csproj b/src/EFCore.Sqlite/EFCore.Sqlite.csproj
index 261ef5012d3..9b6907b937d 100644
--- a/src/EFCore.Sqlite/EFCore.Sqlite.csproj
+++ b/src/EFCore.Sqlite/EFCore.Sqlite.csproj
@@ -42,8 +42,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(Version), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" ReferenceOutputAssembly="False" OutputItemType="Analyzer" PackageVersion="[$(Version), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EFCore/EFCore.csproj b/src/EFCore/EFCore.csproj
index 9fb0bbbd290..de5eeaf77e1 100644
--- a/src/EFCore/EFCore.csproj
+++ b/src/EFCore/EFCore.csproj
@@ -52,8 +52,8 @@ Microsoft.EntityFrameworkCore.DbSet
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EFCore.Abstractions\EFCore.Abstractions.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
-    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" PrivateAssets="contentfiles;build" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Abstractions\EFCore.Abstractions.csproj" PackageVersion="[$(Version), $(NextMajorVersion))" />
+    <ProjectReference Include="..\EFCore.Analyzers\EFCore.Analyzers.csproj" PrivateAssets="contentfiles;build" PackageVersion="[$(Version), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj
index 555ee47d20c..c0b9b825269 100644
--- a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj
+++ b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj
@@ -28,7 +28,7 @@ Microsoft.Data.Sqlite.SqliteTransaction</Description>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" Version="[$(ProjectVersion), $(NextMajorVersion))" />
+    <ProjectReference Include="..\Microsoft.Data.Sqlite.Core\Microsoft.Data.Sqlite.Core.csproj" PackageVersion="[$(Version), $(NextMajorVersion))" />
   </ItemGroup>
 
   <ItemGroup>

From 8206ff8a0551db4d6e88f6ffb8859ea4e6e8820f Mon Sep 17 00:00:00 2001
From: Andriy Svyryd <AndriySvyryd@users.noreply.github.com>
Date: Wed, 15 Apr 2026 13:54:22 -0700
Subject: [PATCH 8/8] Update Directory.Build.targets

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 Directory.Build.targets | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 2c5094ecbe2..3654d24d03a 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -39,11 +39,10 @@
 
   <Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec">
     <ItemGroup>
-      <_ProjectReferencesWithVersions Condition="'%(FullPath)' != ''">
-        <PackageVersion>@(ProjectReference->'%(PackageVersion)')</PackageVersion>
-      </_ProjectReferencesWithVersions>
-      <_ProjectReferencesWithVersions Condition="'%(Identity)' != '' And '%(PackageVersion)' != ''">
-        <ProjectVersion>%(PackageVersion)</ProjectVersion>
+      <_ProjectReferencesWithVersions
+          Update="@(ProjectReference)"
+          Condition="'%(ProjectReference.Identity)' != '' And '%(ProjectReference.PackageVersion)' != ''">
+        <ProjectVersion>%(ProjectReference.PackageVersion)</ProjectVersion>
       </_ProjectReferencesWithVersions>
     </ItemGroup>
   </Target>