ICU-22977 Temp fix for MSVC builds: SkipUWP

unicode-org · Nov 21, 2024 · 743998d · 743998d
1 parent f55c499
commit 743998d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 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 }}