Merge branch 'next' into bumpsnag-bugsnag-android-v6.9.0

# Conflicts:
#	CHANGELOG.md

.buildkite/pipeline.yml

@@ -21,28 +21,9 @@ steps:
             - exit_status: "*"
               limit: 1
 
-      - label: Ensure notifier builds on Windows (for development)
-        timeout_in_minutes: 30
-        agents:
-          queue: windows-unity-wsl
-        env:
-          UNITY_VERSION: *2021
-          WSLENV: UNITY_VERSION
-        command:
-          - /mnt/c/Windows/System32/cmd.exe /c  .\\scripts\\ci-build-windows-plugin.bat
-        plugins:
-          artifacts#v1.5.0:
-            upload:
-              - from: Bugsnag.unitypackage
-                to: Bugsnag_WindowsBuilt.unitypackage
-        retry:
-          automatic:
-            - exit_status: "*"
-              limit: 1
-
   - label: 'Run size impact reporting'
     depends_on: build_unitypackage
-    timeout_in_minutes: 10
+    timeout_in_minutes: 30
     env:
       UNITY_VERSION: *2021
     plugins:

.buildkite/unity.2020.yml

@@ -27,27 +27,6 @@ steps:
             - exit_status: "*"
               limit: 1
 
-      # - label: ':android: Build Android EDM test fixture for Unity 2020'
-      #   timeout_in_minutes: 30
-      #   key: 'build-edm-fixture-2020'
-      #   env:
-      #     UNITY_VERSION: *2020
-      #   plugins:
-      #     artifacts#v1.9.0:
-      #       download:
-      #         - Bugsnag.unitypackage
-      #       upload:
-      #         - features/fixtures/EDM_Fixture/edm_2020.apk
-      #         - features/scripts/buildEdmFixture.log
-      #         - features/scripts/edmImport.log
-      #         - features/scripts/enableEdm.log
-      #   commands:
-      #     - rake test:edm:build
-      #   retry:
-      #     automatic:
-      #       - exit_status: "*"
-      #         limit: 1
-
       #
       # Build iOS test fixtures
       #
@@ -117,6 +96,7 @@ steps:
           automatic:
             - exit_status: "*"
               limit: 1
+
       - label: Build Unity 2020 WebGL test fixture
         timeout_in_minutes: 30
         key: "webgl-2020-fixture"
@@ -198,35 +178,6 @@ steps:
         concurrency_group: "bitbar"
         concurrency_method: eager
 
-      # - label: ':android: Run Android EDM e2e tests for Unity 2020'
-      #   timeout_in_minutes: 60
-      #   depends_on: 'build-edm-fixture-2020'
-      #   agents:
-      #     queue: opensource
-      #   env:
-      #     UNITY_VERSION: *2021
-      #   plugins:
-      #     artifacts#v1.9.0:
-      #       download:
-      #         - "features/fixtures/EDM_Fixture/edm_2020.apk"
-      #       upload:
-      #         - "maze_output/**/*"
-      #     docker-compose#v3.7.0:
-      #       pull: maze-runner
-      #       run: maze-runner
-      #       command:
-      #         - "--app=/app/features/fixtures/EDM_Fixture/edm_2020.apk"
-      #         - "--farm=bs"
-      #         - "--device=ANDROID_11_0"
-      #         - "features/edm"
-      #     test-collector#v1.10.2:
-      #       files: "reports/TEST-*.xml"
-      #       format: "junit"
-      #       branch: "^master|next$$"
-      #   concurrency: 5
-      #   concurrency_group: browserstack-app
-      #   concurrency_method: eager
-
       - label: ":bitbar: :ios: Run iOS e2e tests for Unity 2020"
         timeout_in_minutes: 60
         depends_on: "build-ios-fixture-2020"

.buildkite/unity.2021.yml

@@ -27,27 +27,6 @@ steps:
             - exit_status: "*"
               limit: 1
 
-      # - label: ':android: Build Android EDM test fixture for Unity 2021'
-      #   timeout_in_minutes: 30
-      #   key: 'build-edm-fixture-2021'
-      #   env:
-      #     UNITY_VERSION: *2021
-      #   plugins:
-      #     artifacts#v1.5.0:
-      #       download:
-      #         - Bugsnag.unitypackage
-      #       upload:
-      #         - features/fixtures/EDM_Fixture/edm_2021.3.36f1.apk
-      #         - features/scripts/buildEdmFixture.log
-      #         - features/scripts/edmImport.log
-      #         - features/scripts/enableEdm.log
-      #   commands:
-      #     - rake test:edm:build
-      #   retry:
-      #     automatic:
-      #       - exit_status: "*"
-      #         limit: 1
-
       #
       # Build iOS test fixtures
       #
@@ -134,35 +113,6 @@ steps:
         concurrency_group: "bitbar"
         concurrency_method: eager
 
-      # - label: ':android: Run Android EDM e2e tests for Unity 2021'
-      #   timeout_in_minutes: 30
-      #   depends_on: 'build-edm-fixture-2021'
-      #   agents:
-      #     queue: opensource
-      #   env:
-      #     UNITY_VERSION: "2021.3.36f1"
-      #   plugins:
-      #     artifacts#v1.5.0:
-      #       download:
-      #         - "features/fixtures/EDM_Fixture/edm_2021.3.36f1.apk"
-      #       upload:
-      #         - "maze_output/**/*"
-      #     docker-compose#v3.7.0:
-      #       pull: maze-runner
-      #       run: maze-runner
-      #       command:
-      #         - "--app=/app/features/fixtures/EDM_Fixture/edm_2021.3.36f1.apk"
-      #         - "--farm=bs"
-      #         - "--device=ANDROID_11_0"
-      #         - "features/edm"
-      #     test-collector#v1.10.2:
-      #       files: "reports/TEST-*.xml"
-      #       format: "junit"
-      #       branch: "^master|next$$"
-      #   concurrency: 5
-      #   concurrency_group: browserstack-app
-      #   concurrency_method: eager
-
       - label: ":bitbar: :ios: Run iOS e2e tests for Unity 2021"
         timeout_in_minutes: 60
         depends_on: "build-ios-fixture-2021"

.gitignore

@@ -49,3 +49,19 @@ features/fixtures/minimalapp/minimal_with_xcode
 features/fixtures/minimalapp/minimal_without_xcode
 features/fixtures/minimalapp/Packages
 Gemfile.lock
+Assembly-CSharp-Editor.csproj
+Assembly-CSharp.csproj
+Bugsnag.sln
+BugsnagEditor.csproj
+BugsnagUnity.csproj
+BugsnagUnityTests.csproj
+Bugsnag/.vscode
+Bugsnag/Library
+features/fixtures/maze_runner/.vscode
+Bugsnag/Temp
+Bugsnag/UserSettings
+Bugsnag/Assets/Bugsnag/Plugins
+upm/UPMImportProject/Library
+upm-package
+upm/UPMImportProject/.vscode
+UPMImportProject.sln

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "bugsnag-android"]
 	path = bugsnag-android
 	url = https://github.com/bugsnag/bugsnag-android
-[submodule "src/BugsnagUnity/BugsnagUnityWebRequest"]
-	path = src/BugsnagUnity/BugsnagUnityWebRequest
-	url = https://github.com/bugsnag/bugsnag-unity-web-request

upm-tools/AssemblyDefinitions/BugsnagEditor.asmdef → Bugsnag/Assets/Bugsnag/Editor/BugsnagEditor.asmdef

@@ -1,9 +1,9 @@
 {
     "name": "BugsnagEditor",
+    "rootNamespace": "",
     "references": [
-        "Bugsnag"
+        "GUID:8d198819d450d4d6292709bec5a655cc"
     ],
-    "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor"
     ],
@@ -12,5 +12,7 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": true,
-    "defineConstraints": []
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Bugsnag/Assets/Bugsnag/Runtime/BugsnagUnity.asmdef

@@ -0,0 +1,3 @@
+{
+	"name": "BugsnagUnity"
+}