From fae5b098ed4850e2291521a337371e4ccc1bc603 Mon Sep 17 00:00:00 2001
From: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
Date: Sat, 26 Apr 2025 19:23:42 -0400
Subject: [PATCH] WIP: first steps

---
 .../Distribution/Client/ProjectPlanning.hs    |  51 ++++++++++++++---
 .../Includes2/cabal-external-target.out       |   3 +-
 .../Backpack/Includes2/cabal-external.out     |   3 +-
 .../Includes2/cabal-internal-target.out       |   3 +-
 .../Backpack/Includes2/cabal-internal.out     |   3 +-
 .../PackageTests/Backpack/Includes2/cov.out   |   2 -
 .../Backpack/Includes3/cabal-external.out     |   6 +-
 .../Backpack/Includes3/cabal-internal.out     |   6 +-
 .../Backpack/Includes3/cabal-repo.out         |   9 ++-
 .../PackageTests/Backpack/Reexport2/cabal.out |   2 -
 .../PackageTests/Backpack/T6385/cabal.out     |   2 -
 .../Backpack/bkpcabal01/cabal.out             |   2 -
 .../BuildAutogenPackageGuard/cabal.out        |   2 -
 .../PackageTests/BuildDeps/DepCycle/cabal.out |   2 -
 .../BuildDeps/InternalLibrary1/cabal.out      |   2 -
 .../use-local-version-of-package.out          |   4 --
 .../use-local-package-as-setup-dep.out        |   2 -
 .../PackageTests/BuildToolDepends/setup.out   |   2 -
 .../BuildToolDependsExternal/setup.out        |   2 -
 .../BuildTools/External/cabal.out             |   2 -
 .../BuildTools/Internal/cabal.out             |   2 -
 .../PackageTests/CmmSources/cabal.out         |   2 -
 .../PackageTests/CmmSourcesDyn/cabal.out      |   2 -
 .../PackageTests/CmmSourcesExe/cabal.out      |   2 -
 .../PackageTests/ConfigFile/T8487/cabal.out   |   2 -
 .../PackageTests/CopyHie/cabal.out            |   2 -
 .../PackageTests/CustomSegfault/cabal.out     |   2 -
 .../PackageTests/CustomTestCoverage/cabal.out |   8 +--
 .../PackageTests/CustomWithoutCabal/cabal.out |   2 -
 .../CustomWithoutCabalDefaultMain/cabal.out   |   2 -
 cabal-testsuite/PackageTests/Exec/cabal.out   |   2 -
 .../PackageTests/ExecModern/cabal.out         |   2 -
 .../PackageTests/ExternalCommand/cabal.out    |   2 -
 .../PackageTests/ExternalCommandEnv/cabal.out |   2 -
 .../ExternalCommandExitCode/cabal.out         |   2 -
 .../ExternalCommandHelp/cabal.out             |   2 -
 .../PackageTests/ExtraPackages/cabal.out      |   2 -
 .../PackageTests/ExtraProgPath/setup.out      |   2 -
 .../ExtraProgPathGlobal/setup.out             |   2 -
 .../PackageTests/ExtraProgPathLocal/setup.out |   2 -
 .../FFI/CSourceDependsStub/cabal.out          |   2 -
 .../PackageTests/FFI/ForeignOptsC/cabal.out   |   2 -
 .../PackageTests/FFI/ForeignOptsCxx/cabal.out |   2 -
 .../PackageTests/HaddockArgs/hoogle.out       |   2 -
 .../PackageTests/HaddockArgs/quickjump.out    |   2 -
 .../HaddockBuildDepends/cabal.out             |   2 -
 .../HaddockProject/haddock-project.out        |   2 -
 .../PackageTests/HaddockWarn/cabal.out        |   2 -
 .../InternalLibraries/cabal-per-package.out   |   2 -
 .../PackageTests/InternalLibraries/cabal.out  |   2 -
 .../PackageTests/JS/JsSources/other-arch.out  |   2 -
 .../JS/JsSourcesExe/other-arch.out            |   2 -
 .../ListBin/SelectedComponent/cabal.out       |   2 -
 .../MultiRepl/CabalMacros/cabal.out           |   2 -
 .../MultiRepl/EnabledClosure/cabal.out        |   2 -
 .../MultiRepl/EnabledSucc/cabal.out           |   2 -
 .../MultiRepl/ExtraOptions/cabal.out          |   2 -
 .../MultiRepl/InternalLibs/cabal.out          |   2 -
 .../MultiRepl/KeepTempFiles/cabal.no.out      |   2 -
 .../MultiRepl/KeepTempFiles/cabal.yes.out     |   2 -
 .../NotEnabledFail/cabal.multirepl-a.out      |   2 -
 .../MultipleLibraries/Failing/cabal.out       |   2 -
 .../MultipleLibraries/Successful/cabal.out    |   2 -
 .../MultipleLibraries/T6083Post/cabal.out     |   2 -
 .../T6083PostMixin/cabal.out                  |   2 -
 .../MultipleLibraries/T6083Pre/cabal.out      |   2 -
 .../MultipleLibraries/T6083PreMixin/cabal.out |   2 -
 .../MultipleLibraries/T6894/cabal.out         |   2 -
 .../CmdBench/MultipleBenchmarks/cabal.out     |   4 --
 .../NewBuild/CmdBench/OptionsFlag/cabal.out   |   2 -
 .../NewBuild/CmdBench/WarningRTS/cabal.out    |   6 --
 .../NewBuild/CmdBuild/OnlyConfigure/cabal.out |   6 --
 .../CleanSourceRepositoryPackage/cabal.out    |   2 -
 .../NewBuild/CmdExec/GhcInvocation/cabal.out  |   4 --
 .../NewBuild/CmdExec/RunExe/cabal.out         |   4 --
 .../NewBuild/CmdRun/Datafiles/cabal.out       |   4 --
 .../NewBuild/CmdRun/ExeAndLib/cabal.out       |   4 --
 .../CmdRun/ExitCodePropagation/cabal.out      |   2 -
 .../NewBuild/CmdRun/MultipleExes/cabal.out    |  10 ----
 .../CmdRun/MultiplePackages/cabal.out         |  16 ------
 .../NewBuild/CmdRun/RunMainBad/cabal.out      |   2 -
 .../NewBuild/CmdRun/Script/cabal.out          |   2 -
 .../NewBuild/CmdRun/ScriptBad/cabal.out       |   2 -
 .../NewBuild/CmdRun/ScriptLiterate/cabal.out  |   2 -
 .../NewBuild/CmdRun/Single/cabal.out          |  12 ----
 .../NewBuild/CmdRun/WarningRTS/cabal.out      |   6 --
 .../NewBuild/CmdTest/OptionsFlag/cabal.out    |   2 -
 .../NewBuild/CmdTest/WarningRTS/cabal.out     |   6 --
 .../NewBuild/MonitorCabalFiles/cabal.out      |   4 --
 .../PackageTests/NewBuild/T3978/cabal.out     |   2 -
 .../PackageTests/NewBuild/T4017/cabal.out     |   2 -
 .../PackageTests/NewBuild/T4405/cabal.out     |   4 --
 .../PackageTests/NewBuild/T4477/cabal.out     |   2 -
 .../PackageTests/NewBuild/T8875/cabal.out     |   2 -
 .../NewConfigure/ConfigFile/cabal.out         |   6 --
 .../LocalConfigOverwrite/cabal.out            |   7 +--
 .../NewFreeze/BuildTools/new_freeze.out       |   8 +--
 .../NewFreeze/Flags/new_freeze.out            |   8 +--
 .../NewFreeze/FreezeFile/new_freeze.out       |  20 +------
 .../NewHaddock/DisableDoc/cabal.out           |   2 -
 .../PackageTests/NewHaddock/Fails/cabal.out   |   4 --
 .../HaddockForHackageCmdOutput/cabal.out      |   2 -
 .../HaddockOutput/HaddockOutputCmd/cabal.out  |   2 -
 .../HaddockOutputConfig/cabal.out             |   2 -
 .../NewHaddock/ImplyDependencies/cabal.out    |   2 -
 .../DeterministicTrivial/deterministic.out    |   2 -
 .../PackageTests/NewSdist/Globbing/cabal.out  |   2 -
 .../ManyDataFiles/many-data-files.out         |   2 -
 .../NewSdist/MultiTarget/all-output-dir.out   |   2 -
 .../NewSdist/MultiTarget/all-test-sute.out    |   2 -
 .../PackageTests/NewSdist/MultiTarget/all.out |   2 -
 .../MultiTarget/list-sources-output-dir.out   |   2 -
 .../MultiTarget/multi-archive-to-stdout.out   |   2 -
 .../MultiTarget/multi-list-sources.out        |   2 -
 .../NewSdist/MultiTarget/multi-target.out     |   2 -
 .../MultiTarget/target-remote-package.out     |   2 -
 .../MultiTarget/valid-and-test-suite.out      |   2 -
 .../NewSdist/NullTerminated/cabal.out         | Bin 107 -> 41 bytes
 .../PackageTests/OfflineFlag/offlineFlag.out  |  12 ++--
 .../PackageDB/cabal-fail-no-base.out          |   2 -
 .../PackageDB/cabal-fail-no-p.out             |   2 -
 .../PackageDB/cabal-fail-no-packagedbs.out    |   2 -
 .../PackageDB/cabal-manual-packagedb.out      |   2 -
 .../PackageDB/cabal-packagedb.out             |   2 -
 .../PackageTests/Path/Config/cabal.out        |  54 ++++++------------
 .../Project/CoverageProject/cabal.out         |   2 -
 .../ProjectConfig/FlagsSemigroup/cabal.out    |   2 -
 .../ProjectImport/UntrimmedImport/cabal.out   |  18 ++----
 .../T4154/install-time-with-constraint.out    |   2 -
 .../PackageTests/Regression/T4202/cabal.out   |   6 --
 .../PackageTests/Regression/T4720/cabal.out   |   2 -
 .../PackageTests/Regression/T4798/cabal.out   |   2 -
 .../PackageTests/Regression/T4986/cabal.out   |   2 -
 .../PackageTests/Regression/T5213/cabal.out   |   2 -
 .../Regression/T5213ExeCoverage/cabal.out     |   2 -
 .../PackageTests/Regression/T5309/cabal.out   |   6 --
 .../Regression/T5318/sdist-list-sources.out   |   2 -
 .../PackageTests/Regression/T5677/cabal.out   |   2 -
 .../PackageTests/Regression/T6334/cabal.out   |   2 -
 .../PackageTests/Regression/T6440/cabal.out   |   2 -
 .../PackageTests/Regression/T6853/cabal.out   |   2 -
 .../Regression/T6961/DepExternal/cabal.out    |   2 -
 .../Regression/T6961/DepInternal/cabal.out    |   2 -
 .../Regression/T6961/Exe/cabal.out            |   2 -
 .../Regression/T6961/Test/cabal.out           |   2 -
 .../Regression/T7234/Fail/cabal.out           |   2 -
 .../Regression/T7234/Success/cabal.out        |   2 -
 .../PackageTests/Regression/T8507/cabal.out   |   2 -
 .../PackageTests/Regression/T9640/cabal.out   |   2 -
 .../PackageTests/Regression/T9756/cabal.out   |   2 -
 .../RelativePathProjectImports/cabal.out      |  12 ++--
 .../ReplNoLoad/cabal.exec-no-load.out         |   2 -
 .../ReplNoLoad/cabal.exec-normal.out          |   2 -
 .../ReplNoLoad/cabal.lib-no-load.out          |   2 -
 .../ReplNoLoad/cabal.lib-normal.out           |   2 -
 ...l.multiple-repl-options-multiple-flags.out |   2 -
 .../cabal.multiple-repl-options.out           |   2 -
 ...e-repl-options-multiple-flags-negative.out |   2 -
 ...bal.single-repl-options-multiple-flags.out |   2 -
 .../ReplOptions/cabal.single-repl-options.out |   2 -
 .../PackageTests/SDist/T5195and5349/cabal.out |   2 -
 .../PackageTests/SDist/T7028/cabal.out        |   2 -
 .../PackageTests/SDist/T7124/cabal-list.out   |   2 -
 .../PackageTests/SDist/T7124/cabal.out        |   2 -
 .../PackageTests/SDist/T7698/cabal.out        |   2 -
 .../PackageTests/SDist/T8817/cabal.out        |   2 -
 .../ShowBuildInfo/A/build-info-all.out        |   2 -
 .../ShowBuildInfo/A/build-info-exe.out        |   2 -
 .../ShowBuildInfo/A/remove-outdated.out       |   4 --
 .../CompileFail/compile-fail.out              |   4 --
 .../ShowBuildInfo/Complex/single.out          |  10 ----
 .../PackageTests/Target/cabal.all-benches.out |   2 -
 .../Target/cabal.all-enable-benches.out       |   2 -
 .../Target/cabal.all-enable-tests.out         |   2 -
 .../PackageTests/Target/cabal.all-exes.out    |   2 -
 .../PackageTests/Target/cabal.all-tests.out   |   2 -
 .../Target/cabal.component-target-bench.out   |   6 --
 .../Target/cabal.component-target-exe.out     |   6 --
 .../Target/cabal.component-target-lib.out     |   6 --
 .../Target/cabal.component-target-test.out    |   6 --
 .../Target/cabal.ctype-target.out             |   8 ---
 .../PackageTests/Target/cabal.default-all.out |   2 -
 .../PackageTests/Target/cabal.everything.out  |   2 -
 .../Target/cabal.explicit-all.out             |   2 -
 .../Target/cabal.missing-target.out           |   6 --
 .../Target/cabal.package-target.out           |   4 --
 .../PackageTests/Target/cabal.path-target.out |   4 --
 .../PackageTests/TestCodeGenerator/cabal.out  |   2 -
 .../TestSuiteTests/ExeV10/cabal.out           |   2 -
 .../TestSuiteTests/ExeV10/coverage.out        |   2 -
 .../PackageTests/VersionPriority/0-local.out  |   3 +-
 .../PackageTests/VersionPriority/1-local.out  |  12 ++--
 .../PackageTests/VersionPriority/1-web.out    |  18 ++----
 .../PackageTests/VersionPriority/2-local.out  |  20 ++-----
 .../PackageTests/VersionPriority/2-web.out    |  26 +++------
 .../PackageTests/VersionPriority/3-web.out    |  36 ++++--------
 .../postCheckoutCommand/cabal.out             |   3 +-
 197 files changed, 134 insertions(+), 679 deletions(-)

diff --git a/cabal-install/src/Distribution/Client/ProjectPlanning.hs b/cabal-install/src/Distribution/Client/ProjectPlanning.hs
index f453a1aafbb..294f08cf9e8 100644
--- a/cabal-install/src/Distribution/Client/ProjectPlanning.hs
+++ b/cabal-install/src/Distribution/Client/ProjectPlanning.hs
@@ -226,6 +226,7 @@ import Control.Monad.IO.Class (liftIO)
 import Control.Monad.State as State (State, execState, runState, state)
 import Data.Foldable (fold)
 import Data.List (deleteBy, groupBy)
+import qualified Data.List as L
 import qualified Data.List.NonEmpty as NE
 import qualified Data.Map as Map
 import qualified Data.Set as Set
@@ -407,13 +408,7 @@ rebuildProjectConfig
           localPackages <- phaseReadLocalPackages compiler (projectConfig <> cliConfig)
           return (projectConfig, localPackages)
 
-    let configfiles =
-          [ text "-" <+> docProjectConfigPath path
-          | Explicit path <- Set.toList . (if verbosity >= verbose then id else onlyTopLevelProvenance) $ projectConfigProvenance projectConfig
-          ]
-    unless (null configfiles) $
-      notice (verboseStderr verbosity) . render . vcat $
-        text "Configuration is affected by the following files:" : configfiles
+    informAboutConfigFiles projectConfig
 
     return (projectConfig <> cliConfig, localPackages)
     where
@@ -460,6 +455,48 @@ rebuildProjectConfig
             projectConfigBuildOnly
             pkgLocations
 
+      informAboutConfigFiles projectConfig =
+        unless (null configFiles)
+          . out (verboseStderr verbosity)
+          . render
+          $ message
+        where
+          -- output mode is either 'notice' or 'info' depending on how trivial the information
+          out
+            | allProjectFilesInCWD = info
+            | otherwise = notice
+            where
+              allProjectFilesInCWD =
+                map projectConfigPathRoot configFiles
+                  L.\\ ["cabal.project", "cabal.project.local", "cabal.freeze"]
+                  == []
+
+          -- formatting depends on |config files| (the number of config files)
+          message = case configFilesDoc of
+            (_ : _ : _ : _) ->
+              -- \|config files| > 2 => vertical list
+              text "Configuration is affected by the following files:" <+> configFilesVertList
+            [path1, path2] ->
+              text "Configuration is affected by '" <+> path1 <+> text "' and '" <+> path2 <+> text "'"
+            [path] ->
+              text
+                "Configuration is affected by '"
+                <+> path
+                <+> text "'"
+            [] ->
+              error "impossible" -- see `unless (null configFiles)` above
+            where
+              configFilesDoc = map docProjectConfigPath configFiles
+              configFilesVertList = docProjectConfigFiles configFiles
+
+          configFiles =
+            [ path
+            | Explicit path <-
+                Set.toList
+                  . (if verbosity >= verbose then id else onlyTopLevelProvenance)
+                  $ projectConfigProvenance projectConfig
+            ]
+
 configureCompiler
   :: Verbosity
   -> DistDirLayout
diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external-target.out b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external-target.out
index abca8b3cc98..f64c4b8359b 100644
--- a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external-target.out
+++ b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external-target.out
@@ -1,6 +1,5 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.external.project
+Configuration is affected by ' cabal.external.project '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external.out b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external.out
index d5aca3080fd..651fe767120 100644
--- a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external.out
+++ b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external.out
@@ -1,6 +1,5 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.external.project
+Configuration is affected by ' cabal.external.project '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal-target.out b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal-target.out
index f9dfec2b574..0ca53160dea 100644
--- a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal-target.out
+++ b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal-target.out
@@ -1,6 +1,5 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.internal.project
+Configuration is affected by ' cabal.internal.project '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.out b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.out
index 1bf07c32034..e34b93aa9de 100644
--- a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.out
+++ b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.out
@@ -1,6 +1,5 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.internal.project
+Configuration is affected by ' cabal.internal.project '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/cov.out b/cabal-testsuite/PackageTests/Backpack/Includes2/cov.out
index dde9cb4b37a..0d1b2c027b5 100644
--- a/cabal-testsuite/PackageTests/Backpack/Includes2/cov.out
+++ b/cabal-testsuite/PackageTests/Backpack/Includes2/cov.out
@@ -1,6 +1,4 @@
 # cabal test
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.out b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.out
index 5c8ce031497..4c50fb10fae 100644
--- a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.out
+++ b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.out
@@ -1,6 +1,5 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.external.project
+Configuration is affected by ' cabal.external.project '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -16,7 +15,8 @@ Configuring library for indef-0.1.0.0...
 Preprocessing library for indef-0.1.0.0...
 Building library instantiated with Data.Map = <Data.Map>
 for indef-0.1.0.0...
-Configuring library instantiated with Data.Map = containers-<VERSION>:Data.Map
+Configuring library instantiated with
+  Data.Map = containers-<VERSION>:Data.Map
 for indef-0.1.0.0...
 Preprocessing library for indef-0.1.0.0...
 Building library instantiated with Data.Map = containers-<VERSION>:Data.Map
diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.out b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.out
index 9597b8ca719..18532090aed 100644
--- a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.out
+++ b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.out
@@ -1,6 +1,5 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.internal.project
+Configuration is affected by ' cabal.internal.project '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -20,7 +19,8 @@ Configuring library 'indef' instantiated with
   Data.Map = containers-<VERSION>:Data.Map
 for I-0.1.0.0...
 Preprocessing library 'indef' for I-0.1.0.0...
-Building library 'indef' instantiated with Data.Map = containers-<VERSION>:Data.Map
+Building library 'indef' instantiated with
+  Data.Map = containers-<VERSION>:Data.Map
 for I-0.1.0.0...
 Configuring executable 'exe' for I-0.1.0.0...
 Preprocessing executable 'exe' for I-0.1.0.0...
diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-repo.out b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-repo.out
index d6033fc608c..9de9647984d 100644
--- a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-repo.out
+++ b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-repo.out
@@ -1,10 +1,8 @@
 # cabal v2-update
-Configuration is affected by the following files:
-- cabal.repo.project
+Configuration is affected by ' cabal.repo.project '
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.repo.project
+Configuration is affected by ' cabal.repo.project '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -22,7 +20,8 @@ Preprocessing library for indef-0.1.0.0...
 Building library instantiated with Data.Map = <Data.Map>
 for indef-0.1.0.0...
 Installing library in <PATH>
-Configuring library instantiated with Data.Map = containers-<VERSION>:Data.Map
+Configuring library instantiated with
+  Data.Map = containers-<VERSION>:Data.Map
 for indef-0.1.0.0...
 Preprocessing library for indef-0.1.0.0...
 Building library instantiated with Data.Map = containers-<VERSION>:Data.Map
diff --git a/cabal-testsuite/PackageTests/Backpack/Reexport2/cabal.out b/cabal-testsuite/PackageTests/Backpack/Reexport2/cabal.out
index 2709b24a4d8..31c9428dcaf 100644
--- a/cabal-testsuite/PackageTests/Backpack/Reexport2/cabal.out
+++ b/cabal-testsuite/PackageTests/Backpack/Reexport2/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error:
     Problem with module re-exports:
diff --git a/cabal-testsuite/PackageTests/Backpack/T6385/cabal.out b/cabal-testsuite/PackageTests/Backpack/T6385/cabal.out
index 7147f2ead8b..ad3387bf28b 100644
--- a/cabal-testsuite/PackageTests/Backpack/T6385/cabal.out
+++ b/cabal-testsuite/PackageTests/Backpack/T6385/cabal.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Backpack/bkpcabal01/cabal.out b/cabal-testsuite/PackageTests/Backpack/bkpcabal01/cabal.out
index 6308ceaefd3..3ebec1cc5c1 100644
--- a/cabal-testsuite/PackageTests/Backpack/bkpcabal01/cabal.out
+++ b/cabal-testsuite/PackageTests/Backpack/bkpcabal01/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/BuildAutogenPackageGuard/cabal.out b/cabal-testsuite/PackageTests/BuildAutogenPackageGuard/cabal.out
index 8224b23be46..512a50e37ee 100644
--- a/cabal-testsuite/PackageTests/BuildAutogenPackageGuard/cabal.out
+++ b/cabal-testsuite/PackageTests/BuildAutogenPackageGuard/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/BuildDeps/DepCycle/cabal.out b/cabal-testsuite/PackageTests/BuildDeps/DepCycle/cabal.out
index 053a770072e..966c934480b 100644
--- a/cabal-testsuite/PackageTests/BuildDeps/DepCycle/cabal.out
+++ b/cabal-testsuite/PackageTests/BuildDeps/DepCycle/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error:
     Dependency cycle between the following components:
diff --git a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out
index eced886a5e8..f00101f9ba2 100644
--- a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out
+++ b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out
index 92f3698edc6..a1636d8cbff 100644
--- a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out
+++ b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -13,8 +11,6 @@ Building executable 'my-exe' for pkg-1.0...
 # pkg my-exe
 local pkg-1.0
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out
index de46b91c396..482ff118031 100644
--- a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out
+++ b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/BuildToolDepends/setup.out b/cabal-testsuite/PackageTests/BuildToolDepends/setup.out
index 1c2bd108bca..9a873303de8 100644
--- a/cabal-testsuite/PackageTests/BuildToolDepends/setup.out
+++ b/cabal-testsuite/PackageTests/BuildToolDepends/setup.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/BuildToolDependsExternal/setup.out b/cabal-testsuite/PackageTests/BuildToolDependsExternal/setup.out
index 0600824409d..3190f4de608 100644
--- a/cabal-testsuite/PackageTests/BuildToolDependsExternal/setup.out
+++ b/cabal-testsuite/PackageTests/BuildToolDependsExternal/setup.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/BuildTools/External/cabal.out b/cabal-testsuite/PackageTests/BuildTools/External/cabal.out
index 8fee1586cdc..b61bf0f1886 100644
--- a/cabal-testsuite/PackageTests/BuildTools/External/cabal.out
+++ b/cabal-testsuite/PackageTests/BuildTools/External/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out b/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out
index 73d2639a82f..37cab90e663 100644
--- a/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out
+++ b/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/CmmSources/cabal.out b/cabal-testsuite/PackageTests/CmmSources/cabal.out
index f05bf7aa5a4..1664b64c7fc 100644
--- a/cabal-testsuite/PackageTests/CmmSources/cabal.out
+++ b/cabal-testsuite/PackageTests/CmmSources/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/CmmSourcesDyn/cabal.out b/cabal-testsuite/PackageTests/CmmSourcesDyn/cabal.out
index f05bf7aa5a4..1664b64c7fc 100644
--- a/cabal-testsuite/PackageTests/CmmSourcesDyn/cabal.out
+++ b/cabal-testsuite/PackageTests/CmmSourcesDyn/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/CmmSourcesExe/cabal.out b/cabal-testsuite/PackageTests/CmmSourcesExe/cabal.out
index 8ad5a59bac4..77b94906515 100644
--- a/cabal-testsuite/PackageTests/CmmSourcesExe/cabal.out
+++ b/cabal-testsuite/PackageTests/CmmSourcesExe/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ConfigFile/T8487/cabal.out b/cabal-testsuite/PackageTests/ConfigFile/T8487/cabal.out
index 507f9fc2ccb..bf17f93ac6c 100644
--- a/cabal-testsuite/PackageTests/ConfigFile/T8487/cabal.out
+++ b/cabal-testsuite/PackageTests/ConfigFile/T8487/cabal.out
@@ -1,6 +1,4 @@
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O2
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/CopyHie/cabal.out b/cabal-testsuite/PackageTests/CopyHie/cabal.out
index d6e8a9f3f42..a45daf37831 100644
--- a/cabal-testsuite/PackageTests/CopyHie/cabal.out
+++ b/cabal-testsuite/PackageTests/CopyHie/cabal.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/CustomSegfault/cabal.out b/cabal-testsuite/PackageTests/CustomSegfault/cabal.out
index 2c7f2ea0ddc..80f27e69b58 100644
--- a/cabal-testsuite/PackageTests/CustomSegfault/cabal.out
+++ b/cabal-testsuite/PackageTests/CustomSegfault/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/CustomTestCoverage/cabal.out b/cabal-testsuite/PackageTests/CustomTestCoverage/cabal.out
index f46d372f357..3bcf878f408 100644
--- a/cabal-testsuite/PackageTests/CustomTestCoverage/cabal.out
+++ b/cabal-testsuite/PackageTests/CustomTestCoverage/cabal.out
@@ -1,6 +1,4 @@
 # cabal test
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -13,7 +11,7 @@ Building test suite 'test' for plain-0.1.0.0...
 Running 1 test suites...
 Test suite test: RUNNING...
 Test suite test: PASS
-Test suite logged to: <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/test/plain-0.1.0.0-test.log
-Package coverage report written to <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/hpc/vanilla/html/hpc_index.html
+Test suite logged to: cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/test/plain-0.1.0.0-test.log
+Package coverage report written to cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/hpc/vanilla/html/hpc_index.html
 1 of 1 test suites (1 of 1 test cases) passed.
-Package coverage report written to <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/hpc/vanilla/html/hpc_index.html
+Package coverage report written to cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/plain-0.1.0.0/hpc/vanilla/html/hpc_index.html
diff --git a/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out b/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out
index b2e823ff426..74d7f6adf31 100644
--- a/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out
+++ b/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out b/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out
index 49829f86e53..0e26184375c 100644
--- a/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out
+++ b/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Exec/cabal.out b/cabal-testsuite/PackageTests/Exec/cabal.out
index 28952d14e4e..7ce2cfb90f0 100644
--- a/cabal-testsuite/PackageTests/Exec/cabal.out
+++ b/cabal-testsuite/PackageTests/Exec/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ExecModern/cabal.out b/cabal-testsuite/PackageTests/ExecModern/cabal.out
index 0e1b514edcb..fc4e1b601b3 100644
--- a/cabal-testsuite/PackageTests/ExecModern/cabal.out
+++ b/cabal-testsuite/PackageTests/ExecModern/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ExternalCommand/cabal.out b/cabal-testsuite/PackageTests/ExternalCommand/cabal.out
index a5139bb22a6..1c4c24db55c 100644
--- a/cabal-testsuite/PackageTests/ExternalCommand/cabal.out
+++ b/cabal-testsuite/PackageTests/ExternalCommand/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ExternalCommandEnv/cabal.out b/cabal-testsuite/PackageTests/ExternalCommandEnv/cabal.out
index a5139bb22a6..1c4c24db55c 100644
--- a/cabal-testsuite/PackageTests/ExternalCommandEnv/cabal.out
+++ b/cabal-testsuite/PackageTests/ExternalCommandEnv/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ExternalCommandExitCode/cabal.out b/cabal-testsuite/PackageTests/ExternalCommandExitCode/cabal.out
index a5139bb22a6..1c4c24db55c 100644
--- a/cabal-testsuite/PackageTests/ExternalCommandExitCode/cabal.out
+++ b/cabal-testsuite/PackageTests/ExternalCommandExitCode/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ExternalCommandHelp/cabal.out b/cabal-testsuite/PackageTests/ExternalCommandHelp/cabal.out
index a5139bb22a6..1c4c24db55c 100644
--- a/cabal-testsuite/PackageTests/ExternalCommandHelp/cabal.out
+++ b/cabal-testsuite/PackageTests/ExternalCommandHelp/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ExtraPackages/cabal.out b/cabal-testsuite/PackageTests/ExtraPackages/cabal.out
index 0ae87fbc8ef..95c356b73f6 100644
--- a/cabal-testsuite/PackageTests/ExtraPackages/cabal.out
+++ b/cabal-testsuite/PackageTests/ExtraPackages/cabal.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ExtraProgPath/setup.out b/cabal-testsuite/PackageTests/ExtraProgPath/setup.out
index 13729def443..125f3eb4c1d 100644
--- a/cabal-testsuite/PackageTests/ExtraProgPath/setup.out
+++ b/cabal-testsuite/PackageTests/ExtraProgPath/setup.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Warning: cannot determine version of <ROOT>/pkg-config :
 ""
 Warning: cannot determine version of <ROOT>/pkg-config :
diff --git a/cabal-testsuite/PackageTests/ExtraProgPathGlobal/setup.out b/cabal-testsuite/PackageTests/ExtraProgPathGlobal/setup.out
index c3836228383..2a10afd257f 100644
--- a/cabal-testsuite/PackageTests/ExtraProgPathGlobal/setup.out
+++ b/cabal-testsuite/PackageTests/ExtraProgPathGlobal/setup.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Warning: cannot determine version of <ROOT>/scripts/pkg-config :
 ""
 Warning: cannot determine version of <ROOT>/scripts/pkg-config :
diff --git a/cabal-testsuite/PackageTests/ExtraProgPathLocal/setup.out b/cabal-testsuite/PackageTests/ExtraProgPathLocal/setup.out
index 8bcc416af16..46981f014bf 100644
--- a/cabal-testsuite/PackageTests/ExtraProgPathLocal/setup.out
+++ b/cabal-testsuite/PackageTests/ExtraProgPathLocal/setup.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/FFI/CSourceDependsStub/cabal.out b/cabal-testsuite/PackageTests/FFI/CSourceDependsStub/cabal.out
index d7d7f802298..cdfe4ab10de 100644
--- a/cabal-testsuite/PackageTests/FFI/CSourceDependsStub/cabal.out
+++ b/cabal-testsuite/PackageTests/FFI/CSourceDependsStub/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.out b/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.out
index 2db68152992..97e0b60ec7c 100644
--- a/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.out
+++ b/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.out b/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.out
index a95271222aa..522304298c4 100644
--- a/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.out
+++ b/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/HaddockArgs/hoogle.out b/cabal-testsuite/PackageTests/HaddockArgs/hoogle.out
index 4f2b2103045..3aeb5d42e04 100644
--- a/cabal-testsuite/PackageTests/HaddockArgs/hoogle.out
+++ b/cabal-testsuite/PackageTests/HaddockArgs/hoogle.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/HaddockArgs/quickjump.out b/cabal-testsuite/PackageTests/HaddockArgs/quickjump.out
index 4e304d38ece..c892ec8e80a 100644
--- a/cabal-testsuite/PackageTests/HaddockArgs/quickjump.out
+++ b/cabal-testsuite/PackageTests/HaddockArgs/quickjump.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/HaddockBuildDepends/cabal.out b/cabal-testsuite/PackageTests/HaddockBuildDepends/cabal.out
index 8b0daaa45ad..8eff18e3d6c 100644
--- a/cabal-testsuite/PackageTests/HaddockBuildDepends/cabal.out
+++ b/cabal-testsuite/PackageTests/HaddockBuildDepends/cabal.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/HaddockProject/haddock-project.out b/cabal-testsuite/PackageTests/HaddockProject/haddock-project.out
index 4f21f859ad9..bfa16bf91c5 100644
--- a/cabal-testsuite/PackageTests/HaddockProject/haddock-project.out
+++ b/cabal-testsuite/PackageTests/HaddockProject/haddock-project.out
@@ -3,8 +3,6 @@ Downloading the latest package list from test-local-repo
 # cabal haddock-project
 Warning: haddock-project command is experimental, it might break in the future
 Resolving dependencies...
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - async-2.2.4 (lib) (requires build)
diff --git a/cabal-testsuite/PackageTests/HaddockWarn/cabal.out b/cabal-testsuite/PackageTests/HaddockWarn/cabal.out
index bdf609a5940..441f0c26334 100644
--- a/cabal-testsuite/PackageTests/HaddockWarn/cabal.out
+++ b/cabal-testsuite/PackageTests/HaddockWarn/cabal.out
@@ -1,5 +1,3 @@
 # cabal v2-haddock
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 No documentation was generated as this package does not contain a library. Perhaps you want to use the --haddock-all flag, or one or more of the --haddock-executables, --haddock-tests, --haddock-benchmarks or --haddock-internal flags.
diff --git a/cabal-testsuite/PackageTests/InternalLibraries/cabal-per-package.out b/cabal-testsuite/PackageTests/InternalLibraries/cabal-per-package.out
index fabb3eb96bf..72a24d04059 100644
--- a/cabal-testsuite/PackageTests/InternalLibraries/cabal-per-package.out
+++ b/cabal-testsuite/PackageTests/InternalLibraries/cabal-per-package.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error:
     Internal libraries only supported with per-component builds.
diff --git a/cabal-testsuite/PackageTests/InternalLibraries/cabal.out b/cabal-testsuite/PackageTests/InternalLibraries/cabal.out
index dce636019a9..fba3d64f472 100644
--- a/cabal-testsuite/PackageTests/InternalLibraries/cabal.out
+++ b/cabal-testsuite/PackageTests/InternalLibraries/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/JS/JsSources/other-arch.out b/cabal-testsuite/PackageTests/JS/JsSources/other-arch.out
index 5a9e791cfce..a07cc17dd35 100644
--- a/cabal-testsuite/PackageTests/JS/JsSources/other-arch.out
+++ b/cabal-testsuite/PackageTests/JS/JsSources/other-arch.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/JS/JsSourcesExe/other-arch.out b/cabal-testsuite/PackageTests/JS/JsSourcesExe/other-arch.out
index 441e8b14ba4..96e1bbadcf9 100644
--- a/cabal-testsuite/PackageTests/JS/JsSourcesExe/other-arch.out
+++ b/cabal-testsuite/PackageTests/JS/JsSourcesExe/other-arch.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ListBin/SelectedComponent/cabal.out b/cabal-testsuite/PackageTests/ListBin/SelectedComponent/cabal.out
index a3613ceff25..3728cc3e70e 100644
--- a/cabal-testsuite/PackageTests/ListBin/SelectedComponent/cabal.out
+++ b/cabal-testsuite/PackageTests/ListBin/SelectedComponent/cabal.out
@@ -1,6 +1,4 @@
 # cabal list-bin
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/MultiRepl/CabalMacros/cabal.out b/cabal-testsuite/PackageTests/MultiRepl/CabalMacros/cabal.out
index ec51444c0e4..9c141d7ac42 100644
--- a/cabal-testsuite/PackageTests/MultiRepl/CabalMacros/cabal.out
+++ b/cabal-testsuite/PackageTests/MultiRepl/CabalMacros/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/MultiRepl/EnabledClosure/cabal.out b/cabal-testsuite/PackageTests/MultiRepl/EnabledClosure/cabal.out
index 90c934d9535..8944a7dba34 100644
--- a/cabal-testsuite/PackageTests/MultiRepl/EnabledClosure/cabal.out
+++ b/cabal-testsuite/PackageTests/MultiRepl/EnabledClosure/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/MultiRepl/EnabledSucc/cabal.out b/cabal-testsuite/PackageTests/MultiRepl/EnabledSucc/cabal.out
index e077254e102..6571793245e 100644
--- a/cabal-testsuite/PackageTests/MultiRepl/EnabledSucc/cabal.out
+++ b/cabal-testsuite/PackageTests/MultiRepl/EnabledSucc/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/MultiRepl/ExtraOptions/cabal.out b/cabal-testsuite/PackageTests/MultiRepl/ExtraOptions/cabal.out
index ce8177d9bd9..2032e6d4542 100644
--- a/cabal-testsuite/PackageTests/MultiRepl/ExtraOptions/cabal.out
+++ b/cabal-testsuite/PackageTests/MultiRepl/ExtraOptions/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/MultiRepl/InternalLibs/cabal.out b/cabal-testsuite/PackageTests/MultiRepl/InternalLibs/cabal.out
index 31adc84d9fa..4ddb5e54b6b 100644
--- a/cabal-testsuite/PackageTests/MultiRepl/InternalLibs/cabal.out
+++ b/cabal-testsuite/PackageTests/MultiRepl/InternalLibs/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/MultiRepl/KeepTempFiles/cabal.no.out b/cabal-testsuite/PackageTests/MultiRepl/KeepTempFiles/cabal.no.out
index d114d56dca9..348fea760af 100644
--- a/cabal-testsuite/PackageTests/MultiRepl/KeepTempFiles/cabal.no.out
+++ b/cabal-testsuite/PackageTests/MultiRepl/KeepTempFiles/cabal.no.out
@@ -1,7 +1,5 @@
 # cabal clean
 # cabal v2-repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/MultiRepl/KeepTempFiles/cabal.yes.out b/cabal-testsuite/PackageTests/MultiRepl/KeepTempFiles/cabal.yes.out
index d114d56dca9..348fea760af 100644
--- a/cabal-testsuite/PackageTests/MultiRepl/KeepTempFiles/cabal.yes.out
+++ b/cabal-testsuite/PackageTests/MultiRepl/KeepTempFiles/cabal.yes.out
@@ -1,7 +1,5 @@
 # cabal clean
 # cabal v2-repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/MultiRepl/NotEnabledFail/cabal.multirepl-a.out b/cabal-testsuite/PackageTests/MultiRepl/NotEnabledFail/cabal.multirepl-a.out
index 108004e859e..3b38560a7d4 100644
--- a/cabal-testsuite/PackageTests/MultiRepl/NotEnabledFail/cabal.multirepl-a.out
+++ b/cabal-testsuite/PackageTests/MultiRepl/NotEnabledFail/cabal.multirepl-a.out
@@ -1,6 +1,4 @@
 # cabal v2-repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error: [Cabal-7076]
 Cannot open a repl for multiple components at once. The targets 'pkg-a' and 'pkg-b' refer to different components..
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/Failing/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/Failing/cabal.out
index a1a6e519a55..5dee45c63bd 100644
--- a/cabal-testsuite/PackageTests/MultipleLibraries/Failing/cabal.out
+++ b/cabal-testsuite/PackageTests/MultipleLibraries/Failing/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/Successful/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/Successful/cabal.out
index 48ccbdc36cb..272b9fc6b4c 100644
--- a/cabal-testsuite/PackageTests/MultipleLibraries/Successful/cabal.out
+++ b/cabal-testsuite/PackageTests/MultipleLibraries/Successful/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6083Post/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6083Post/cabal.out
index b0122dc2950..fb7bb90085f 100644
--- a/cabal-testsuite/PackageTests/MultipleLibraries/T6083Post/cabal.out
+++ b/cabal-testsuite/PackageTests/MultipleLibraries/T6083Post/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6083PostMixin/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6083PostMixin/cabal.out
index b0122dc2950..fb7bb90085f 100644
--- a/cabal-testsuite/PackageTests/MultipleLibraries/T6083PostMixin/cabal.out
+++ b/cabal-testsuite/PackageTests/MultipleLibraries/T6083PostMixin/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6083Pre/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6083Pre/cabal.out
index 0eae2556c8c..fbeef6a0af7 100644
--- a/cabal-testsuite/PackageTests/MultipleLibraries/T6083Pre/cabal.out
+++ b/cabal-testsuite/PackageTests/MultipleLibraries/T6083Pre/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6083PreMixin/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6083PreMixin/cabal.out
index 0eae2556c8c..fbeef6a0af7 100644
--- a/cabal-testsuite/PackageTests/MultipleLibraries/T6083PreMixin/cabal.out
+++ b/cabal-testsuite/PackageTests/MultipleLibraries/T6083PreMixin/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6894/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6894/cabal.out
index 8622b4f95be..8f3f3286d40 100644
--- a/cabal-testsuite/PackageTests/MultipleLibraries/T6894/cabal.out
+++ b/cabal-testsuite/PackageTests/MultipleLibraries/T6894/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBench/MultipleBenchmarks/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdBench/MultipleBenchmarks/cabal.out
index 8d3e71f53dd..cff1673e167 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdBench/MultipleBenchmarks/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdBench/MultipleBenchmarks/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-bench
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -12,8 +10,6 @@ Running 1 benchmarks...
 Benchmark foo: RUNNING...
 Benchmark foo: FINISH
 # cabal v2-bench
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - MultipleBenchmarks-1.0 (bench:bar) (first run)
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.out
index a962f5da6a4..84b8bdd781b 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-bench
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBench/WarningRTS/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdBench/WarningRTS/cabal.out
index 2f194d22dc1..84eec3eeae3 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdBench/WarningRTS/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdBench/WarningRTS/cabal.out
@@ -1,6 +1,4 @@
 # cabal bench
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Warning: Some RTS options were found standalone, which affect cabal and not the binary. Please note that +RTS inside the --benchmark-options argument suffices if your goal is to affect the benchmarked binary. For example, use "cabal test --benchmark-options='+RTS -N'" to pass the '-N' RTS option to your binary.
 Build profile: -w ghc-<GHCVER> -O1
@@ -13,8 +11,6 @@ Running 1 benchmarks...
 Benchmark foo: RUNNING...
 Benchmark foo: FINISH
 # cabal bench
-Configuration is affected by the following files:
-- cabal.project
 Warning: Some RTS options were found standalone, which affect cabal and not the binary. Please note that +RTS inside the --benchmark-options argument suffices if your goal is to affect the benchmarked binary. For example, use "cabal test --benchmark-options='+RTS -N'" to pass the '-N' RTS option to your binary.
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -25,8 +21,6 @@ Running 1 benchmarks...
 Benchmark foo: RUNNING...
 Benchmark foo: FINISH
 # cabal bench
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - WarningRTS-1.0 (bench:foo) (first run)
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/OnlyConfigure/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/OnlyConfigure/cabal.out
index 7de34d52b59..594f392e735 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/OnlyConfigure/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/OnlyConfigure/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -9,8 +7,6 @@ In order, the following will be built:
 Configuring library for OnlyConfigure-1.0...
 Configuring executable 'foo' for OnlyConfigure-1.0...
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -21,8 +17,6 @@ Configuring library for OnlyConfigure-1.0...
 Configuring test suite 'bar' for OnlyConfigure-1.0...
 Configuring executable 'foo' for OnlyConfigure-1.0...
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdClean/CleanSourceRepositoryPackage/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdClean/CleanSourceRepositoryPackage/cabal.out
index f3429841e3c..e4f538647f6 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdClean/CleanSourceRepositoryPackage/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdClean/CleanSourceRepositoryPackage/cabal.out
@@ -1,6 +1,4 @@
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdExec/GhcInvocation/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdExec/GhcInvocation/cabal.out
index 7e96d11422f..437714d34bd 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdExec/GhcInvocation/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdExec/GhcInvocation/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -9,5 +7,3 @@ Configuring library for inplace-dep-1.0...
 Preprocessing library for inplace-dep-1.0...
 Building library for inplace-dep-1.0...
 # cabal v2-exec
-Configuration is affected by the following files:
-- cabal.project
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdExec/RunExe/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdExec/RunExe/cabal.out
index 691cbb03f6f..2ae9f2a0fd4 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdExec/RunExe/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdExec/RunExe/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -9,5 +7,3 @@ Configuring executable 'foo' for RunExe-1.0...
 Preprocessing executable 'foo' for RunExe-1.0...
 Building executable 'foo' for RunExe-1.0...
 # cabal v2-exec
-Configuration is affected by the following files:
-- cabal.project
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Datafiles/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Datafiles/cabal.out
index ba2ac3912ac..8893a5acdc9 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Datafiles/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Datafiles/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -9,8 +7,6 @@ Configuring executable 'foo' for foo-1.0...
 Preprocessing executable 'foo' for foo-1.0...
 Building executable 'foo' for foo-1.0...
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - foo-1.0 (lib) (first run)
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExeAndLib/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExeAndLib/cabal.out
index 4417a2fb4c8..02391a63734 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExeAndLib/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExeAndLib/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -9,7 +7,5 @@ Configuring executable 'foo' for ExeAndLib-1.0...
 Preprocessing executable 'foo' for ExeAndLib-1.0...
 Building executable 'foo' for ExeAndLib-1.0...
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7070]
 The run command is for running executables, but the target 'ExeAndLib' refers to the library ExeAndLib from the package ExeAndLib-1.0.
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExitCodePropagation/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExitCodePropagation/cabal.out
index d2cbf7245af..0cf6a51332f 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExitCodePropagation/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExitCodePropagation/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultipleExes/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultipleExes/cabal.out
index b5e1175e983..2223a88a94c 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultipleExes/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultipleExes/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -9,8 +7,6 @@ Configuring executable 'foo' for MultipleExes-1.0...
 Preprocessing executable 'foo' for MultipleExes-1.0...
 Building executable 'foo' for MultipleExes-1.0...
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - MultipleExes-1.0 (exe:bar) (first run)
@@ -18,18 +14,12 @@ Configuring executable 'bar' for MultipleExes-1.0...
 Preprocessing executable 'bar' for MultipleExes-1.0...
 Building executable 'bar' for MultipleExes-1.0...
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7070]
 The run command is for running a single executable at once. The target '' refers to the package MultipleExes-1.0 which includes 
 - executables: bar and foo
 
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7070]
 The run command is for running a single executable at once. The target 'MultipleExes' refers to the package MultipleExes-1.0 which includes 
 - executables: bar and foo
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.out
index 54b0387e0e1..7f851dca6a8 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -9,11 +7,7 @@ Configuring executable 'bar-exe' for bar-1.0...
 Preprocessing executable 'bar-exe' for bar-1.0...
 Building executable 'bar-exe' for bar-1.0...
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - foo-1.0 (exe:foo-exe) (first run)
@@ -21,8 +15,6 @@ Configuring executable 'foo-exe' for foo-1.0...
 Preprocessing executable 'foo-exe' for foo-1.0...
 Building executable 'foo-exe' for foo-1.0...
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - bar-1.0 (exe:foo-exe) (first run)
@@ -30,28 +22,20 @@ Configuring executable 'foo-exe' for bar-1.0...
 Preprocessing executable 'foo-exe' for bar-1.0...
 Building executable 'foo-exe' for bar-1.0...
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7135]
 No targets given and there is no package in the current directory. Specify packages or components by name or location. See 'cabal build --help' for more details on target options.
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7070]
 The run command is for running a single executable at once. The target 'bar' refers to the package bar-1.0 which includes 
 - executables: bar-exe and foo-exe
 
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7132]
 Ambiguous target 'foo-exe'. It could be:
     bar:foo-exe (component)
    foo:foo-exe (component)
 
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7131]
 Unknown target 'foo:bar-exe'.
 The package foo has no component 'bar-exe'.
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/RunMainBad/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/RunMainBad/cabal.out
index d836bcbed00..25b71f37cce 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/RunMainBad/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/RunMainBad/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error: [Cabal-7070]
 The run command can only run an executable as a whole, not files or modules within them, but the target 'Main.hs' refers to the file Main.hs in the executable foo.
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.out
index 54fa7f05e1c..55dc76f3a0d 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.out
@@ -1,7 +1,5 @@
 # cabal v2-run
 Warning: The package description file ./script.cabal has warnings: script.cabal:0:0: A package using 'cabal-version: >=1.10' must use section syntax. See the Cabal user guide for details.
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptBad/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptBad/cabal.out
index 076b432b019..69aeb3f5d61 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptBad/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptBad/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
 Warning: The package description file ./script.cabal has warnings: script.cabal:0:0: A package using 'cabal-version: >=1.10' must use section syntax. See the Cabal user guide for details.
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7121]
 Failed extracting script block: `{- cabal:` start marker not found
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.out
index 5ebd9d91f5c..c8c27376397 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.out
@@ -1,7 +1,5 @@
 # cabal v2-run
 Warning: The package description file ./script.cabal has warnings: script.cabal:0:0: A package using 'cabal-version: >=1.10' must use section syntax. See the Cabal user guide for details.
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Single/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Single/cabal.out
index 1599052effd..2d03fa7af39 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Single/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Single/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -9,19 +7,9 @@ Configuring executable 'foo' for Single-1.0...
 Preprocessing executable 'foo' for Single-1.0...
 Building executable 'foo' for Single-1.0...
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7070]
 Cannot run the package bar, it is not in this project (either directly or indirectly). If you want to add it to the project then edit the cabal.project file.
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/WarningRTS/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/WarningRTS/cabal.out
index ac29846553e..a7f6033bb1d 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/WarningRTS/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/WarningRTS/cabal.out
@@ -1,6 +1,4 @@
 # cabal run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Warning: Your RTS options are applied to cabal, not the executable. Use '--' to separate cabal options from your executable options. For example, use 'cabal run -- +RTS -N to pass the '-N' RTS option to your executable.
 Build profile: -w ghc-<GHCVER> -O1
@@ -10,9 +8,5 @@ Configuring executable 'foo' for WarningRTS-1.0...
 Preprocessing executable 'foo' for WarningRTS-1.0...
 Building executable 'foo' for WarningRTS-1.0...
 # cabal run
-Configuration is affected by the following files:
-- cabal.project
 Warning: Your RTS options are applied to cabal, not the executable. Use '--' to separate cabal options from your executable options. For example, use 'cabal run -- +RTS -N to pass the '-N' RTS option to your executable.
 # cabal run
-Configuration is affected by the following files:
-- cabal.project
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.out
index 959dedbdb61..55aac7326b6 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-test
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdTest/WarningRTS/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdTest/WarningRTS/cabal.out
index c16c641e235..aef2481eac8 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdTest/WarningRTS/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdTest/WarningRTS/cabal.out
@@ -1,6 +1,4 @@
 # cabal test
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Warning: Some RTS options were found standalone, which affect cabal and not the binary. Please note that +RTS inside the --test-options argument suffices if your goal is to affect the tested binary. For example, use "cabal test --test-options='+RTS -N'" to pass the '-N' RTS option to your binary.
 Build profile: -w ghc-<GHCVER> -O1
@@ -15,8 +13,6 @@ Test suite foo: PASS
 Test suite logged to: <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/WarningRTS-1.0/t/foo/test/WarningRTS-1.0-foo.log
 1 of 1 test suites (1 of 1 test cases) passed.
 # cabal test
-Configuration is affected by the following files:
-- cabal.project
 Warning: Some RTS options were found standalone, which affect cabal and not the binary. Please note that +RTS inside the --test-options argument suffices if your goal is to affect the tested binary. For example, use "cabal test --test-options='+RTS -N'" to pass the '-N' RTS option to your binary.
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -29,8 +25,6 @@ Test suite foo: PASS
 Test suite logged to: <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/WarningRTS-1.0/t/foo/test/WarningRTS-1.0-foo.log
 1 of 1 test suites (1 of 1 test cases) passed.
 # cabal test
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - WarningRTS-1.0 (test:foo) (first run)
diff --git a/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out b/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out
index 20490c7cbd5..93f0fd7f938 100644
--- a/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -11,8 +9,6 @@ Building executable 'q' for q-0.1.0.0...
 Error: [Cabal-7125]
 Failed to build q-0.1.0.0-inplace-q.
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.out
index 3769d3ba3f7..bb8adff32b7 100644
--- a/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out
index 0d86c44624e..2175160b583 100644
--- a/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out
index e91a6fe2c15..2b684028ae0 100644
--- a/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -13,6 +11,4 @@ Configuring library for q-1.0...
 Preprocessing library for q-1.0...
 Building library for q-1.0...
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Up to date
diff --git a/cabal-testsuite/PackageTests/NewBuild/T4477/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T4477/cabal.out
index 5904b7d5372..e8c59896590 100644
--- a/cabal-testsuite/PackageTests/NewBuild/T4477/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/T4477/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-run
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewBuild/T8875/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T8875/cabal.out
index 9a1118c9b2f..7bb94dd545c 100644
--- a/cabal-testsuite/PackageTests/NewBuild/T8875/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/T8875/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewConfigure/ConfigFile/cabal.out b/cabal-testsuite/PackageTests/NewConfigure/ConfigFile/cabal.out
index 90a93d8bd2f..455462313df 100644
--- a/cabal-testsuite/PackageTests/NewConfigure/ConfigFile/cabal.out
+++ b/cabal-testsuite/PackageTests/NewConfigure/ConfigFile/cabal.out
@@ -1,12 +1,6 @@
 # cabal v2-configure
 Warning: The package description file ./ConfigFile.cabal has warnings: ConfigFile.cabal:0:0: A package using 'cabal-version: >=1.10' must use section syntax. See the Cabal user guide for details.
-Configuration is affected by the following files:
-- cabal.project
 Config file not written due to flag(s).
 # cabal v2-configure
-Configuration is affected by the following files:
-- cabal.project
 Config file not written due to flag(s).
 # cabal v2-configure
-Configuration is affected by the following files:
-- cabal.project
diff --git a/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out b/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out
index 14c74f590ec..22bf8389a6d 100644
--- a/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out
+++ b/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out
@@ -1,10 +1,5 @@
 # cabal v2-configure
-Configuration is affected by the following files:
-- cabal.project
-- cabal.project.local
 'cabal.project.local' already exists, backing it up to 'cabal.project.local~'.
 # cabal v2-configure
-Configuration is affected by the following files:
-- foo.project
-- foo.project.local
+Configuration is affected by ' foo.project ' and ' foo.project.local '
 'foo.project.local' already exists, backing it up to 'foo.project.local~'.
diff --git a/cabal-testsuite/PackageTests/NewFreeze/BuildTools/new_freeze.out b/cabal-testsuite/PackageTests/NewFreeze/BuildTools/new_freeze.out
index 2cc44b9016b..5115aa9414b 100644
--- a/cabal-testsuite/PackageTests/NewFreeze/BuildTools/new_freeze.out
+++ b/cabal-testsuite/PackageTests/NewFreeze/BuildTools/new_freeze.out
@@ -2,8 +2,6 @@
 Downloading the latest package list from test-local-repo
 # cabal v2-build
 Warning: The package description file ./my-local-package.cabal has warnings: my-local-package.cabal:3:23: Packages with 'cabal-version: 1.12' or later should specify a specific version of the Cabal spec of the form 'cabal-version: x.y'. Use 'cabal-version: 1.20'.
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
@@ -12,15 +10,11 @@ In order, the following would be built:
  - my-library-dep-1.0 (lib) (requires build)
  - my-local-package-1.0 (lib) (first run)
 # cabal v2-freeze
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Wrote freeze file: <ROOT>/cabal.project.freeze
 # cabal v2-build
 Warning: The package description file ./my-local-package.cabal has warnings: my-local-package.cabal:3:23: Packages with 'cabal-version: 1.12' or later should specify a specific version of the Cabal spec of the form 'cabal-version: x.y'. Use 'cabal-version: 1.20'.
-Configuration is affected by the following files:
-- cabal.project
-- cabal.project.freeze
+Configuration is affected by ' cabal.project ' and ' cabal.project.freeze '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
diff --git a/cabal-testsuite/PackageTests/NewFreeze/Flags/new_freeze.out b/cabal-testsuite/PackageTests/NewFreeze/Flags/new_freeze.out
index 8adf0bf2702..1bde7292c57 100644
--- a/cabal-testsuite/PackageTests/NewFreeze/Flags/new_freeze.out
+++ b/cabal-testsuite/PackageTests/NewFreeze/Flags/new_freeze.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
@@ -10,14 +8,10 @@ In order, the following would be built:
  - my-library-dep-1.0 (lib) (requires build)
  - my-local-package-1.0 (lib) (first run)
 # cabal v2-freeze
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Wrote freeze file: <ROOT>/cabal.project.freeze
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
-- cabal.project.freeze
+Configuration is affected by ' cabal.project ' and ' cabal.project.freeze '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
diff --git a/cabal-testsuite/PackageTests/NewFreeze/FreezeFile/new_freeze.out b/cabal-testsuite/PackageTests/NewFreeze/FreezeFile/new_freeze.out
index f07819538f4..fa3e95b3afe 100644
--- a/cabal-testsuite/PackageTests/NewFreeze/FreezeFile/new_freeze.out
+++ b/cabal-testsuite/PackageTests/NewFreeze/FreezeFile/new_freeze.out
@@ -1,30 +1,20 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
  - my-library-dep-2.0 (lib) (requires build)
  - my-local-package-1.0 (exe:my-exe) (first run)
 # cabal v2-freeze
-Configuration is affected by the following files:
-- cabal.project
 Freeze file not written due to flag(s)
 # cabal v2-freeze
-Configuration is affected by the following files:
-- cabal.project
 Freeze file not written due to flag(s)
 # cabal v2-freeze
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Wrote freeze file: <ROOT>/cabal.project.freeze
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
-- cabal.project.freeze
+Configuration is affected by ' cabal.project ' and ' cabal.project.freeze '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -38,19 +28,13 @@ Configuring executable 'my-exe' for my-local-package-1.0...
 Preprocessing executable 'my-exe' for my-local-package-1.0...
 Building executable 'my-exe' for my-local-package-1.0...
 # cabal v2-freeze
-Configuration is affected by the following files:
-- cabal.project
-- cabal.project.freeze
+Configuration is affected by ' cabal.project ' and ' cabal.project.freeze '
 Wrote freeze file: <ROOT>/cabal.project.freeze
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
  - my-library-dep-2.0 (lib) (requires build)
  - my-local-package-1.0 (exe:my-exe) (configuration changed)
 # cabal v2-freeze
-Configuration is affected by the following files:
-- cabal.project
 Wrote freeze file: <ROOT>/cabal.project.freeze
diff --git a/cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out
index 5d630e959d4..0683a3921ce 100644
--- a/cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out
+++ b/cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal haddock
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out
index 19689952971..bb0ee5b906d 100644
--- a/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out
+++ b/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -11,8 +9,6 @@ Building library for example-1.0...
 Error: [Cabal-7125]
 Failed to build example-1.0-inplace.
 # cabal v2-haddock
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - example-1.0 (lib) (configuration changed)
diff --git a/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockForHackageCmdOutput/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockForHackageCmdOutput/cabal.out
index 64bbea860f0..5a0ba914174 100644
--- a/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockForHackageCmdOutput/cabal.out
+++ b/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockForHackageCmdOutput/cabal.out
@@ -1,6 +1,4 @@
 # cabal haddock
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputCmd/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputCmd/cabal.out
index 6cfdece7f8d..38614b49b84 100644
--- a/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputCmd/cabal.out
+++ b/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputCmd/cabal.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal haddock
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputConfig/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputConfig/cabal.out
index 6cfdece7f8d..38614b49b84 100644
--- a/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputConfig/cabal.out
+++ b/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputConfig/cabal.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal haddock
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out
index 002abb6a29a..32f39065358 100644
--- a/cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out
+++ b/cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal haddock
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/NewSdist/DeterministicTrivial/deterministic.out b/cabal-testsuite/PackageTests/NewSdist/DeterministicTrivial/deterministic.out
index aa041be7ed4..12cb0bf408c 100644
--- a/cabal-testsuite/PackageTests/NewSdist/DeterministicTrivial/deterministic.out
+++ b/cabal-testsuite/PackageTests/NewSdist/DeterministicTrivial/deterministic.out
@@ -1,4 +1,2 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Wrote tarball sdist to <ROOT>/dist-newstyle/sdist/deterministic-0.tar.gz
diff --git a/cabal-testsuite/PackageTests/NewSdist/Globbing/cabal.out b/cabal-testsuite/PackageTests/NewSdist/Globbing/cabal.out
index a0d41690c88..c28bd059b30 100644
--- a/cabal-testsuite/PackageTests/NewSdist/Globbing/cabal.out
+++ b/cabal-testsuite/PackageTests/NewSdist/Globbing/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 a/Main.hs
 a/a.cabal
 a/doc/index.html
diff --git a/cabal-testsuite/PackageTests/NewSdist/ManyDataFiles/many-data-files.out b/cabal-testsuite/PackageTests/NewSdist/ManyDataFiles/many-data-files.out
index 42bf006f13e..926e5a2560e 100644
--- a/cabal-testsuite/PackageTests/NewSdist/ManyDataFiles/many-data-files.out
+++ b/cabal-testsuite/PackageTests/NewSdist/ManyDataFiles/many-data-files.out
@@ -1,4 +1,2 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Wrote tarball sdist to <ROOT>/dist-newstyle/sdist/many-data-files-0.tar.gz
diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-output-dir.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-output-dir.out
index f8fbb9a2c41..abcbfc25590 100644
--- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-output-dir.out
+++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-output-dir.out
@@ -1,5 +1,3 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Wrote tarball sdist to <ROOT>/archives/a-0.1.tar.gz
 Wrote tarball sdist to <ROOT>/archives/b-0.1.tar.gz
diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-sute.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-sute.out
index cf7d268fa44..83628c9a8e2 100644
--- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-sute.out
+++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-sute.out
@@ -1,5 +1,3 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7151]
 It is not possible to package only the test suites from a package for distribution. Only entire packages may be packaged for distribution.
diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all.out
index bd7eb8add5b..e370f410fe4 100644
--- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all.out
+++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all.out
@@ -1,5 +1,3 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Wrote tarball sdist to <ROOT>/dist-newstyle/sdist/a-0.1.tar.gz
 Wrote tarball sdist to <ROOT>/dist-newstyle/sdist/b-0.1.tar.gz
diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/list-sources-output-dir.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/list-sources-output-dir.out
index 2b9f08b3e5a..64b8452177f 100644
--- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/list-sources-output-dir.out
+++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/list-sources-output-dir.out
@@ -1,5 +1,3 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Wrote source list to <ROOT>/lists/a-0.1.list
 Wrote source list to <ROOT>/lists/b-0.1.list
diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-archive-to-stdout.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-archive-to-stdout.out
index b0670909503..e8bc3312c87 100644
--- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-archive-to-stdout.out
+++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-archive-to-stdout.out
@@ -1,5 +1,3 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7152]
 Can't write multiple tarballs to standard output!
diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-list-sources.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-list-sources.out
index ffb2f9afe32..dd464def39a 100644
--- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-list-sources.out
+++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-list-sources.out
@@ -1,6 +1,4 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 a/Main.hs
 a/Test.hs
 a/a.cabal
diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-target.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-target.out
index bd7eb8add5b..e370f410fe4 100644
--- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-target.out
+++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-target.out
@@ -1,5 +1,3 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Wrote tarball sdist to <ROOT>/dist-newstyle/sdist/a-0.1.tar.gz
 Wrote tarball sdist to <ROOT>/dist-newstyle/sdist/b-0.1.tar.gz
diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/target-remote-package.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/target-remote-package.out
index 2265a38e933..386eaff9b13 100644
--- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/target-remote-package.out
+++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/target-remote-package.out
@@ -1,5 +1,3 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7151]
 The package base cannot be packaged for distribution, because it is not local to this project.
diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out
index 4da566899a8..6c1e881f806 100644
--- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out
+++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out
@@ -1,5 +1,3 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7151]
 The component test suite 'a-tests' cannot be packaged for distribution on its own. Only entire packages may be packaged for distribution.
diff --git a/cabal-testsuite/PackageTests/NewSdist/NullTerminated/cabal.out b/cabal-testsuite/PackageTests/NewSdist/NullTerminated/cabal.out
index 23597943ecd587ce44317291a4288a6d6653a692..90c82a7d6c4b247aeb6a4e609a5a95e76fb2ad78 100644
GIT binary patch
delta 21
ccmd1S<X2WmPE1P7Q7ALgEl$ZSo){<v072#kegFUf

delta 87
zcmdPQ4pdf1PE1P7Q7ALgEl$ZSF5z;{&r8cpFD*(e$;{7F$ShV!OiN2mE=f&MNUBsQ
m$w*a5%g@QlFVD<NS4hjuNiDYG(uEkIS5TCnm6|+}UkU&)s2*1U

diff --git a/cabal-testsuite/PackageTests/OfflineFlag/offlineFlag.out b/cabal-testsuite/PackageTests/OfflineFlag/offlineFlag.out
index 80ca07ddddd..143c8a0d3e3 100644
--- a/cabal-testsuite/PackageTests/OfflineFlag/offlineFlag.out
+++ b/cabal-testsuite/PackageTests/OfflineFlag/offlineFlag.out
@@ -1,10 +1,8 @@
 # cabal v2-update
-Configuration is affected by the following files:
-- cabal.repo.project
+Configuration is affected by ' cabal.repo.project '
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.repo.project
+Configuration is affected by ' cabal.repo.project '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -13,8 +11,7 @@ In order, the following will be built:
 Error: [Cabal-7125]
 --offline was specified, hence refusing to download the package: remote version 0.1.0.0.
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.repo.project
+Configuration is affected by ' cabal.repo.project '
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - remote-0.1.0.0 (lib) (requires build)
@@ -27,6 +24,5 @@ Configuring executable 'current' for current-0.1.0.0...
 Preprocessing executable 'current' for current-0.1.0.0...
 Building executable 'current' for current-0.1.0.0...
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.repo.project
+Configuration is affected by ' cabal.repo.project '
 Up to date
diff --git a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-base.out b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-base.out
index 06e5d066600..506ac48f14e 100644
--- a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-base.out
+++ b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-base.out
@@ -8,8 +8,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for p-1.0...
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-p.out b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-p.out
index 4367c22aea3..2235fc32f50 100644
--- a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-p.out
+++ b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-p.out
@@ -8,8 +8,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for p-1.0...
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-packagedbs.out b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-packagedbs.out
index 941aa1c2f51..5697c77102c 100644
--- a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-packagedbs.out
+++ b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-packagedbs.out
@@ -1,5 +1,3 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-2300]
 No package databases have been specified. If you use --package-db=clear, you must follow it with --package-db= with 'global', 'user' or a specific file.
diff --git a/cabal-testsuite/PackageTests/PackageDB/cabal-manual-packagedb.out b/cabal-testsuite/PackageTests/PackageDB/cabal-manual-packagedb.out
index 6570a93a7c5..e1c59d1cbb8 100644
--- a/cabal-testsuite/PackageTests/PackageDB/cabal-manual-packagedb.out
+++ b/cabal-testsuite/PackageTests/PackageDB/cabal-manual-packagedb.out
@@ -8,8 +8,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for p-1.0...
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/PackageDB/cabal-packagedb.out b/cabal-testsuite/PackageTests/PackageDB/cabal-packagedb.out
index 6570a93a7c5..e1c59d1cbb8 100644
--- a/cabal-testsuite/PackageTests/PackageDB/cabal-packagedb.out
+++ b/cabal-testsuite/PackageTests/PackageDB/cabal-packagedb.out
@@ -8,8 +8,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for p-1.0...
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Path/Config/cabal.out b/cabal-testsuite/PackageTests/Path/Config/cabal.out
index 8e963e3eb4c..4bfc7b52616 100644
--- a/cabal-testsuite/PackageTests/Path/Config/cabal.out
+++ b/cabal-testsuite/PackageTests/Path/Config/cabal.out
@@ -53,16 +53,13 @@ test-dir
 # cabal path
 <ROOT>/cabal.dist/home/.cabal
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 <ROOT>/cabal.dist/home/.cabal
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 {"cabal-version":"<CABAL_INSTALL_VER>","cache-home":"<ROOT>/cabal.dist/home/.cabal"}
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 <ROOT>/cabal.dist/home/.cabal
 # cabal path
 my-cache-dir
@@ -77,16 +74,13 @@ my-cache-dir
 # cabal path
 <ROOT>/cabal.dist/home/.cabal/packages
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 my-cache-dir
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 {"cabal-version":"<CABAL_INSTALL_VER>","remote-repo-cache":"my-cache-dir"}
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 my-cache-dir
 # cabal path
 my-logs-dir
@@ -101,16 +95,13 @@ my-logs-dir
 # cabal path
 <ROOT>/cabal.dist/home/.cabal/logs
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 my-logs-dir
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 {"cabal-version":"<CABAL_INSTALL_VER>","logs-dir":"my-logs-dir"}
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 my-logs-dir
 # cabal path
 my-store-dir
@@ -125,16 +116,13 @@ my-store-dir
 # cabal path
 <ROOT>/cabal.dist/home/.cabal/store
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 my-store-dir
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 {"cabal-version":"<CABAL_INSTALL_VER>","store-dir":"my-store-dir"}
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 my-store-dir
 # cabal path
 fake-cabal.config
@@ -149,16 +137,13 @@ fake-cabal.config
 # cabal path
 <ROOT>/cabal.dist/home/.cabal/config
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 fake-cabal.config
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 {"cabal-version":"<CABAL_INSTALL_VER>","config-file":"fake-cabal.config"}
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 fake-cabal.config
 # cabal path
 my-installdir
@@ -173,14 +158,11 @@ my-installdir
 # cabal path
 <ROOT>/cabal.dist/home/.cabal/bin
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 my-installdir
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 {"cabal-version":"<CABAL_INSTALL_VER>","installdir":"my-installdir"}
 # cabal path
-Configuration is affected by the following files:
-- fake.cabal.project
+Configuration is affected by ' fake.cabal.project '
 my-installdir
diff --git a/cabal-testsuite/PackageTests/Project/CoverageProject/cabal.out b/cabal-testsuite/PackageTests/Project/CoverageProject/cabal.out
index 3b7c1d4b788..1278857b31d 100644
--- a/cabal-testsuite/PackageTests/Project/CoverageProject/cabal.out
+++ b/cabal-testsuite/PackageTests/Project/CoverageProject/cabal.out
@@ -1,6 +1,4 @@
 # cabal test
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ProjectConfig/FlagsSemigroup/cabal.out b/cabal-testsuite/PackageTests/ProjectConfig/FlagsSemigroup/cabal.out
index 6a635b71ab1..b9929ed847c 100644
--- a/cabal-testsuite/PackageTests/ProjectConfig/FlagsSemigroup/cabal.out
+++ b/cabal-testsuite/PackageTests/ProjectConfig/FlagsSemigroup/cabal.out
@@ -1,6 +1,4 @@
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/cabal.out b/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/cabal.out
index 94ff8af283a..8cf00f669a4 100644
--- a/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/cabal.out
+++ b/cabal-testsuite/PackageTests/ProjectImport/UntrimmedImport/cabal.out
@@ -3,12 +3,9 @@
 Warning: import has leading or trailing whitespace;
   'https://www.stackage.org/nightly-2024-12-05/cabal.config '
     imported by: trailing-space.project
-Configuration is affected by the following files:
-- trailing-space.project
-- with-ghc.config
-    imported by: trailing-space.project
-- https://www.stackage.org/nightly-2024-12-05/cabal.config
-    imported by: trailing-space.project
+Configuration is affected by the following files: - trailing-space.project
+                                                  - with-ghc.config
+                                                  - https://www.stackage.org/nightly-2024-12-05/cabal.config
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
@@ -18,12 +15,9 @@ In order, the following would be built:
 Warning: import has leading or trailing whitespace;
   'https://www.stackage.org/nightly-2024-12-05/cabal.config		   '
     imported by: tabs-and-spaces.project
-Configuration is affected by the following files:
-- tabs-and-spaces.project
-- with-ghc.config
-    imported by: tabs-and-spaces.project
-- https://www.stackage.org/nightly-2024-12-05/cabal.config
-    imported by: tabs-and-spaces.project
+Configuration is affected by the following files: - tabs-and-spaces.project
+                                                  - with-ghc.config
+                                                  - https://www.stackage.org/nightly-2024-12-05/cabal.config
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out b/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out
index c5daa27101f..7bc5e2e63a6 100644
--- a/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out
+++ b/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T4202/cabal.out b/cabal-testsuite/PackageTests/Regression/T4202/cabal.out
index 426ccd41ed8..a7bae1abdb2 100644
--- a/cabal-testsuite/PackageTests/Regression/T4202/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T4202/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -13,16 +11,12 @@ Configuring executable 'qexe' for q-1.0...
 Preprocessing executable 'qexe' for q-1.0...
 Building executable 'qexe' for q-1.0...
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - p-1.0 (lib) (file P.hs changed)
 Preprocessing library for p-1.0...
 Building library for p-1.0...
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - q-1.0 (exe:qexe) (file <ROOT>/cabal.dist/work/dist/build/<ARCH>/ghc-<GHCVER>/p-1.0/cache/build changed)
diff --git a/cabal-testsuite/PackageTests/Regression/T4720/cabal.out b/cabal-testsuite/PackageTests/Regression/T4720/cabal.out
index 34903b832da..3cf3d3afe28 100644
--- a/cabal-testsuite/PackageTests/Regression/T4720/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T4720/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T4798/cabal.out b/cabal-testsuite/PackageTests/Regression/T4798/cabal.out
index 55571a3f647..05de54b124c 100644
--- a/cabal-testsuite/PackageTests/Regression/T4798/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T4798/cabal.out
@@ -1,6 +1,4 @@
 # cabal test
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T4986/cabal.out b/cabal-testsuite/PackageTests/Regression/T4986/cabal.out
index fdec868d0a5..81c539fdb0a 100644
--- a/cabal-testsuite/PackageTests/Regression/T4986/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T4986/cabal.out
@@ -1,3 +1 @@
 # cabal v2-configure
-Configuration is affected by the following files:
-- cabal.project
diff --git a/cabal-testsuite/PackageTests/Regression/T5213/cabal.out b/cabal-testsuite/PackageTests/Regression/T5213/cabal.out
index 799c2005c0b..fb0e7ad7a9a 100644
--- a/cabal-testsuite/PackageTests/Regression/T5213/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T5213/cabal.out
@@ -1,6 +1,4 @@
 # cabal new-test
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T5213ExeCoverage/cabal.out b/cabal-testsuite/PackageTests/Regression/T5213ExeCoverage/cabal.out
index 1aaf72ce762..57cb186d882 100644
--- a/cabal-testsuite/PackageTests/Regression/T5213ExeCoverage/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T5213ExeCoverage/cabal.out
@@ -1,6 +1,4 @@
 # cabal new-test
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T5309/cabal.out b/cabal-testsuite/PackageTests/Regression/T5309/cabal.out
index a2f7566f38a..e799843e5b6 100644
--- a/cabal-testsuite/PackageTests/Regression/T5309/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T5309/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -17,8 +15,6 @@ Configuring executable 'exe-with-lib' for T5309-1.0.0.0...
 Preprocessing executable 'exe-with-lib' for T5309-1.0.0.0...
 Building executable 'exe-with-lib' for T5309-1.0.0.0...
 # cabal v2-test
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - T5309-1.0.0.0 (test:test-no-lib) (first run)
@@ -40,8 +36,6 @@ Test suite test-with-lib: PASS
 Test suite logged to: <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/T5309-1.0.0.0/t/test-with-lib/test/T5309-1.0.0.0-test-with-lib.log
 1 of 1 test suites (1 of 1 test cases) passed.
 # cabal v2-bench
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - T5309-1.0.0.0 (bench:bench-no-lib) (first run)
diff --git a/cabal-testsuite/PackageTests/Regression/T5318/sdist-list-sources.out b/cabal-testsuite/PackageTests/Regression/T5318/sdist-list-sources.out
index 8e257e232a7..faefc513fe8 100644
--- a/cabal-testsuite/PackageTests/Regression/T5318/sdist-list-sources.out
+++ b/cabal-testsuite/PackageTests/Regression/T5318/sdist-list-sources.out
@@ -1,4 +1,2 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Wrote source list to <ROOT>/empty-data-dir-0.list
diff --git a/cabal-testsuite/PackageTests/Regression/T5677/cabal.out b/cabal-testsuite/PackageTests/Regression/T5677/cabal.out
index d660ba36715..88bc2862665 100644
--- a/cabal-testsuite/PackageTests/Regression/T5677/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T5677/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T6334/cabal.out b/cabal-testsuite/PackageTests/Regression/T6334/cabal.out
index d011ce510c0..a0a58d72357 100644
--- a/cabal-testsuite/PackageTests/Regression/T6334/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T6334/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T6440/cabal.out b/cabal-testsuite/PackageTests/Regression/T6440/cabal.out
index 8de48ba2a8d..5c24cecf81f 100644
--- a/cabal-testsuite/PackageTests/Regression/T6440/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T6440/cabal.out
@@ -1,6 +1,4 @@
 # cabal test
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T6853/cabal.out b/cabal-testsuite/PackageTests/Regression/T6853/cabal.out
index 2c7e916bd12..75fe8d9ef1c 100644
--- a/cabal-testsuite/PackageTests/Regression/T6853/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T6853/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T6961/DepExternal/cabal.out b/cabal-testsuite/PackageTests/Regression/T6961/DepExternal/cabal.out
index 2e8cfbf46cc..a063ee92cb8 100644
--- a/cabal-testsuite/PackageTests/Regression/T6961/DepExternal/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T6961/DepExternal/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T6961/DepInternal/cabal.out b/cabal-testsuite/PackageTests/Regression/T6961/DepInternal/cabal.out
index 495d99db1f8..cda3c265371 100644
--- a/cabal-testsuite/PackageTests/Regression/T6961/DepInternal/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T6961/DepInternal/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/Regression/T6961/Exe/cabal.out b/cabal-testsuite/PackageTests/Regression/T6961/Exe/cabal.out
index ddd01927783..bde31817cf4 100644
--- a/cabal-testsuite/PackageTests/Regression/T6961/Exe/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T6961/Exe/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T6961/Test/cabal.out b/cabal-testsuite/PackageTests/Regression/T6961/Test/cabal.out
index 8b24d62d861..8f28d66058a 100644
--- a/cabal-testsuite/PackageTests/Regression/T6961/Test/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T6961/Test/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following would be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T7234/Fail/cabal.out b/cabal-testsuite/PackageTests/Regression/T7234/Fail/cabal.out
index 572c32fde7a..5844f36fcce 100644
--- a/cabal-testsuite/PackageTests/Regression/T7234/Fail/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T7234/Fail/cabal.out
@@ -1,7 +1,5 @@
 # cabal v2-build
 Warning: The package description file ./issue7234.cabal has warnings: issue7234.cabal:13:3: The field "other-extensions" is available only since the Cabal specification version 1.10.
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/Regression/T7234/Success/cabal.out b/cabal-testsuite/PackageTests/Regression/T7234/Success/cabal.out
index 2598efd4917..ebfae34dde9 100644
--- a/cabal-testsuite/PackageTests/Regression/T7234/Success/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T7234/Success/cabal.out
@@ -1,7 +1,5 @@
 # cabal v2-build
 Warning: The package description file ./issue7234.cabal has warnings: issue7234.cabal:14:3: The field "other-extensions" is available only since the Cabal specification version 1.10.
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T8507/cabal.out b/cabal-testsuite/PackageTests/Regression/T8507/cabal.out
index 7f8230fe9fe..a4b777afbbc 100644
--- a/cabal-testsuite/PackageTests/Regression/T8507/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T8507/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T9640/cabal.out b/cabal-testsuite/PackageTests/Regression/T9640/cabal.out
index a2b4d7da6f0..a3d4d2935a4 100644
--- a/cabal-testsuite/PackageTests/Regression/T9640/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T9640/cabal.out
@@ -2,8 +2,6 @@
 Downloading the latest package list from test-local-repo
 # cabal build
 Warning: The package description file ./depend-on-custom-with-exe.cabal has warnings: depend-on-custom-with-exe.cabal:16:1: Ignoring trailing fields after sections: "ghc-options"
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/Regression/T9756/cabal.out b/cabal-testsuite/PackageTests/Regression/T9756/cabal.out
index 32930c9a727..61a814acd68 100644
--- a/cabal-testsuite/PackageTests/Regression/T9756/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T9756/cabal.out
@@ -12,8 +12,6 @@ Installing executable mybuilder in <PATH>
 Warning: The directory <ROOT>/cabal.dist/home/.cabal/store/ghc-<GHCVER>/incoming/new-<RAND><ROOT>/cabal.dist/home/.cabal/store/ghc-<GHCVER>/<PACKAGE>-<HASH>/bin is not in the system search path.
 Symlinking 'mybuilder' to '<ROOT>/cabal.dist/install/mybuilder'
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/RelativePathProjectImports/cabal.out b/cabal-testsuite/PackageTests/RelativePathProjectImports/cabal.out
index 10c4953236f..66cb0b09982 100644
--- a/cabal-testsuite/PackageTests/RelativePathProjectImports/cabal.out
+++ b/cabal-testsuite/PackageTests/RelativePathProjectImports/cabal.out
@@ -1,8 +1,6 @@
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
-- dep/cabal.project
-    imported by: cabal.project
+Configuration is affected by ' cabal.project ' and ' dep/cabal.project
+                                                       imported by: cabal.project '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -19,10 +17,8 @@ Configuring library for main-0.1...
 Preprocessing library for main-0.1...
 Building library for main-0.1...
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
-- dep/cabal.project
-    imported by: cabal.project
+Configuration is affected by ' cabal.project ' and ' dep/cabal.project
+                                                       imported by: cabal.project '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-no-load.out b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-no-load.out
index 9177f4d5c37..6f2908d3f26 100644
--- a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-no-load.out
+++ b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-no-load.out
@@ -1,7 +1,5 @@
 # cabal clean
 # cabal repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-normal.out b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-normal.out
index b3e330f7e29..68ecdbe4008 100644
--- a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-normal.out
+++ b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-normal.out
@@ -1,7 +1,5 @@
 # cabal clean
 # cabal repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-no-load.out b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-no-load.out
index 9177f4d5c37..6f2908d3f26 100644
--- a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-no-load.out
+++ b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-no-load.out
@@ -1,7 +1,5 @@
 # cabal clean
 # cabal repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-normal.out b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-normal.out
index 9177f4d5c37..6f2908d3f26 100644
--- a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-normal.out
+++ b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-normal.out
@@ -1,7 +1,5 @@
 # cabal clean
 # cabal repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options-multiple-flags.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options-multiple-flags.out
index e45e9385218..374ac0dd8c3 100644
--- a/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options-multiple-flags.out
+++ b/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options-multiple-flags.out
@@ -1,7 +1,5 @@
 # cabal clean
 # cabal v2-repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options.out
index e45e9385218..374ac0dd8c3 100644
--- a/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options.out
+++ b/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options.out
@@ -1,7 +1,5 @@
 # cabal clean
 # cabal v2-repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out
index 9368db4d3dd..ba1bbef88db 100644
--- a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out
+++ b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out
@@ -1,7 +1,5 @@
 # cabal clean
 # cabal v2-repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags.out
index e45e9385218..374ac0dd8c3 100644
--- a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags.out
+++ b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags.out
@@ -1,7 +1,5 @@
 # cabal clean
 # cabal v2-repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options.out
index e45e9385218..374ac0dd8c3 100644
--- a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options.out
+++ b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options.out
@@ -1,7 +1,5 @@
 # cabal clean
 # cabal v2-repl
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/SDist/T5195and5349/cabal.out b/cabal-testsuite/PackageTests/SDist/T5195and5349/cabal.out
index d6db93b0a25..f42c4e98177 100644
--- a/cabal-testsuite/PackageTests/SDist/T5195and5349/cabal.out
+++ b/cabal-testsuite/PackageTests/SDist/T5195and5349/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Warning: Ignoring directory '././actually-a-directory' listed in a Cabal package field which should only include files (not directories).
 Warning: Ignoring directory './actually-a-directory' listed in a Cabal package field which should only include files (not directories).
 Warning: Ignoring directory './actually-a-directory' listed in a Cabal package field which should only include files (not directories).
diff --git a/cabal-testsuite/PackageTests/SDist/T7028/cabal.out b/cabal-testsuite/PackageTests/SDist/T7028/cabal.out
index 4ec2d96e545..222d3c33c8b 100644
--- a/cabal-testsuite/PackageTests/SDist/T7028/cabal.out
+++ b/cabal-testsuite/PackageTests/SDist/T7028/cabal.out
@@ -1,4 +1,2 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Wrote source list to <ROOT>/t7028-0.list
diff --git a/cabal-testsuite/PackageTests/SDist/T7124/cabal-list.out b/cabal-testsuite/PackageTests/SDist/T7124/cabal-list.out
index b45ccabcb39..cb65c326a56 100644
--- a/cabal-testsuite/PackageTests/SDist/T7124/cabal-list.out
+++ b/cabal-testsuite/PackageTests/SDist/T7124/cabal-list.out
@@ -1,6 +1,4 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Wrote source list to <ROOT>/pkg-a-0.list
 Error: [Cabal-6661]
 filepath wildcard './data.txt' does not match any files.
diff --git a/cabal-testsuite/PackageTests/SDist/T7124/cabal.out b/cabal-testsuite/PackageTests/SDist/T7124/cabal.out
index ec1a61ec9f8..5dbaee755bc 100644
--- a/cabal-testsuite/PackageTests/SDist/T7124/cabal.out
+++ b/cabal-testsuite/PackageTests/SDist/T7124/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Wrote tarball sdist to <ROOT>/pkg-a-0.tar.gz
 Error: [Cabal-6661]
 filepath wildcard './data.txt' does not match any files.
diff --git a/cabal-testsuite/PackageTests/SDist/T7698/cabal.out b/cabal-testsuite/PackageTests/SDist/T7698/cabal.out
index b4405270c12..99370eb5dd6 100644
--- a/cabal-testsuite/PackageTests/SDist/T7698/cabal.out
+++ b/cabal-testsuite/PackageTests/SDist/T7698/cabal.out
@@ -1,4 +1,2 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Wrote source list to <ROOT>/t7698-0.list
diff --git a/cabal-testsuite/PackageTests/SDist/T8817/cabal.out b/cabal-testsuite/PackageTests/SDist/T8817/cabal.out
index 89e68f1c41e..c99d15276fe 100644
--- a/cabal-testsuite/PackageTests/SDist/T8817/cabal.out
+++ b/cabal-testsuite/PackageTests/SDist/T8817/cabal.out
@@ -1,4 +1,2 @@
 # cabal v2-sdist
-Configuration is affected by the following files:
-- cabal.project
 Wrote tarball sdist to <ROOT>/t8817-0.tar.gz
diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-all.out b/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-all.out
index 638ea9ced39..e37e3fccc4d 100644
--- a/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-all.out
+++ b/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-all.out
@@ -1,6 +1,4 @@
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-exe.out b/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-exe.out
index 036c131915c..7c69357323d 100644
--- a/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-exe.out
+++ b/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-exe.out
@@ -1,6 +1,4 @@
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/A/remove-outdated.out b/cabal-testsuite/PackageTests/ShowBuildInfo/A/remove-outdated.out
index 0b788f6c53e..3ad97d2f378 100644
--- a/cabal-testsuite/PackageTests/ShowBuildInfo/A/remove-outdated.out
+++ b/cabal-testsuite/PackageTests/ShowBuildInfo/A/remove-outdated.out
@@ -1,6 +1,4 @@
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -9,8 +7,6 @@ Configuring executable 'A' for A-0.1.0.0...
 Preprocessing executable 'A' for A-0.1.0.0...
 Building executable 'A' for A-0.1.0.0...
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - A-0.1.0.0 (exe:A) (configuration changed)
diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/CompileFail/compile-fail.out b/cabal-testsuite/PackageTests/ShowBuildInfo/CompileFail/compile-fail.out
index a2ecb2be87d..b0cae576cd6 100644
--- a/cabal-testsuite/PackageTests/ShowBuildInfo/CompileFail/compile-fail.out
+++ b/cabal-testsuite/PackageTests/ShowBuildInfo/CompileFail/compile-fail.out
@@ -1,6 +1,4 @@
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -15,8 +13,6 @@ Building test suite 'CompileFail-test' for CompileFail-0.1.0.0...
 Error: [Cabal-7125]
 Failed to build CompileFail-0.1.0.0-inplace-CompileFail-test.
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - CompileFail-0.1.0.0 (lib:failing) (first run)
diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/single.out b/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/single.out
index f46f8948e28..3825d1f6cf8 100644
--- a/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/single.out
+++ b/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/single.out
@@ -1,8 +1,6 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
@@ -19,14 +17,10 @@ Building executable 'Complex' for Complex-0.1.0.0...
 # show-build-info Complex exe:Complex
 {"cabal-lib-version":"<CABALVER>","compiler":{"flavour":"ghc","compiler-id":"ghc-<GHCVER>","path":"<GHCPATH>"},"components":[{"type":"exe","name":"exe:Complex","unit-id":"Complex-0.1.0.0-inplace-Complex","compiler-args":["-fbuilding-cabal-package","-O","-outputdir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/x/Complex/build","-odir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/x/Complex/build","-hidir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/x/Complex/build","-hiedir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/x/Complex/build/extra-compilation-artifacts/hie","-stubdir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/x/Complex/build","-i","-iapp","-isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/x/Complex/build","-isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/x/Complex/build/Complex/autogen","-isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/x/Complex/build/global-autogen","-Isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/x/Complex/build/Complex/autogen","-Isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/x/Complex/build/global-autogen","-Isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/x/Complex/build","-optP-include","-optPsingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/x/Complex/build/Complex/autogen/cabal_macros.h","-this-unit-id","Complex-0.1.0.0-inplace-Complex","-hide-all-packages","-Wmissing-home-modules","-no-user-package-db","-package-db","<ROOT>/single.dist/home/.cabal/store/ghc-<GHCVER>/package.db","-package-db","<ROOT>/single.dist/work/dist/packagedb/ghc-<GHCVER>","-package-id","<PACKAGEDEP>","-package-id","<PACKAGEDEP>","-XHaskell2010","-threaded","-rtsopts","-with-rtsopts=-N -T","-Wredundant-constraints"],"modules":["Other","Paths_Complex"],"src-files":["Main.lhs"],"hs-src-dirs":["app"],"src-dir":"<ROOT>/","cabal-file":"Complex.cabal"}]}
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Up to date
 # show-build-info Complex lib
 {"cabal-lib-version":"<CABALVER>","compiler":{"flavour":"ghc","compiler-id":"ghc-<GHCVER>","path":"<GHCPATH>"},"components":[{"type":"lib","name":"lib","unit-id":"Complex-0.1.0.0-inplace","compiler-args":["-fbuilding-cabal-package","-O","-outputdir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/build","-odir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/build","-hidir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/build","-hiedir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/build/extra-compilation-artifacts/hie","-stubdir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/build","-i","-isrc","-idoesnt-exist","-isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/build","-isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/build/autogen","-isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/build/global-autogen","-Isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/build/autogen","-Isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/build/global-autogen","-Isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/build","-optP-include","-optPsingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/build/autogen/cabal_macros.h","-this-unit-id","Complex-0.1.0.0-inplace","-hide-all-packages","-Wmissing-home-modules","-no-user-package-db","-package-db","<ROOT>/single.dist/home/.cabal/store/ghc-<GHCVER>/package.db","-package-db","<ROOT>/single.dist/work/dist/packagedb/ghc-<GHCVER>","-package-id","<PACKAGEDEP>","-XHaskell2010","-Wall"],"modules":["A","B","C","D","Paths_Complex"],"src-files":[],"hs-src-dirs":["src","doesnt-exist"],"src-dir":"<ROOT>/","cabal-file":"Complex.cabal"}]}
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - criterion-1.1.4.0 (lib) (requires build)
@@ -42,8 +36,6 @@ Building benchmark 'complex-benchmarks' for Complex-0.1.0.0...
 # show-build-info Complex bench:complex-benchmarks
 {"cabal-lib-version":"<CABALVER>","compiler":{"flavour":"ghc","compiler-id":"ghc-<GHCVER>","path":"<GHCPATH>"},"components":[{"type":"bench","name":"bench:complex-benchmarks","unit-id":"Complex-0.1.0.0-inplace-complex-benchmarks","compiler-args":["-fbuilding-cabal-package","-O","-outputdir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/b/complex-benchmarks/build","-odir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/b/complex-benchmarks/build","-hidir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/b/complex-benchmarks/build","-hiedir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/b/complex-benchmarks/build/extra-compilation-artifacts/hie","-stubdir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/b/complex-benchmarks/build","-i","-ibenchmark","-isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/b/complex-benchmarks/build","-isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/b/complex-benchmarks/build/complex-benchmarks/autogen","-isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/b/complex-benchmarks/build/global-autogen","-Isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/b/complex-benchmarks/build/complex-benchmarks/autogen","-Isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/b/complex-benchmarks/build/global-autogen","-Isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/b/complex-benchmarks/build","-optP-include","-optPsingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/b/complex-benchmarks/build/complex-benchmarks/autogen/cabal_macros.h","-this-unit-id","Complex-0.1.0.0-inplace-complex-benchmarks","-hide-all-packages","-Wmissing-home-modules","-no-user-package-db","-package-db","<ROOT>/single.dist/home/.cabal/store/ghc-<GHCVER>/package.db","-package-db","<ROOT>/single.dist/work/dist/packagedb/ghc-<GHCVER>","-package-id","<PACKAGEDEP>","-package-id","<PACKAGEDEP>","-package-id","<PACKAGEDEP>","-XHaskell2010","-Wall","-rtsopts","-threaded","-with-rtsopts=-N"],"modules":["Paths_Complex"],"src-files":["Main.hs"],"hs-src-dirs":["benchmark"],"src-dir":"<ROOT>/","cabal-file":"Complex.cabal"}]}
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - test-framework-0.8.1.1 (lib) (requires build)
@@ -59,8 +51,6 @@ Building test suite 'func-test' for Complex-0.1.0.0...
 # show-build-info Complex test:func-test
 {"cabal-lib-version":"<CABALVER>","compiler":{"flavour":"ghc","compiler-id":"ghc-<GHCVER>","path":"<GHCPATH>"},"components":[{"type":"test","name":"test:func-test","unit-id":"Complex-0.1.0.0-inplace-func-test","compiler-args":["-fbuilding-cabal-package","-O","-outputdir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/t/func-test/build","-odir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/t/func-test/build","-hidir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/t/func-test/build","-hiedir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/t/func-test/build/extra-compilation-artifacts/hie","-stubdir","single.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/t/func-test/build","-i","-itest","-isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/t/func-test/build","-isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/t/func-test/build/func-test/autogen","-isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/t/func-test/build/global-autogen","-Isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/t/func-test/build/func-test/autogen","-Isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/t/func-test/build/global-autogen","-Isingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/t/func-test/build","-optP-include","-optPsingle.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/Complex-0.1.0.0/t/func-test/build/func-test/autogen/cabal_macros.h","-this-unit-id","Complex-0.1.0.0-inplace-func-test","-hide-all-packages","-Wmissing-home-modules","-no-user-package-db","-package-db","<ROOT>/single.dist/home/.cabal/store/ghc-<GHCVER>/package.db","-package-db","<ROOT>/single.dist/work/dist/packagedb/ghc-<GHCVER>","-package-id","<PACKAGEDEP>","-package-id","<PACKAGEDEP>","-package-id","<PACKAGEDEP>","-XHaskell2010"],"modules":[],"src-files":["FuncMain.hs"],"hs-src-dirs":["test"],"src-dir":"<ROOT>/","cabal-file":"Complex.cabal"}]}
 # cabal build
-Configuration is affected by the following files:
-- cabal.project
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - another-framework-0.8.1.1 (lib) (requires build)
diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-benches.out b/cabal-testsuite/PackageTests/Target/cabal.all-benches.out
index ea70119f019..b364201c972 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.all-benches.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.all-benches.out
@@ -1,6 +1,4 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:bench:a-bench
diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-enable-benches.out b/cabal-testsuite/PackageTests/Target/cabal.all-enable-benches.out
index 76e0c88fe29..3c838fa9a51 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.all-enable-benches.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.all-enable-benches.out
@@ -1,6 +1,4 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:bench:a-bench
diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-enable-tests.out b/cabal-testsuite/PackageTests/Target/cabal.all-enable-tests.out
index de04e17ca32..dac2bccf5b2 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.all-enable-tests.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.all-enable-tests.out
@@ -1,6 +1,4 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:exe:a-exe
diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-exes.out b/cabal-testsuite/PackageTests/Target/cabal.all-exes.out
index c9c362a5f7b..de3f2571415 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.all-exes.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.all-exes.out
@@ -1,6 +1,4 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:exe:a-exe
diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-tests.out b/cabal-testsuite/PackageTests/Target/cabal.all-tests.out
index 7511696f48a..5f03cff2532 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.all-tests.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.all-tests.out
@@ -1,6 +1,4 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:test:a-test
diff --git a/cabal-testsuite/PackageTests/Target/cabal.component-target-bench.out b/cabal-testsuite/PackageTests/Target/cabal.component-target-bench.out
index 9ec0e6f0705..cda55c176ab 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.component-target-bench.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.component-target-bench.out
@@ -1,19 +1,13 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:bench:a-bench
 Found 1 target matching a:bench:a-bench.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Fully qualified target forms:
  - a:bench:a-bench
 Found 1 target matching bench:a-bench.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Fully qualified target forms:
  - a:bench:a-bench
 Found 1 target matching a:a-bench.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.component-target-exe.out b/cabal-testsuite/PackageTests/Target/cabal.component-target-exe.out
index 84f1841fa2c..02d71b58834 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.component-target-exe.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.component-target-exe.out
@@ -1,19 +1,13 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:exe:a-exe
 Found 1 target matching a:exe:a-exe.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Fully qualified target forms:
  - a:exe:a-exe
 Found 1 target matching exe:a-exe.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Fully qualified target forms:
  - a:exe:a-exe
 Found 1 target matching a:a-exe.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.component-target-lib.out b/cabal-testsuite/PackageTests/Target/cabal.component-target-lib.out
index 63925d3dffd..e00fe37c091 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.component-target-lib.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.component-target-lib.out
@@ -1,19 +1,13 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:lib:a
 Found 1 target matching a:lib:a.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Fully qualified target forms:
  - a:lib:a
 Found 1 target matching lib:a.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Fully qualified target forms:
  - a:lib:a
 Found 1 target matching a:a.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.component-target-test.out b/cabal-testsuite/PackageTests/Target/cabal.component-target-test.out
index 890e8e0ea39..17e743c71bc 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.component-target-test.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.component-target-test.out
@@ -1,19 +1,13 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:test:a-test
 Found 1 target matching a:test:a-test.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Fully qualified target forms:
  - a:test:a-test
 Found 1 target matching test:a-test.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Fully qualified target forms:
  - a:test:a-test
 Found 1 target matching a:a-test.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.ctype-target.out b/cabal-testsuite/PackageTests/Target/cabal.ctype-target.out
index 98c0e43d833..c29697620eb 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.ctype-target.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.ctype-target.out
@@ -1,26 +1,18 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:lib:a
  - a:lib:a-sublib
 Found 2 targets matching a:libs.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Fully qualified target forms:
  - a:exe:a-exe
 Found 1 target matching a:exes.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Fully qualified target forms:
  - a:test:a-test
 Found 1 target matching a:tests.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Fully qualified target forms:
  - a:bench:a-bench
 Found 1 target matching a:benches.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.default-all.out b/cabal-testsuite/PackageTests/Target/cabal.default-all.out
index 3c387ebf42e..bbb2d21084d 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.default-all.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.default-all.out
@@ -1,6 +1,4 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:exe:a-exe
diff --git a/cabal-testsuite/PackageTests/Target/cabal.everything.out b/cabal-testsuite/PackageTests/Target/cabal.everything.out
index c3cc5659a55..7a1fef296c4 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.everything.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.everything.out
@@ -1,6 +1,4 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:bench:a-bench
diff --git a/cabal-testsuite/PackageTests/Target/cabal.explicit-all.out b/cabal-testsuite/PackageTests/Target/cabal.explicit-all.out
index 3c387ebf42e..bbb2d21084d 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.explicit-all.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.explicit-all.out
@@ -1,6 +1,4 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:exe:a-exe
diff --git a/cabal-testsuite/PackageTests/Target/cabal.missing-target.out b/cabal-testsuite/PackageTests/Target/cabal.missing-target.out
index 973cc5d97f1..6ed55714c4c 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.missing-target.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.missing-target.out
@@ -1,16 +1,10 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Error: [Cabal-7127]
 Cannot target the executables in the package c-0.1 because it does not contain any executables. Check the .cabal file for the package and make sure that it properly declares the components that you expect.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7127]
 Cannot target the test suites in the package c-0.1 because it does not contain any test suites. Check the .cabal file for the package and make sure that it properly declares the components that you expect.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Error: [Cabal-7127]
 Cannot target the benchmarks in the package c-0.1 because it does not contain any benchmarks. Check the .cabal file for the package and make sure that it properly declares the components that you expect.
diff --git a/cabal-testsuite/PackageTests/Target/cabal.package-target.out b/cabal-testsuite/PackageTests/Target/cabal.package-target.out
index 8b122c97a69..2e5a475a93f 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.package-target.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.package-target.out
@@ -1,6 +1,4 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:exe:a-exe
@@ -8,8 +6,6 @@ Fully qualified target forms:
  - a:lib:a-sublib
 Found 3 targets matching a.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:bench:a-bench
diff --git a/cabal-testsuite/PackageTests/Target/cabal.path-target.out b/cabal-testsuite/PackageTests/Target/cabal.path-target.out
index 4e4bc9cec20..2eb116578f1 100644
--- a/cabal-testsuite/PackageTests/Target/cabal.path-target.out
+++ b/cabal-testsuite/PackageTests/Target/cabal.path-target.out
@@ -1,6 +1,4 @@
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:exe:a-exe
@@ -8,8 +6,6 @@ Fully qualified target forms:
  - a:lib:a-sublib
 Found 3 targets matching dir-a/.
 # cabal v2-target
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Fully qualified target forms:
  - a:bench:a-bench
diff --git a/cabal-testsuite/PackageTests/TestCodeGenerator/cabal.out b/cabal-testsuite/PackageTests/TestCodeGenerator/cabal.out
index 31af40384d3..b6691231474 100644
--- a/cabal-testsuite/PackageTests/TestCodeGenerator/cabal.out
+++ b/cabal-testsuite/PackageTests/TestCodeGenerator/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-test
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out b/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out
index c7dac223635..8fb3ea6d6d3 100644
--- a/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out
+++ b/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out
@@ -1,6 +1,4 @@
 # cabal v2-test
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/coverage.out b/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/coverage.out
index 0d98e24beaa..872dbd57eaf 100644
--- a/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/coverage.out
+++ b/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/coverage.out
@@ -1,6 +1,4 @@
 # cabal v2-test
-Configuration is affected by the following files:
-- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/VersionPriority/0-local.out b/cabal-testsuite/PackageTests/VersionPriority/0-local.out
index 176876e269f..612fe1663f9 100644
--- a/cabal-testsuite/PackageTests/VersionPriority/0-local.out
+++ b/cabal-testsuite/PackageTests/VersionPriority/0-local.out
@@ -1,8 +1,7 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- 0-local.project
+Configuration is affected by ' 0-local.project '
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/VersionPriority/1-local.out b/cabal-testsuite/PackageTests/VersionPriority/1-local.out
index acca1619534..ed7e12f1b17 100644
--- a/cabal-testsuite/PackageTests/VersionPriority/1-local.out
+++ b/cabal-testsuite/PackageTests/VersionPriority/1-local.out
@@ -1,10 +1,8 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- 1-local-constraints-import.project
-- stackage-local.config
-    imported by: 1-local-constraints-import.project
+Configuration is affected by ' 1-local-constraints-import.project ' and ' stackage-local.config
+                                                                            imported by: 1-local-constraints-import.project '
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
@@ -18,10 +16,8 @@ Could not resolve dependencies:
 [__1] fail (backjumping, conflict set: cabal-version-override, hashable)
 After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: hashable (3), cabal-version-override (2)
 # cabal v2-build
-Configuration is affected by the following files:
-- 1-local-import-constraints.project
-- stackage-local.config
-    imported by: 1-local-import-constraints.project
+Configuration is affected by ' 1-local-import-constraints.project ' and ' stackage-local.config
+                                                                            imported by: 1-local-import-constraints.project '
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/VersionPriority/1-web.out b/cabal-testsuite/PackageTests/VersionPriority/1-web.out
index f7ca5a23be8..493ddbb8d54 100644
--- a/cabal-testsuite/PackageTests/VersionPriority/1-web.out
+++ b/cabal-testsuite/PackageTests/VersionPriority/1-web.out
@@ -1,12 +1,9 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- 1-web-constraints-import.project
-- project-stackage/nightly-2023-12-07.config
-    imported by: 1-web-constraints-import.project
-- with-ghc.config
-    imported by: 1-web-constraints-import.project
+Configuration is affected by the following files: - 1-web-constraints-import.project
+                                                  - project-stackage/nightly-2023-12-07.config
+                                                  - with-ghc.config
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
@@ -20,12 +17,9 @@ Could not resolve dependencies:
 [__1] fail (backjumping, conflict set: cabal-version-override, hashable)
 After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: hashable (3), cabal-version-override (2)
 # cabal v2-build
-Configuration is affected by the following files:
-- 1-web-import-constraints.project
-- project-stackage/nightly-2023-12-07.config
-    imported by: 1-web-import-constraints.project
-- with-ghc.config
-    imported by: 1-web-import-constraints.project
+Configuration is affected by the following files: - 1-web-import-constraints.project
+                                                  - project-stackage/nightly-2023-12-07.config
+                                                  - with-ghc.config
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/VersionPriority/2-local.out b/cabal-testsuite/PackageTests/VersionPriority/2-local.out
index bf3ae4cb27c..8fdc355aee5 100644
--- a/cabal-testsuite/PackageTests/VersionPriority/2-local.out
+++ b/cabal-testsuite/PackageTests/VersionPriority/2-local.out
@@ -1,13 +1,9 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- 2-local-constraints-import.project
-- hop-local.config
-    imported by: 2-local-constraints-import.project
-- stackage-local.config
-    imported by: hop-local.config
-    imported by: 2-local-constraints-import.project
+Configuration is affected by the following files: - 2-local-constraints-import.project
+                                                  - hop-local.config
+                                                  - stackage-local.config
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
@@ -22,13 +18,9 @@ Could not resolve dependencies:
 [__1] fail (backjumping, conflict set: cabal-version-override, hashable)
 After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: hashable (3), cabal-version-override (2)
 # cabal v2-build
-Configuration is affected by the following files:
-- 2-local-import-constraints.project
-- hop-local.config
-    imported by: 2-local-import-constraints.project
-- stackage-local.config
-    imported by: hop-local.config
-    imported by: 2-local-import-constraints.project
+Configuration is affected by the following files: - 2-local-import-constraints.project
+                                                  - hop-local.config
+                                                  - stackage-local.config
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/VersionPriority/2-web.out b/cabal-testsuite/PackageTests/VersionPriority/2-web.out
index 17bc5a01962..28ee1819264 100644
--- a/cabal-testsuite/PackageTests/VersionPriority/2-web.out
+++ b/cabal-testsuite/PackageTests/VersionPriority/2-web.out
@@ -1,15 +1,10 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- 2-web-constraints-import.project
-- project-stackage/nightly-2023-12-07.config
-    imported by: stackage-web.config
-    imported by: 2-web-constraints-import.project
-- stackage-web.config
-    imported by: 2-web-constraints-import.project
-- with-ghc.config
-    imported by: 2-web-constraints-import.project
+Configuration is affected by the following files: - 2-web-constraints-import.project
+                                                  - project-stackage/nightly-2023-12-07.config
+                                                  - stackage-web.config
+                                                  - with-ghc.config
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
@@ -24,15 +19,10 @@ Could not resolve dependencies:
 [__1] fail (backjumping, conflict set: cabal-version-override, hashable)
 After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: hashable (3), cabal-version-override (2)
 # cabal v2-build
-Configuration is affected by the following files:
-- 2-web-import-constraints.project
-- project-stackage/nightly-2023-12-07.config
-    imported by: stackage-web.config
-    imported by: 2-web-import-constraints.project
-- stackage-web.config
-    imported by: 2-web-import-constraints.project
-- with-ghc.config
-    imported by: 2-web-import-constraints.project
+Configuration is affected by the following files: - 2-web-import-constraints.project
+                                                  - project-stackage/nightly-2023-12-07.config
+                                                  - stackage-web.config
+                                                  - with-ghc.config
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/VersionPriority/3-web.out b/cabal-testsuite/PackageTests/VersionPriority/3-web.out
index d9eee435ab1..261284e8075 100644
--- a/cabal-testsuite/PackageTests/VersionPriority/3-web.out
+++ b/cabal-testsuite/PackageTests/VersionPriority/3-web.out
@@ -1,19 +1,11 @@
 # cabal v2-update
 Downloading the latest package list from test-local-repo
 # cabal v2-build
-Configuration is affected by the following files:
-- 3-web-constraints-import.project
-- hop-web.config
-    imported by: 3-web-constraints-import.project
-- project-stackage/nightly-2023-12-07.config
-    imported by: stackage-web.config
-    imported by: hop-web.config
-    imported by: 3-web-constraints-import.project
-- stackage-web.config
-    imported by: hop-web.config
-    imported by: 3-web-constraints-import.project
-- with-ghc.config
-    imported by: 3-web-constraints-import.project
+Configuration is affected by the following files: - 3-web-constraints-import.project
+                                                  - hop-web.config
+                                                  - project-stackage/nightly-2023-12-07.config
+                                                  - stackage-web.config
+                                                  - with-ghc.config
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
@@ -29,19 +21,11 @@ Could not resolve dependencies:
 [__1] fail (backjumping, conflict set: cabal-version-override, hashable)
 After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: hashable (3), cabal-version-override (2)
 # cabal v2-build
-Configuration is affected by the following files:
-- 3-web-import-constraints.project
-- hop-web.config
-    imported by: 3-web-import-constraints.project
-- project-stackage/nightly-2023-12-07.config
-    imported by: stackage-web.config
-    imported by: hop-web.config
-    imported by: 3-web-import-constraints.project
-- stackage-web.config
-    imported by: hop-web.config
-    imported by: 3-web-import-constraints.project
-- with-ghc.config
-    imported by: 3-web-import-constraints.project
+Configuration is affected by the following files: - 3-web-import-constraints.project
+                                                  - hop-web.config
+                                                  - project-stackage/nightly-2023-12-07.config
+                                                  - stackage-web.config
+                                                  - with-ghc.config
 Resolving dependencies...
 Error: [Cabal-7107]
 Could not resolve dependencies:
diff --git a/cabal-testsuite/PackageTests/postCheckoutCommand/cabal.out b/cabal-testsuite/PackageTests/postCheckoutCommand/cabal.out
index a304511e1ef..a123f969399 100644
--- a/cabal-testsuite/PackageTests/postCheckoutCommand/cabal.out
+++ b/cabal-testsuite/PackageTests/postCheckoutCommand/cabal.out
@@ -1,6 +1,5 @@
 # cabal v2-build
-Configuration is affected by the following files:
-- cabal.positive.project
+Configuration is affected by ' cabal.positive.project '
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built: