ci: use windows 2025 runners

Build/Chakra.Build.Default.props

@@ -29,10 +29,10 @@
     <EnableIntl Condition="'$(EnableIntl)'==''">true</EnableIntl>
     <EnableIntl Condition="'$(BuildLite)'=='true'">false</EnableIntl>
 
-    <ChakraICU Condition="'$(ChakraICU)'==''">false</ChakraICU>
+    <ChakraICU Condition="'$(ChakraICU)'==''">windows</ChakraICU>
 
     <BuildChakraICUData Condition="'$(BuildChakraICUData)'=='' AND ('$(ChakraICU)'=='static' OR '$(ChakraICU)'=='shared')">true</BuildChakraICUData>
 
-    <IcuLibraryDependencies Condition="'$(ChakraICU)'=='windows'">icuuc.lib;icuin.lib</IcuLibraryDependencies>
+    <IcuLibraryDependencies Condition="'$(ChakraICU)'=='windows'">icu.lib</IcuLibraryDependencies>
   </PropertyGroup>
 </Project>

azure-pipelines.yml

@@ -125,71 +125,71 @@ jobs:
       maxParallel: 4
       matrix:
         x86.Debug:
-          image_name: 'windows-2022'
+          image_name: 'windows-2025'
           build_type: 'debug'
           target: 'x86'
           special_build: ''
           do_test: true
           test_tags: ''
           build_outdir_suffix: ''
         x86.Test:
-          image_name: 'windows-2022'
+          image_name: 'windows-2025'
           build_type: 'test'
           target: 'x86'
           special_build: ''
           do_test: true
           test_tags: '--include-slow'
           build_outdir_suffix: ''
         x86.NoJit:
-          image_name: 'windows-2022'
+          image_name: 'windows-2025'
           build_type: 'debug'
           target: 'x86'
           special_build: '"/p:BuildJIT=false"'
           do_test: true
           test_tags: '-disablejit'
           build_outdir_suffix: '.NoJIT'
         x86.Release:
-          image_name: 'windows-2022'
+          image_name: 'windows-2025'
           build_type: 'release'
           target: 'x86'
           special_build: ''
           do_test: false
           test_tags: ''
           build_outdir_suffix: ''
         x64.Debug:
-          image_name: 'windows-2022'
+          image_name: 'windows-2025'
           build_type: 'debug'
           target: 'x64'
           special_build: ''
           do_test: true
           test_tags: ''
           build_outdir_suffix: ''
         x64.Test:
-          image_name: 'windows-2022'
+          image_name: 'windows-2025'
           build_type: 'test'
           target: 'x64'
           special_build: ''
           do_test: true
           test_tags: '--include-slow'
           build_outdir_suffix: ''
         x64.Release:
-          image_name: 'windows-2022'
+          image_name: 'windows-2025'
           build_type: 'release'
           target: 'x64'
           special_build: ''
           do_test: false
           test_tags: ''
           build_outdir_suffix: ''
-        win19.x86.Release:
-          image_name: 'windows-2019'
+        win22.x86.Release:
+          image_name: 'windows-2022'
           build_type: 'release'
           target: 'x86'
           special_build: ''
           do_test: false
           test_tags: ''
           build_outdir_suffix: ''
-        win19.x64.Release:
-          image_name: 'windows-2019'
+        win22.x64.Release:
+          image_name: 'windows-2022'
           build_type: 'release'
           target: 'x64'
           special_build: ''

test/Intl/GetCanonicalLocales.js

@@ -90,18 +90,24 @@ var tests = [
             // V8 and CC-ICU also give the default value of "yes" to non-boolean keys (co), which also is incorrect.
             // Everyone (should) correctly re-order extension keys alphabetically
             // Microsoft/ChakraCore#4490 tracks the incorrect defaulting, Microsoft/ChakraCore#2964 tracks the overall investigation
-            equal("de-DE-u-co-kn", "de-DE-u-co-yes-kn-true", gcl("de-de-u-kn-co")[0]);
-            equal("de-DE-u-co-phonebk-kn", "de-DE-u-co-phonebk-kn-true", gcl("de-de-u-kn-co-phonebk")[0]);
-            equal("de-DE-u-co-phonebk-kn-yes", "de-DE-u-co-phonebk-kn-true", gcl("de-DE-u-kn-yes-co-phonebk")[0]);
+            if (WScript.Platform.ICU_VERSION < 62) {
+                assert.areEqual(["de-DE-u-co-yes-kn-true"], Intl.getCanonicalLocales("de-de-u-kn-co"))
+                assert.areEqual(["de-DE-u-co-phonebk-kn-true"], Intl.getCanonicalLocales("de-de-u-kn-co-phonebk"))
+                assert.areEqual(["de-DE-u-co-phonebk-kn-true"], Intl.getCanonicalLocales("de-DE-u-kn-yes-co-phonebk"))
+            } else {
+                assert.areEqual(["de-DE-u-co-kn"], Intl.getCanonicalLocales("de-de-u-kn-co"))
+                assert.areEqual(["de-DE-u-co-phonebk-kn"], Intl.getCanonicalLocales("de-de-u-kn-co-phonebk"))
+                assert.areEqual(["de-DE-u-co-phonebk-kn"], Intl.getCanonicalLocales("de-DE-u-kn-yes-co-phonebk"))
+            }
 
             // De-dupe after locales are canonicalized
             assert.areEqual(Intl.getCanonicalLocales(['en-us', 'en-us']), ['en-US'], "No duplicates, same input casing (casing was incorrect)");
             assert.areEqual(Intl.getCanonicalLocales(['en-US', 'en-US']), ['en-US'], "No duplicates, same input casing (casing was correct)");
             assert.areEqual(Intl.getCanonicalLocales(['en-us', 'en-US']), ['en-US'], "No duplicates, different input casing");
 
             assert.areEqual(
+                ["de-DE", "de-DE-u-co-phonebk-kn"],
                 Intl.getCanonicalLocales(["de-de", "de-DE-u-co-phonebk-kn-true", "de-DE-u-kn-true-co-phonebk"]),
-                ["de-DE", "de-DE-u-co-phonebk-kn-true"],
                 "No duplicates after re-ordering options"
             );
         }
@@ -122,8 +128,12 @@ var tests = [
             // TODO (doilij): Investigate what is correct/allowable here (Microsoft/ChakraCore#2964)
             equal("xx-zzz", "zzz", gcl("xx-zzz")[0]);
 
-            // See discussion of defaulting above (V8/CC-ICU and CC-WinGlob/SM distinction remains true here)
-            equal("xx-ZZ-u-yy-zz", "xx-ZZ-u-yy-yes-zz-yes", gcl("xx-zz-u-zz-yy")[0]);
+            // See discussion of defaulting above
+            if (WScript.Platform.ICU_VERSION < 62) {
+                assert.areEqual(["xx-ZZ-u-yy-yes-zz-yes"], Intl.getCanonicalLocales("xx-zz-u-zz-yy"));
+            } else {
+                assert.areEqual(["xx-ZZ-u-yy-zz"], Intl.getCanonicalLocales("xx-zz-u-zz-yy"));
+            }
         }
     },
     {

test/Intl/rlexe.xml

@@ -37,7 +37,7 @@
     <default>
       <files>GetCanonicalLocales.js</files>
       <compile-flags>-args summary -endargs</compile-flags>
-      <tags>Intl,exclude_icu62AndAboveTestFailures</tags>
+      <tags>Intl</tags>
     </default>
   </test>
   <test>