microsoft · BillyONeal · Jun 14, 2022 · Jun 9, 2022 · Jun 10, 2022 · Jun 13, 2022
diff --git a/include/vcpkg-test/util.h b/include/vcpkg-test/util.h
@@ -113,9 +113,15 @@ namespace vcpkg::Test
 
     extern const Triplet X86_WINDOWS;
     extern const Triplet X64_WINDOWS;
+    extern const Triplet X64_WINDOWS_STATIC;
+    extern const Triplet X64_WINDOWS_STATIC_MD;
+    extern const Triplet ARM64_WINDOWS;
     extern const Triplet X86_UWP;
+    extern const Triplet X64_UWP;
     extern const Triplet ARM_UWP;
     extern const Triplet X64_ANDROID;
+    extern const Triplet X64_OSX;
+    extern const Triplet X64_LINUX;
 
     /// <summary>
     /// Map of source control files by their package name.

diff --git a/include/vcpkg/base/xmlserializer.h b/include/vcpkg/base/xmlserializer.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <vcpkg/base/strings.h>
 #include <vcpkg/base/stringview.h>
 
 #include <string>

diff --git a/include/vcpkg/ci-baseline.h b/include/vcpkg/ci-baseline.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <vcpkg/fwd/build.h>
 #include <vcpkg/fwd/ci-baseline.h>
 
 #include <vcpkg/base/expected.h>
@@ -54,7 +55,19 @@ namespace vcpkg
 
     std::vector<CiBaselineLine> parse_ci_baseline(StringView text, StringView origin, ParseMessages& messages);
 
-    SortedVector<PackageSpec> parse_and_apply_ci_baseline(View<CiBaselineLine> lines,
-                                                          ExclusionsMap& exclusions_map,
-                                                          SkipFailures skip_failures);
+    struct CiBaselineData
+    {
+        SortedVector<PackageSpec> expected_failures;
+        SortedVector<PackageSpec> required_success;
+    };
+
+    CiBaselineData parse_and_apply_ci_baseline(View<CiBaselineLine> lines,
+                                               ExclusionsMap& exclusions_map,
+                                               SkipFailures skip_failures);
+
+    LocalizedString format_ci_result(const PackageSpec& spec,
+                                     Build::BuildResult result,
+                                     const CiBaselineData& cidata,
+                                     StringView cifile,
+                                     bool allow_unexpected_passing);
 }
diff --git a/include/vcpkg/fwd/build.h b/include/vcpkg/fwd/build.h
@@ -4,4 +4,5 @@ namespace vcpkg::Build
 {
     struct BuildInfo;
     struct PreBuildInfo;
+    enum class BuildResult;
 }
diff --git a/include/vcpkg/fwd/ci-baseline.h b/include/vcpkg/fwd/ci-baseline.h
@@ -12,6 +12,7 @@ namespace vcpkg
     {
         Skip,
         Fail,
+        Pass,
     };
     enum class SkipFailures : bool
     {

diff --git a/include/vcpkg/fwd/triplet.h b/include/vcpkg/fwd/triplet.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace vcpkg
+{
+    struct Triplet;
+}
diff --git a/include/vcpkg/triplet.h b/include/vcpkg/triplet.h
@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/fwd/format.h>
 
+#include <vcpkg/fwd/triplet.h>
 #include <vcpkg/fwd/vcpkgcmdarguments.h>
 
 #include <vcpkg/base/optional.h>

diff --git a/include/vcpkg/xunitwriter.h b/include/vcpkg/xunitwriter.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <vcpkg/fwd/build.h>
+#include <vcpkg/fwd/packagespec.h>
+#include <vcpkg/fwd/triplet.h>
+
+#include <vcpkg/base/chrono.h>
+
+#include <chrono>
+#include <map>
+#include <string>
+#include <vector>
+
+namespace vcpkg
+{
+    struct XunitTest;
+
+    // https://xunit.net/docs/format-xml-v2
+    struct XunitWriter
+    {
+    public:
+        // Out of line con/destructor avoids exposing XunitTest
+        XunitWriter();
+        ~XunitWriter();
+        void add_test_results(const PackageSpec& spec,
+                              Build::BuildResult build_result,
+                              const ElapsedTime& elapsed_time,
+                              const std::chrono::system_clock::time_point& start_time,
+                              const std::string& abi_tag,
+                              const std::vector<std::string>& features);
+
+        std::string build_xml(Triplet controlling_triplet);
+
+    private:
+        std::map<std::string, std::vector<XunitTest>> m_tests;
+    };
+}
diff --git a/locales/messages.en.json b/locales/messages.en.json
@@ -64,6 +64,7 @@
   "ChecksUnreachableCode": "unreachable code was reached",
   "ChecksUpdateVcpkg": "updating vcpkg by rerunning bootstrap-vcpkg may resolve this failure.",
   "CiBaselineAllowUnexpectedPassingRequiresBaseline": "--allow-unexpected-passing can only be used if a baseline is provided via --ci-baseline.",
+  "CiBaselineDisallowedCascade": "REGRESSION: {spec} cascaded, but it is required to pass. ({path}).",
   "CiBaselineRegression": "REGRESSION: {spec} failed with {build_result}. If expected, add {spec}=fail to {path}.",
   "CiBaselineRegressionHeader": "REGRESSIONS:",
   "CiBaselineUnexpectedPass": "PASSING, REMOVE FROM FAIL LIST: {spec} ({path}).",
@@ -99,7 +100,7 @@
   "ErrorVsCodeNotFoundPathExamined": "The following paths were examined:",
   "ExcludedPackage": "Excluded {spec}",
   "ExpectedCharacterHere": "expected '{expected}' here",
-  "ExpectedFailOrSkip": "expected 'fail' or 'skip' here",
+  "ExpectedFailOrSkip": "expected 'fail', 'skip', or 'pass' here",
   "ExpectedPortName": "expected a port name here",
   "ExpectedTripletName": "expected a triplet name here",
   "FailedToProvisionCe": "Failed to provision vcpkg-ce.",
@@ -194,7 +195,7 @@
   "ToolInWin10": "This utility is bundled with Windows 10 or later.",
   "UnexpectedErrorDuringBulkDownload": "an unexpected error occurred during bulk download.",
   "UnexpectedToolOutput": "{tool_name} ({path}) produced unexpected output when attempting to determine the version:",
-  "UnknownBaselineFileContent": "unrecognizable baseline entry; expected 'port:triplet=(fail|skip)'",
+  "UnknownBaselineFileContent": "unrecognizable baseline entry; expected 'port:triplet=(fail|skip|pass)'",
   "UnknownBinaryProviderType": "unknown binary provider type: valid providers are 'clear', 'default', 'nuget', 'nugetconfig', 'interactive', and 'files'",
   "UnknownTool": "vcpkg does not have a definition of this tool for this platform.",
   "UnsupportedSystemName": "Could not map VCPKG_CMAKE_SYSTEM_NAME '{system_name}' to a vcvarsall platform. Supported system names are '', 'Windows' and 'WindowsStore'.",

diff --git a/locales/messages.json b/locales/messages.json
@@ -117,6 +117,8 @@
   "ChecksUnreachableCode": "unreachable code was reached",
   "ChecksUpdateVcpkg": "updating vcpkg by rerunning bootstrap-vcpkg may resolve this failure.",
   "CiBaselineAllowUnexpectedPassingRequiresBaseline": "--allow-unexpected-passing can only be used if a baseline is provided via --ci-baseline.",
+  "CiBaselineDisallowedCascade": "REGRESSION: {spec} cascaded, but it is required to pass. ({path}).",
+  "_CiBaselineDisallowedCascade.comment": "An example of {spec} is zlib:x64-windows. An example of {path} is /foo/bar.",
   "CiBaselineRegression": "REGRESSION: {spec} failed with {build_result}. If expected, add {spec}=fail to {path}.",
   "_CiBaselineRegression.comment": "An example of {spec} is zlib:x64-windows. An example of {build_result} is One of the BuildResultXxx messages (such as BuildResultSucceeded/SUCCEEDED). An example of {path} is /foo/bar.",
   "CiBaselineRegressionHeader": "REGRESSIONS:",
@@ -179,7 +181,7 @@
   "_ExcludedPackage.comment": "An example of {spec} is zlib:x64-windows.",
   "ExpectedCharacterHere": "expected '{expected}' here",
   "_ExpectedCharacterHere.comment": "{expected} is a locale-invariant delimiter; for example, the ':' or '=' in 'zlib:x64-windows=skip'",
-  "ExpectedFailOrSkip": "expected 'fail' or 'skip' here",
+  "ExpectedFailOrSkip": "expected 'fail', 'skip', or 'pass' here",
   "ExpectedPortName": "expected a port name here",
   "ExpectedTripletName": "expected a triplet name here",
   "FailedToProvisionCe": "Failed to provision vcpkg-ce.",
@@ -336,7 +338,7 @@
   "UnexpectedErrorDuringBulkDownload": "an unexpected error occurred during bulk download.",
   "UnexpectedToolOutput": "{tool_name} ({path}) produced unexpected output when attempting to determine the version:",
   "_UnexpectedToolOutput.comment": "The actual command line output will be appended after this message. An example of {tool_name} is aria2. An example of {path} is /foo/bar.",
-  "UnknownBaselineFileContent": "unrecognizable baseline entry; expected 'port:triplet=(fail|skip)'",
+  "UnknownBaselineFileContent": "unrecognizable baseline entry; expected 'port:triplet=(fail|skip|pass)'",
   "UnknownBinaryProviderType": "unknown binary provider type: valid providers are 'clear', 'default', 'nuget', 'nugetconfig', 'interactive', and 'files'",
   "UnknownTool": "vcpkg does not have a definition of this tool for this platform.",
   "UnsupportedSystemName": "Could not map VCPKG_CMAKE_SYSTEM_NAME '{system_name}' to a vcvarsall platform. Supported system names are '', 'Windows' and 'WindowsStore'.",
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ namespace vcpkg @@
         {
             Skip,
             Fail,
+            Pass,
         };
         enum class SkipFailures : bool
         {
@@ Expand Down @@