Skip to content

Commit bde1dc9

Browse files
authored
Update Windows runner in build_windows action to windows-latest (from windows-2019) (#1261)
* Change windows-2019 runner to windows-latest. * Update libz removal path. * Update VS version for Windows build. * Change .NET version.
1 parent 63ac2b1 commit bde1dc9

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.github/workflows/build_windows.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ permissions: write-all
4040
jobs:
4141
build_desktop:
4242
name: build-windows-unity${{inputs.unity_version}}-CPP${{ inputs.firebase_cpp_sdk_version }}
43-
runs-on: windows-2019
43+
runs-on: windows-latest
4444
strategy:
4545
fail-fast: false
4646

@@ -108,13 +108,15 @@ jobs:
108108
- name: Remove zlib
109109
shell: bash
110110
run: |
111-
rm C:/msys64/mingw64/lib/libz*
111+
rm -f C:/mingw32/i686-w64-mingw32/lib/libz*
112+
rm -f C:/mingw64/x86_64-w64-mingw32/lib/libz*
113+
rm -f C:/msys64/mingw64/lib/libz*
112114
113115
# Strawberry Perl has zlib within, so we also remove it
114116
- name: Remove Strawberry
115117
shell: bash
116118
run: |
117-
rm -r C:/Strawberry
119+
rm -rf C:/Strawberry
118120
119121
- name: Build SDK (Windows)
120122
timeout-minutes: 90

cmake/unity_mono.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ endmacro()
204204
# sys_references: System CSharp libraries this depends on
205205
# dep_targets: Targets this target depends on and need to be linked/built first
206206
# guid: MSBuild project guid (for use with solution files)
207-
# framework_version: .net framework version, defaults to 4.5
207+
# framework_version: .net framework version, defaults to 4.7.2
208208
# defines: Extra defines to add to the project file
209209
# assembly_name: Name of the output assembly. Defaults to module
210210
# xbuild: Path to xbuild executable. Defaults to XBUILD_EXE global var
@@ -259,7 +259,7 @@ macro(mono_add_internal name output_type)
259259
endif()
260260

261261
if ("${UNITY_MONO_FRAMEWORK_VERSION}" STREQUAL "")
262-
set(UNITY_MONO_FRAMEWORK_VERSION "4.5")
262+
set(UNITY_MONO_FRAMEWORK_VERSION "4.7.2")
263263
endif()
264264

265265
if ("${UNITY_MONO_ASSEMBLY_NAME}" STREQUAL "")

scripts/build_scripts/build_zips.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ def get_windows_args():
430430
cmake args for windows platform.
431431
"""
432432
result_args = []
433-
result_args.append('-G Visual Studio 16 2019')
433+
result_args.append('-G Visual Studio 17 2022')
434434
result_args.append('-A x64') # TODO flexibily for x32
435435
result_args.append("-DFIREBASE_PYTHON_HOST_EXECUTABLE:FILEPATH=%s" % sys.executable)
436436
# Use a newer version of the Windows SDK, as the default one has build issues with grpc

0 commit comments

Comments
 (0)