Update engine to playtest-20221223.

.github/workflows/packaging.yml

@@ -37,8 +37,8 @@ jobs:
           file_glob: true
           file: build/linux/*
 
-  macos-net:
-    name: macOS .NET
+  macos:
+    name: macOS Disk Image
     runs-on: macos-11
     steps:
       - name: Clone Repository
@@ -62,7 +62,7 @@ jobs:
         run: |
           make engine
           mkdir -p build/macos
-          ./packaging/macos/buildpackage.sh "${GIT_TAG}" "${PWD}/build/macos" "standard" "build.dmg"
+          ./packaging/macos/buildpackage.sh "${GIT_TAG}" "${PWD}/build/macos"
 
       - name: Upload Package
         uses: svenstaro/upload-release-action@v2

Makefile

@@ -53,21 +53,30 @@ MOD_SOLUTION_FILES = $(shell find . -maxdepth 1 -iname '*.sln' 2> /dev/null)
 MSBUILD = msbuild -verbosity:m -nologo
 DOTNET = dotnet
 
-RUNTIME ?= net5
+RUNTIME ?= net6
+DOTNET_RID = $(shell ${DOTNET} --info | grep RID: | cut -w -f3)
 
 ifndef TARGETPLATFORM
 UNAME_S := $(shell uname -s)
 UNAME_M := $(shell uname -m)
 ifeq ($(UNAME_S),Darwin)
+ifeq ($(RUNTIME)-$(DOTNET_RID),net6-osx-arm64)
+TARGETPLATFORM = osx-arm64
+else
 TARGETPLATFORM = osx-x64
+endif
 else
 ifeq ($(UNAME_M),x86_64)
 TARGETPLATFORM = linux-x64
 else
+ifeq ($(UNAME_M),aarch64)
+TARGETPLATFORM = linux-arm64
+else
 TARGETPLATFORM = unix-generic
 endif
 endif
 endif
+endif
 
 check-sdk-scripts:
 	@awk '/\r$$/ { exit(1); }' mod.config || (printf "Invalid mod.config format: file must be saved using unix-style (CR, not CRLF) line endings.\n"; exit 1)

mod.config

@@ -9,7 +9,7 @@
 MOD_ID="cnc"
 
 # The OpenRA engine version to use for this project.
-ENGINE_VERSION="2aaf0afc5f"
+ENGINE_VERSION="7a507e8dbe"
 
 ##############################################################################
 # Packaging

mods/cnc/chrome/mainmenu-prerelease-notification.yaml

@@ -44,7 +44,7 @@ Container@MAINMENU_PRERELEASE_NOTIFICATION:
 			X: (WINDOW_RIGHT - WIDTH) / 2
 			Y: (WINDOW_BOTTOM - HEIGHT) / 2
 			Width: 550
-			Height: 155
+			Height: 120
 			Children:
 				Label@TITLE:
 					Width: PARENT_RIGHT

packaging/functions.sh

@@ -35,13 +35,13 @@ install_mod_assemblies() {
 			install -m644 "${LIB}" "${DEST_PATH}"
 		done
 
-		if [ "${TARGETPLATFORM}" = "linux-x64" ]; then
+		if [ "${TARGETPLATFORM}" = "linux-x64" ] || [ "${TARGETPLATFORM}" = "linux-arm64" ]; then
 			for LIB in "${ENGINE_PATH}/bin/"*.so; do
 				install -m755 "${LIB}" "${DEST_PATH}"
 			done
 		fi
 
-		if [ "${TARGETPLATFORM}" = "osx-x64" ]; then
+		if [ "${TARGETPLATFORM}" = "osx-x64" ] || [ "${TARGETPLATFORM}" = "osx-arm64" ]; then
 			for LIB in "${ENGINE_PATH}/bin/"*.dylib; do
 				install -m755 "${LIB}" "${DEST_PATH}"
 			done