diff --git a/.github/workflows/icu4c.yml b/.github/workflows/icu4c.yml index 7b187491fae..00e699fb4bc 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 6d57e9f3f4e..b901a090faa 100644 --- a/.github/workflows/icu_merge_ci.yml +++ b/.github/workflows/icu_merge_ci.yml @@ -819,11 +819,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 }} diff --git a/icu4c/source/data/makedata_uwp.vcxproj b/icu4c/source/data/makedata_uwp.vcxproj index cdc4e4ec211..22e00aadc2b 100644 --- a/icu4c/source/data/makedata_uwp.vcxproj +++ b/icu4c/source/data/makedata_uwp.vcxproj @@ -1,5 +1,9 @@  + + win10-arm;win10-arm-aot;win10-arm64-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot + + Debug