Merge branch 'unicode-org:main' into mihai_ja_JP_TRADITIONAL

unicode-org · Nov 21, 2024 · 35231c2 · 35231c2
2 parents bf93656 + 743998d
commit 35231c2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/icu4c.yml b/.github/workflows/icu4c.yml
@@ -383,10 +383,10 @@ jobs:
         uses: microsoft/setup-msbuild@v2
       - name: Build Solution x64
         if: contains(matrix.test_flags, 'arm Release')
-        run: msbuild icu4c/source/allinone/allinone.sln /p:Configuration=Release /p:Platform=x64
+        run: msbuild icu4c/source/allinone/allinone.sln /p:Configuration=Release /p:Platform=x64 /p:SkipUWP=true
       - name: Build Solution
         run: |
-          msbuild icu4c/source/allinone/allinone.sln ${{ matrix.build_flags }}
+          msbuild icu4c/source/allinone/allinone.sln ${{ matrix.build_flags }} /p:SkipUWP=true
       - name: Run ${{ matrix.test_flags }} Tests (icucheck.bat)
         if: contains(matrix.test_flags, 'arm Release') == false
         run: |
@@ -433,9 +433,9 @@ jobs:
       uses: microsoft/setup-msbuild@v2
     - name: Build Solution x64
       if: contains(matrix.win_ver, 'ARM64')
-      run: msbuild icu4c/source/allinone/allinone.sln /p:Configuration=Release /p:Platform=x64
+      run: msbuild icu4c/source/allinone/allinone.sln /p:Configuration=Release /p:Platform=x64 /p:SkipUWP=true
     - name: Build Solution
-      run: msbuild icu4c/source/allinone/allinone.sln /p:Configuration=Release /p:Platform=${{ matrix.plat }}
+      run: msbuild icu4c/source/allinone/allinone.sln /p:Configuration=Release /p:Platform=${{ matrix.plat }} /p:SkipUWP=true
     - name: Run Tests (icucheck.bat)
       if: contains(matrix.win_ver, 'ARM64') == false
       run: icu4c/source/allinone/icucheck.bat ${{ matrix.arch }} Release

diff --git a/.github/workflows/icu_merge_ci.yml b/.github/workflows/icu_merge_ci.yml
@@ -843,11 +843,11 @@ jobs:
       - name: Set up MSBuild
         uses: microsoft/setup-msbuild@v2
       - name: Build Solution
-        run: msbuild icu4c/source/allinone/allinone.sln /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }}
+        run: msbuild icu4c/source/allinone/allinone.sln /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }} /p:SkipUWP=true
       - name: Run Tests (icucheck.bat)
         run: icu4c/source/allinone/icucheck.bat ${{ matrix.arch }} ${{ matrix.config }}
       - name: Build Sample Solution
-        run: msbuild icu4c/source/samples/all/all.sln /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.arch }}
+        run: msbuild icu4c/source/samples/all/all.sln /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.arch }} /p:SkipUWP=true
       - name: Test Samples (samplecheck.bat)
         run: icu4c/source/samples/all/samplecheck.bat ${{ matrix.arch }} ${{ matrix.config }}
 

diff --git a/docs/userguide/transforms/general/rules.md b/docs/userguide/transforms/general/rules.md
@@ -503,7 +503,7 @@ the position, for those cases:
 The first rule will convert "x", when preceded by a vowel, into "ks". The
 transform will then backup to the position before the vowel and continue. In the
 next pass, the "ak" will match and be invoked. Thus, if the source text is "ax",
-the result will be "ack".
+the result will be "acks".
 
 > :point_right: **Note**: *Although you can move the cursor forward or backward, it is limited in two
 ways: (a) to the text that is matched, (b) within the original substring that is