ICU-23049 Re-enable UWP in CI

ARM 32 not supported in newer SDKs.
`Build.Windows.UWP.ProjectConfiguration.props` now does what
`Build.Windows.ProjectConfiguration.props` was already doing.

I think that in an ideal world the uwp projects / properties
should be a lot more similar to the non-uwp ones.

Author: mihnita

.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

.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 }}
 

icu4c/source/allinone/Build.Windows.UWP.ProjectConfiguration.props

@@ -33,6 +33,22 @@
     <IcuBinOutputDir>binARM64uwp</IcuBinOutputDir>
     <IcuLibOutputDir>libARM64uwp</IcuLibOutputDir>
   </PropertyGroup>
+  <!-- Desktop ARM/ARM64 support requires a different version of the Windows SDK -->
+  <!--
+      Note: This version must match the version below in the ARM64 section for AdditionalLibraryDirectories
+  -->
+  <PropertyGroup Condition="'$(Platform)'=='ARM'">
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)'=='ARM64'">
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!-- We need to explicitly set the target version to Windows 7. -->
+    <Win32_WinNTVersion>0x0601</Win32_WinNTVersion>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <Midl>
       <PreprocessorDefinitions>