Fix testVersionHandlerActivation

Author: chkuang-g

.github/workflows/test.yaml

@@ -105,14 +105,13 @@ jobs:
         timeout-minutes: 60
         run: |
           # DISABLE: NUnit test is currently broken from Unity 2019
-          # DISABLE: testVersionHandlerActivationBatchMode is causing timeout.
           ./gradlew test -q \
                     -PINTERACTIVE_MODE_TESTS_ENABLED=0 \
                     -PINCLUDE_TEST_TYPES="${{ needs.check_and_prepare.outputs.include_test_types }}" \
                     -PEXCLUDE_TEST_TYPES="NUnit,${{ needs.check_and_prepare.outputs.exclude_test_types }}" \
                     -PINCLUDE_TEST_MODULES="${{ needs.check_and_prepare.outputs.include_test_modules }}" \
                     -PEXCLUDE_TEST_MODULES="${{ needs.check_and_prepare.outputs.exclude_test_modules }}" \
-                    -PEXCLUDE_TESTS="testVersionHandlerActivationBatchMode,${{ needs.check_and_prepare.outputs.exclude_tests }}"
+                    -PEXCLUDE_TESTS="${{ needs.check_and_prepare.outputs.exclude_tests }}"
 
       - name: Print test log
         if: always()

source/VersionHandler/src/VersionHandler.cs

@@ -118,6 +118,12 @@ static VersionHandler() {
         } else {
             EditorApplication.update -= BootStrap;
             EditorApplication.update += BootStrap;
+            // A workaround to make sure bootstrap continues if Unity reloads assemblies
+            // during bootstrapping. The issue only observed in Unity 2019 and 2020
+            float unityVersion = GetUnityVersionMajorMinor();
+            if (unityVersion < 2021.0f && unityVersion >= 2019.0f) {
+              var type = BootStrappedImpl;
+            }
         }
     }
 

source/VersionHandlerImpl/test/activation/Assets/PlayServicesResolver/Editor/TestEnabledCallback.cs

@@ -42,7 +42,11 @@ private static Dictionary<string, Type> EntryPoints {
                 {
                     "IOS Resolver",
                     Google.VersionHandler.FindClass("Google.IOSResolver", "Google.IOSResolver")
-                 }
+                },
+                {
+                    "Package Manager Resolver",
+                    Google.VersionHandler.FindClass("Google.PackageManagerResolver", "Google.PackageManagerResolver")
+                }
             };
         }
     }