Try to fix GitHub Actions VS 2022 32-bit ARM build failure, issue #839.

zufuliu · Nov 17, 2024 · e53e433 · e53e433
1 parent baae6d2
commit e53e433
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -113,6 +113,7 @@ jobs:
 
     - name: MSVC ARM Release
       run: |
+        CALL "build\install_msvc.bat" arm
         CALL "build\VS2017\build.bat" Build ARM Release 1
         CALL "build\make_zip.bat" MSVC ARM Release 1
 

diff --git a/build/VS2017/Notepad4.sln b/build/VS2017/Notepad4.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.1145
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35506.116 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad4", "Notepad4.vcxproj", "{B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}"
 EndProject

diff --git a/build/install_msvc.bat b/build/install_msvc.bat
@@ -2,9 +2,16 @@
 @rem used for GitHub Actions
 SetLocal EnableExtensions
 
+SET "Win10Lib=C:\Program Files (x86)\Windows Kits\10\Lib"
 SET "VSINSTALLER=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vs_installer.exe"
 SET "VSPATH=C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
 
+IF /I "%~1" == "arm" (
+	SHIFT
+	robocopy "%Win10Lib%\10.0.22621.0\ucrt\arm" "%Win10Lib%\10.0.26100.0\ucrt\arm" /E 1>NUL
+	robocopy "%Win10Lib%\10.0.22621.0\um\arm" "%Win10Lib%\10.0.26100.0\um\arm" /E 1>NUL
+)
+
 IF /I "%~1" == "v141_xp" (
 	SHIFT
 	"%VSINSTALLER%" modify --installPath "%VSPATH%" --add Microsoft.VisualStudio.Component.WinXP --quiet --norestart --nocache

diff --git a/locale/Locale.sln b/locale/Locale.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.11.35327.3
+VisualStudioVersion = 17.12.35506.116 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad4(zh-Hans)", "zh-Hans\Notepad4(zh-Hans).vcxproj", "{14E1F7FB-7F84-4D06-AF55-378DFD7519DF}"
 EndProject