diff --git a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.Pack.targets b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.Pack.targets
index 286bba8f09a..c614d55f8e3 100644
--- a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.Pack.targets
+++ b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.Pack.targets
@@ -339,8 +339,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       Projects="@(_ProjectReferencesFromAssetsFile)"
       Targets="_GetProjectVersion"
       SkipNonexistentTargets="true"
-      SkipNonexistentProjects="true"
-      Properties="BuildProjectReferences=false;">
+      SkipNonexistentProjects="true">
       <Output
         TaskParameter="TargetOutputs"
         ItemName="_ProjectReferencesWithVersions"/>
@@ -359,9 +358,21 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Target Name="_WalkEachTargetPerFramework">
     <ItemGroup>
-        <_ProjectsWithTFM Include="$(MSBuildProjectFullPath)" AdditionalProperties="TargetFramework=%(_TargetFrameworks.Identity)" />
-        <_ProjectsWithTFMNoBuild Include="$(MSBuildProjectFullPath)" AdditionalProperties="TargetFramework=%(_TargetFrameworks.Identity);BuildProjectReferences=false" />
-
+        <!-- Cross-targeting: address each inner-framework instance by its TargetFramework global property. -->
+        <_ProjectsWithTFM Condition="'$(TargetFrameworks)' != ''" Include="$(MSBuildProjectFullPath)" AdditionalProperties="TargetFramework=%(_TargetFrameworks.Identity)" />
+        <!-- Single-targeting: reuse the current (already-built) instance. Adding a TargetFramework global property here would fork a redundant evaluation. -->
+        <_ProjectsWithTFM Condition="'$(TargetFrameworks)' == ''" Include="$(MSBuildProjectFullPath)" />
+
+        <!-- _GetFrameworkAssemblyReferences depends on ResolveReferences, which participates in the project-to-project
+             reference protocol. During a normal pack the referenced projects have already been built, so ResolveReferences
+             reuses their existing evaluation/build results (no redundant evaluations). During a no-build pack (NoBuild=true)
+             the references were not built, so BuildProjectReferences=false is required to prevent ResolveReferences from
+             invoking the Build target on them (which would fail with NETSDK1085). Reuse the already-computed _ProjectsWithTFM
+             items and just append the BuildProjectReferences=false global property. -->
+        <_FrameworkAssemblyReferenceProjects Include="@(_ProjectsWithTFM)" Condition="'$(NoBuild)' != 'true'" />
+        <_FrameworkAssemblyReferenceProjects Include="@(_ProjectsWithTFM)" Condition="'$(NoBuild)' == 'true'">
+          <AdditionalProperties>%(_ProjectsWithTFM.AdditionalProperties);BuildProjectReferences=false</AdditionalProperties>
+        </_FrameworkAssemblyReferenceProjects>
     </ItemGroup>
     <MSBuild
       Condition="'$(IncludeBuildOutput)' == 'true'"
@@ -398,7 +409,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <MSBuild
       Condition="'$(IncludeSource)' == 'true'"
-      Projects="@(_ProjectsWithTFMNoBuild)"
+      Projects="@(_ProjectsWithTFM)"
       Targets="SourceFilesProjectOutputGroup"
       BuildInParallel="$(BuildInParallel)">
 
@@ -408,7 +419,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </MSBuild>
 
     <MSBuild
-      Projects="@(_ProjectsWithTFMNoBuild)"
+      Projects="@(_FrameworkAssemblyReferenceProjects)"
       Targets="_GetFrameworkAssemblyReferences"
       BuildInParallel="$(BuildInParallel)">
 
@@ -418,7 +429,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </MSBuild>
 
     <MSBuild
-      Projects="@(_ProjectsWithTFMNoBuild)"
+      Projects="@(_ProjectsWithTFM)"
       Targets="_GetFrameworksWithSuppressedDependencies"
       BuildInParallel="$(BuildInParallel)">
 
diff --git a/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs b/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs
index 9ef19bc460b..8265d2160de 100644
--- a/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs
+++ b/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs
@@ -2692,7 +2692,8 @@ public class ExtensionMethods
                     var nuspecReader = nupkgReader.NuspecReader;
                     // Validate the assets.
                     var srcItems = nupkgReader.GetFiles("src").ToArray();
-                    Assert.Equal(4, srcItems.Length);
+
+                    // At least the user-authored source files are always included.
                     Assert.Contains("src/ClassLibrary1/ClassLibrary1.csproj", srcItems);
                     Assert.Contains("src/ClassLibrary1/Class1.cs", srcItems);
                     Assert.Contains("src/ClassLibrary1/Extensions/ExtensionMethods.cs", srcItems);