add preference for version named manifest files

base/loading.jl

@@ -408,7 +408,8 @@ end
 ## generic project & manifest API ##
 
 const project_names = ("JuliaProject.toml", "Project.toml")
-const manifest_names = ("JuliaManifest.toml", "Manifest.toml")
+const manifest_names = ("JuliaManifest$(VERSION.major).$(VERSION.minor).toml", "JuliaManifest.toml",
+ "Manifest$(VERSION.major).$(VERSION.minor).toml", "Manifest.toml")
 const preferences_names = ("JuliaLocalPreferences.toml", "LocalPreferences.toml")
 
 # classify the LOAD_PATH entry to be one of:

stdlib/Artifacts/src/Artifacts.jl

@@ -18,7 +18,7 @@ function parse_toml(path::String)
  Base.parsed_toml(path)
 end
 
-# keep in sync with Base.project_names and Base.manifest_names
+# keep in sync with Base.project_names
 const artifact_names = ("JuliaArtifacts.toml", "Artifacts.toml")
 
 const ARTIFACTS_DIR_OVERRIDE = Ref{Union{String,Nothing}}(nothing)

stdlib/Artifacts/test/runtests.jl

@@ -161,6 +161,5 @@ end
 @testset "`Artifacts.artifact_names` and friends" begin
  n = length(Artifacts.artifact_names)
  @test length(Base.project_names) == n
- @test length(Base.manifest_names) == n
  @test length(Base.preferences_names) == n
 end

test/loading.jl

@@ -765,8 +765,10 @@ end
 @testset "`Base.project_names` and friends" begin
  # Some functions in Pkg assumes that these tuples have the same length
  n = length(Base.project_names)
- @test length(Base.manifest_names) == n
  @test length(Base.preferences_names) == n
+
+ # there are two manifest names per project name
+ @test length(Base.manifest_names) == 2n
 end
 
 @testset "Manifest formats" begin