Merge pull request #1658 from swiftlang/automerge/merge-main-2025-12-19_09-05

jmschonfeld · web-flow · commit 92a2fa617bdb · 2025-12-19T11:40:36.000-05:00
Merge `release/6.3` into `main`
diff --git a/Tests/FoundationInternationalizationTests/Formatting/ICUPatternGeneratorTests.swift b/Tests/FoundationInternationalizationTests/Formatting/ICUPatternGeneratorTests.swift
@@ -19,6 +19,7 @@ import Testing
 private struct ICUPatternGeneratorTests {
 
     typealias DateFieldCollection = Date.FormatStyle.DateFieldCollection
+#if FIXED_ICU78
     @Test func conversationalDayPeriodsOverride() {
 
         var locale: Locale
@@ -253,5 +254,5 @@ private struct ICUPatternGeneratorTests {
                  expectedPattern: "h:mm:ss a")
         }
     }
-
+#endif
 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import Testing`
`19`	`19`	`private struct ICUPatternGeneratorTests {`
`20`	`20`
`21`	`21`	`typealias DateFieldCollection = Date.FormatStyle.DateFieldCollection`
	`22`	`+#if FIXED_ICU78`
`22`	`23`	`@Test func conversationalDayPeriodsOverride() {`
`23`	`24`
`24`	`25`	`var locale: Locale`
`@@ -253,5 +254,5 @@ private struct ICUPatternGeneratorTests {`
`253`	`254`	`expectedPattern: "h:mm:ss a")`
`254`	`255`	`}`
`255`	`256`	`}`
`256`		`-`
	`257`	`+#endif`
`257`	`258`	`}`