Merge commit '9fff3627757a76db932be572b62521043322e901' into remote-builder/refactor-cloudformation

dist/default-build-script/Assets/Editor/UnityBuilderAction/Builder.cs

@@ -53,14 +53,11 @@ namespace UnityBuilderAction
       if (addressableAssetSettingsType != null)
       {
         // ReSharper disable once PossibleNullReferenceException, used from try-catch
-        void CallAddressablesMethod(string methodName, object[] args) => addressableAssetSettingsType
-          .GetMethod(methodName, BindingFlags.Static | BindingFlags.Public)
-          .Invoke(null, args);
-
         try
         {
-          CallAddressablesMethod("CleanPlayerContent", new object[] { null });
-          CallAddressablesMethod("BuildPlayerContent", Array.Empty<object>());
+          addressableAssetSettingsType.GetMethod("CleanPlayerContent", BindingFlags.Static | BindingFlags.Public)
+                .Invoke(null, new object[] {null});
+          addressableAssetSettingsType.GetMethod("BuildPlayerContent", new Type[0]).Invoke(null, new object[0]);
         }
         catch (Exception e)
         {

dist/steps/activate.sh

@@ -25,7 +25,6 @@ if [[ -n "$UNITY_LICENSE" ]] || [[ -n "$UNITY_LICENSE_FILE" ]]; then
 
   # Activate license
   ACTIVATION_OUTPUT=$(unity-editor \
-      -nographics \
       -logFile /dev/stdout \
       -quit \
       -manualLicenseFile $FILE_PATH)
@@ -62,8 +61,6 @@ elif [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
 
   # Activate license
   unity-editor \
-    -batchmode \
-    -nographics \
     -logFile /dev/stdout \
     -quit \
     -serial "$UNITY_SERIAL" \

dist/steps/build.sh

@@ -109,7 +109,6 @@ echo "###########################"
 echo ""
 
 unity-editor \
-  -nographics \
   -logfile /dev/stdout \
   -quit \
   -customBuildName "$BUILD_NAME" \

dist/steps/return_license.sh

@@ -7,7 +7,6 @@ if [[ -n "$UNITY_SERIAL" ]]; then
   # This will return the license that is currently in use.
   #
   unity-editor \
-    -nographics \
     -logFile /dev/stdout \
     -quit \
     -returnlicense