wip

Author: BillyONeal

include/vcpkg/base/json.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <vcpkg/base/fwd/files.h>
 #include <vcpkg/base/fwd/json.h>
 
 #include <vcpkg/base/expected.h>
@@ -336,7 +335,6 @@ namespace vcpkg::Json
     };
 
     ExpectedL<ParsedJson> parse(StringView text, StringView origin);
-    ParsedJson parse_file(LineInfo li, const ReadOnlyFilesystem&, const Path&);
     ExpectedL<Json::Object> parse_object(StringView text, StringView origin);
 
     std::string stringify(const Value&);

include/vcpkg/base/message-data.inc.h

@@ -186,6 +186,11 @@ DECLARE_MESSAGE(ARegistryPathMustStartWithDollar,
                 "",
                 "A registry path must start with `$` to mean the registry root; for example, `$/foo/bar`.")
 DECLARE_MESSAGE(ARelaxedVersionString, (), "", "a relaxed version string")
+DECLARE_MESSAGE(
+    RequestedPortsNotInCIPlan,
+    (),
+    "",
+    "one or more ports requested to be installed were not present in the action plan. (Probably a vcpkg bug)")
 DECLARE_MESSAGE(ArtifactsBootstrapFailed, (), "", "vcpkg-artifacts is not installed and could not be bootstrapped.")
 DECLARE_MESSAGE(ArtifactsOptionIncompatibility, (msg::option), "", "--{option} has no effect on find artifact.")
 DECLARE_MESSAGE(ArtifactsOptionJson,

include/vcpkg/paragraphs.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/fwd/expected.h>
+#include <vcpkg/base/fwd/files.h>
 #include <vcpkg/base/fwd/stringview.h>
 
 #include <vcpkg/fwd/binaryparagraph.h>

locales/messages.json

@@ -1409,6 +1409,7 @@
   "_RemovePackageConflict.comment": "An example of {package_name} is zlib. An example of {spec} is zlib:x64-windows. An example of {triplet} is x64-windows.",
   "RemovingPackage": "Removing {action_index}/{count} {spec}",
   "_RemovingPackage.comment": "An example of {action_index} is 340. An example of {count} is 42. An example of {spec} is zlib:x64-windows.",
+  "RequestedPortsNotInCIPlan": "one or more ports requested to be installed were not present in the action plan. (Probably a vcpkg bug)",
   "ResponseFileCode": "@response_file",
   "_ResponseFileCode.comment": "Explains to the user that they can use response files on the command line, 'response_file' must have no spaces and be a legal file name.",
   "RestoredPackagesFromAWS": "Restored {count} package(s) from AWS in {elapsed}. Use --debug to see more details.",

src/vcpkg-test/ci-baseline.cpp

@@ -206,7 +206,7 @@ bill-made-up-another-skip:x64-linux=skip)"; // note no trailing newline
     SECTION ("Applies Skips and Fails")
     {
         ExclusionsMap exclusions;
-        exclusions.insert(x64_uwp, {}); // example triplet
+        exclusions.insert(x64_uwp, {});   // example triplet
         exclusions.insert(x64_linux, {}); // example host triplet
         auto actual = parse_and_apply_ci_baseline(expected_from_example_input, exclusions, SkipFailures::No);
         const SortedVector<PackageSpec> expected_expected_failures{

src/vcpkg/base/json.cpp

@@ -1168,18 +1168,6 @@ namespace vcpkg::Json
         return true;
     }
 
-    ParsedJson parse_file(vcpkg::LineInfo li, const ReadOnlyFilesystem& fs, const Path& json_file)
-    {
-        std::error_code ec;
-        auto disk_contents = fs.read_contents(json_file, ec);
-        if (ec)
-        {
-            Checks::msg_exit_with_error(li, format_filesystem_call_error(ec, "read_contents", {json_file}));
-        }
-
-        return parse(disk_contents, json_file).value_or_exit(VCPKG_LINE_INFO);
-    }
-
     ExpectedL<ParsedJson> parse(StringView json, StringView origin) { return Parser::parse(json, origin); }
 
     ExpectedL<Json::Object> parse_object(StringView text, StringView origin)

src/vcpkg/commands.ci.cpp

@@ -233,9 +233,9 @@ namespace vcpkg
         Path path_to_artifact_messages = parsed_args.command_arguments[1];
 
         // parse file to get json obj
-        auto artifact_messages = Json::parse_file(VCPKG_LINE_INFO, fs, path_to_artifact_messages).value;
-        auto artifact_obj = artifact_messages.object(VCPKG_LINE_INFO);
-
+        auto artifact_messages_content = fs.try_read_contents(path_to_artifact_messages).value_or_exit(VCPKG_LINE_INFO);
+        auto artifact_obj = Json::parse_object(artifact_messages_content.content, artifact_messages_content.origin)
+                                .value_or_exit(VCPKG_LINE_INFO);
         for (auto&& it : artifact_obj)
         {
             obj.insert(it.first, it.second);

src/vcpkg/commands.z-generate-message-map.cpp

@@ -25,12 +25,15 @@ namespace
         StringLiteral result_string = "";
         switch (test.result)
         {
-            case BuildResult::PostBuildChecksFailed:
-            case BuildResult::FileConflicts:
-            case BuildResult::BuildFailed: result_string = "Fail"; break;
-            case BuildResult::Excluded:
-            case BuildResult::CascadedDueToMissingDependencies: result_string = "Skip"; break;
             case BuildResult::Succeeded: result_string = "Pass"; break;
+            case BuildResult::BuildFailed:
+            case BuildResult::PostBuildChecksFailed:
+            case BuildResult::FileConflicts: result_string = "Fail"; break;
+            case BuildResult::CascadedDueToMissingDependencies:
+            case BuildResult::Excluded: result_string = "Skip"; break;
+            case BuildResult::CacheMissing:
+            case BuildResult::Downloaded:
+            case BuildResult::Removed:
             default: Checks::unreachable(VCPKG_LINE_INFO);
         }