From ed20e9184d62cf0645d21099b7c5b338890fec98 Mon Sep 17 00:00:00 2001 From: Mihai Nita Date: Sat, 30 Nov 2024 20:16:23 -0800 Subject: [PATCH] ICU-22977 Revert temp fix for MSVC builds, SkipUWP This reverts commit 743998dfaf93a534dec60de159f2dbdd69324386. --- .github/workflows/icu4c.yml | 8 ++++---- .github/workflows/icu_merge_ci.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/icu4c.yml b/.github/workflows/icu4c.yml index 0dcb475952ad..9909375027fb 100644 --- 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 /p:SkipUWP=true + run: msbuild icu4c/source/allinone/allinone.sln /p:Configuration=Release /p:Platform=x64 - name: Build Solution run: | - msbuild icu4c/source/allinone/allinone.sln ${{ matrix.build_flags }} /p:SkipUWP=true + msbuild icu4c/source/allinone/allinone.sln ${{ matrix.build_flags }} - 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 /p:SkipUWP=true + run: msbuild icu4c/source/allinone/allinone.sln /p:Configuration=Release /p:Platform=x64 - name: Build Solution - run: msbuild icu4c/source/allinone/allinone.sln /p:Configuration=Release /p:Platform=${{ matrix.plat }} /p:SkipUWP=true + run: msbuild icu4c/source/allinone/allinone.sln /p:Configuration=Release /p:Platform=${{ matrix.plat }} - 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 index 51d264e7ac88..9abc7638978e 100644 --- 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 }} /p:SkipUWP=true + run: msbuild icu4c/source/allinone/allinone.sln /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }} - 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 }} /p:SkipUWP=true + run: msbuild icu4c/source/samples/all/all.sln /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.arch }} - name: Test Samples (samplecheck.bat) run: icu4c/source/samples/all/samplecheck.bat ${{ matrix.arch }} ${{ matrix.config }}