diff --git a/.github/workflows/icu4c.yml b/.github/workflows/icu4c.yml index 5e9842737a0a..99891c0edd3d 100644 --- a/.github/workflows/icu4c.yml +++ b/.github/workflows/icu4c.yml @@ -407,10 +407,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: | @@ -430,7 +430,7 @@ jobs: - name: Set up MSBuild uses: microsoft/setup-msbuild@v2 - name: Build Solution with Data Filter - 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 # Windows MSVC distribution release windows-msvc-dist-release: @@ -457,9 +457,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 e9961f18aca8..08ad231cea59 100644 --- a/.github/workflows/icu_merge_ci.yml +++ b/.github/workflows/icu_merge_ci.yml @@ -787,11 +787,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/allinone/Build.Windows.UWP.ProjectConfiguration.props b/icu4c/source/allinone/Build.Windows.UWP.ProjectConfiguration.props index 7e550f42aa82..bdf5a0ba4e9d 100644 --- a/icu4c/source/allinone/Build.Windows.UWP.ProjectConfiguration.props +++ b/icu4c/source/allinone/Build.Windows.UWP.ProjectConfiguration.props @@ -33,6 +33,22 @@ binARM64uwp libARM64uwp + + + + 10.0.22621.0 + true + + + 10.0.22621.0 + true + + + + 0x0601 +