Merge pull request #792 from bugsnag/next

Release v7.7.4
bugsnag · Apr 19, 2024 · 2bdb7e3 · 2bdb7e3
2 parents 8a24d53 + fb54714
commit 2bdb7e3
Show file tree

Hide file tree

Showing 16 changed files with 123 additions and 72 deletions.
diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml
@@ -30,8 +30,8 @@ steps:
       - scripts/ci-build-macos-packages.sh
     artifact_paths:
       - unity.log
-      - features/fixtures/maze_runner/build/MacOS-2020.3.48f1.zip
-      - features/fixtures/maze_runner/build/WebGL-2020.3.48f1.zip
+      - features/fixtures/maze_runner/build/MacOS-2020.zip
+      - features/fixtures/maze_runner/build/WebGL-2020.zip
     retry:
       automatic:
         - exit_status: "*"
@@ -52,8 +52,8 @@ steps:
       - scripts/ci-build-macos-packages.sh
     artifact_paths:
       - unity.log
-      - features/fixtures/maze_runner/build/MacOS-2021.3.36f1.zip
-      - features/fixtures/maze_runner/build/WebGL-2021.3.36f1.zip
+      - features/fixtures/maze_runner/build/MacOS-2021.zip
+      - features/fixtures/maze_runner/build/WebGL-2021.zip
     retry:
       automatic:
         - exit_status: "*"
@@ -74,8 +74,8 @@ steps:
       - scripts/ci-build-macos-packages.sh
     artifact_paths:
       - unity.log
-      - features/fixtures/maze_runner/build/MacOS-2022.3.22f1.zip
-      - features/fixtures/maze_runner/build/WebGL-2022.3.22f1.zip
+      - features/fixtures/maze_runner/build/MacOS-2022.zip
+      - features/fixtures/maze_runner/build/WebGL-2022.zip
     retry:
       automatic:
         - exit_status: "*"
@@ -94,7 +94,7 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - features/fixtures/maze_runner/build/MacOS-2020.3.48f1.zip
+          - features/fixtures/maze_runner/build/MacOS-2020.zip
         upload:
           - maze_output/**/*
           - '*-mazerunner.log'
@@ -113,7 +113,7 @@ steps:
   #   plugins:
   #     artifacts#v1.5.0:
   #       download:
-  #         - features/fixtures/maze_runner/build/MacOS-2021.3.36f1.zip
+  #         - features/fixtures/maze_runner/build/MacOS-2021.zip
   #       upload:
   #         - maze_output/**/*
   #         - Mazerunner.log
@@ -130,7 +130,7 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - features/fixtures/maze_runner/build/MacOS-2022.3.22f1.zip
+          - features/fixtures/maze_runner/build/MacOS-2022.zip
         upload:
           - maze_output/**/*
           - '*-mazerunner.log'
@@ -152,7 +152,7 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - features/fixtures/maze_runner/build/WebGL-2020.3.48f1.zip
+          - features/fixtures/maze_runner/build/WebGL-2020.zip
         upload:
           - maze_output/**/*
           - maze_output/metrics.csv
@@ -170,7 +170,7 @@ steps:
   #   plugins:
   #     artifacts#v1.5.0:
   #       download:
-  #         - features/fixtures/maze_runner/build/WebGL-2021.3.36f1.zip
+  #         - features/fixtures/maze_runner/build/WebGL-2021.zip
   #       upload:
   #         - maze_output/**/*
   #   # TODO: WebGL persistence tests are currently skipped pending PLAT-8151
@@ -187,7 +187,7 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - features/fixtures/maze_runner/build/WebGL-2022.3.22f1.zip
+          - features/fixtures/maze_runner/build/WebGL-2022.zip
         upload:
           - maze_output/**/*
     # TODO: WebGL persistence tests are currently skipped pending PLAT-8151
@@ -208,7 +208,7 @@ steps:
         download:
           - Bugsnag.unitypackage
         upload:
-          - features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk
+          - features/fixtures/maze_runner/mazerunner_2020.apk
           - features/fixtures/build_android_apk.log
     commands:
       - bundle install
@@ -229,7 +229,7 @@ steps:
         download:
           - Bugsnag.unitypackage
         upload:
-          - features/fixtures/maze_runner/mazerunner_2022.3.22f1.apk
+          - features/fixtures/maze_runner/mazerunner_2022.apk
           - features/fixtures/build_android_apk.log
     commands:
       - bundle install
@@ -250,7 +250,7 @@ steps:
   #       download:
   #         - Bugsnag.unitypackage
   #       upload:
-  #         - features/fixtures/EDM_Fixture/edm_2020.3.48f1.apk
+  #         - features/fixtures/EDM_Fixture/edm_2020.apk
   #         - features/scripts/buildEdmFixture.log
   #         - features/scripts/edmImport.log
   #         - features/scripts/enableEdm.log
@@ -274,7 +274,7 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - "features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk"
+          - "features/fixtures/maze_runner/mazerunner_2020.apk"
         upload:
           - "maze_output/**/*"
           - "maze_output/metrics.csv"
@@ -285,7 +285,7 @@ steps:
         command:
           - "features/csharp"
           - "features/android"
-          - "--app=features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk"
+          - "--app=features/fixtures/maze_runner/mazerunner_2020.apk"
           - "--farm=bb"
           - "--appium-version=1.22"
           - "--device=ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13"
@@ -306,7 +306,7 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - "features/fixtures/maze_runner/mazerunner_2022.3.22f1.apk"
+          - "features/fixtures/maze_runner/mazerunner_2022.apk"
         upload:
           - "maze_output/**/*"
           - "maze_output/metrics.csv"
@@ -317,7 +317,7 @@ steps:
         command:
           - "features/csharp"
           - "features/android"
-          - "--app=features/fixtures/maze_runner/mazerunner_2022.3.22f1.apk"
+          - "--app=features/fixtures/maze_runner/mazerunner_2022.apk"
           - "--farm=bb"
           - "--appium-version=1.22"
           - "--device=ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13"
@@ -338,14 +338,14 @@ steps:
   #   plugins:
   #     artifacts#v1.5.0:
   #       download:
-  #         - "features/fixtures/EDM_Fixture/edm_2020.3.48f1.apk"
+  #         - "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.3.48f1.apk"
+  #         - "--app=/app/features/fixtures/EDM_Fixture/edm_2020.apk"
   #         - "--farm=bs"
   #         - "--device=ANDROID_11_0"
   #         - "features/edm"
@@ -391,7 +391,7 @@ steps:
           - Bugsnag.unitypackage
           - project_2020.tgz
         upload:
-          - features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa
+          - features/fixtures/maze_runner/mazerunner_2020.ipa
           - features/fixtures/unity.log
     commands:
       - bundle install
@@ -437,7 +437,7 @@ steps:
           - Bugsnag.unitypackage
           - project_2022.tgz
         upload:
-          - features/fixtures/maze_runner/mazerunner_2022.3.22f1.ipa
+          - features/fixtures/maze_runner/mazerunner_2022.ipa
           - features/fixtures/unity.log
     commands:
       - bundle install
@@ -459,7 +459,7 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - "features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa"
+          - "features/fixtures/maze_runner/mazerunner_2020.ipa"
         upload:
           - "maze_output/**/*"
           - "maze_output/metrics.csv"
@@ -470,7 +470,7 @@ steps:
         command:
           - "features/csharp"
           - "features/ios"
-          - "--app=features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa"
+          - "--app=features/fixtures/maze_runner/mazerunner_2020.ipa"
           - "--farm=bb"
           - "--appium-version=1.22"
           - "--device=IOS_13|IOS_14|IOS_15"
@@ -489,7 +489,7 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - "features/fixtures/maze_runner/mazerunner_2022.3.22f1.ipa"
+          - "features/fixtures/maze_runner/mazerunner_2022.ipa"
         upload:
           - "maze_output/**/*"
           - "maze_output/metrics.csv"
@@ -500,7 +500,7 @@ steps:
         command:
           - "features/csharp"
           - "features/ios"
-          - "--app=features/fixtures/maze_runner/mazerunner_2022.3.22f1.ipa"
+          - "--app=features/fixtures/maze_runner/mazerunner_2022.ipa"
           - "--farm=bb"
           - "--appium-version=1.22"
           - "--device=IOS_13|IOS_14|IOS_15"
@@ -528,7 +528,7 @@ steps:
           - Bugsnag.unitypackage
         upload:
           - unity.log
-          - features/fixtures/maze_runner/build/Windows-2020.3.48f1.zip
+          - features/fixtures/maze_runner/build/Windows-2020.zip
     commands:
       - scripts/ci-build-windows-fixture-wsl.sh
     retry:
@@ -552,7 +552,7 @@ steps:
           - Bugsnag.unitypackage
         upload:
           - unity.log
-          - features/fixtures/maze_runner/build/Windows-2021.3.36f1.zip
+          - features/fixtures/maze_runner/build/Windows-2021.zip
     retry:
       automatic:
         - exit_status: "*"
@@ -574,7 +574,7 @@ steps:
           - Bugsnag.unitypackage
         upload:
           - unity.log
-          - features/fixtures/maze_runner/build/Windows-2022.3.22f1.zip
+          - features/fixtures/maze_runner/build/Windows-2022.zip
     retry:
       automatic:
         - exit_status: "*"
@@ -593,7 +593,7 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - features/fixtures/maze_runner/build/Windows-2020.3.48f1.zip
+          - features/fixtures/maze_runner/build/Windows-2020.zip
         upload:
           - maze_output/**/*
           - maze_output/metrics.csv
@@ -611,7 +611,7 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - features/fixtures/maze_runner/build/Windows-2021.3.36f1.zip
+          - features/fixtures/maze_runner/build/Windows-2021.zip
         upload:
           - maze_output/**/*
           - maze_output/metrics.csv
@@ -628,7 +628,7 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - features/fixtures/maze_runner/build/Windows-2022.3.22f1.zip
+          - features/fixtures/maze_runner/build/Windows-2022.zip
         upload:
           - maze_output/**/*
           - maze_output/metrics.csv

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,5 +1,4 @@
 aliases:
-  - &2020 "2020.3.48f1"
   - &2021 "2021.3.36f1"
 
 agents:
@@ -67,7 +66,7 @@ steps:
         download:
           - Bugsnag.unitypackage
         upload:
-          - features/fixtures/maze_runner/mazerunner_2021.3.36f1.apk
+          - features/fixtures/maze_runner/mazerunner_2021.apk
           - features/fixtures/build_android_apk.log
     commands:
       - bundle install
@@ -112,7 +111,7 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - "features/fixtures/maze_runner/mazerunner_2021.3.36f1.apk"
+          - "features/fixtures/maze_runner/mazerunner_2021.apk"
         upload:
           - "maze_output/**/*"
           - "maze_output/metrics.csv"
@@ -123,7 +122,7 @@ steps:
         command:
           - "features/csharp"
           - "features/android"
-          - "--app=features/fixtures/maze_runner/mazerunner_2021.3.36f1.apk"
+          - "--app=features/fixtures/maze_runner/mazerunner_2021.apk"
           - "--farm=bb"
           - "--appium-version=1.22"
           - "--device=ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13"
@@ -199,7 +198,7 @@ steps:
           - Bugsnag.unitypackage
           - project_2021.tgz
         upload:
-          - features/fixtures/maze_runner/mazerunner_2021.3.36f1.ipa
+          - features/fixtures/maze_runner/mazerunner_2021.ipa
           - features/fixtures/unity.log
     commands:
       - bundle install
@@ -221,7 +220,7 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - "features/fixtures/maze_runner/mazerunner_2021.3.36f1.ipa"
+          - "features/fixtures/maze_runner/mazerunner_2021.ipa"
         upload:
           - "maze_output/**/*"
           - "maze_output/metrics.csv"
@@ -233,7 +232,7 @@ steps:
         command:
           - "features/csharp"
           - "features/ios"
-          - "--app=features/fixtures/maze_runner/mazerunner_2021.3.36f1.ipa"
+          - "--app=features/fixtures/maze_runner/mazerunner_2021.ipa"
           - "--farm=bb"
           - "--appium-version=1.22"
           - "--device=IOS_13|IOS_14|IOS_15"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 7.7.4 (2024-05-19)
+
+### Bug Fixes
+
+- Fixed issue where iOS C# events reported the incorrect value for device.osName. [#791](https://github.com/bugsnag/bugsnag-unity/pull/791)
+
 ## 7.7.3 (2024-04-11)
 
 ### Bug Fixes

diff --git a/build.cake b/build.cake
@@ -5,7 +5,7 @@ var target = Argument("target", "Default");
 var solution = File("./BugsnagUnity.sln");
 var configuration = Argument("configuration", "Release");
 var project = File("./src/BugsnagUnity/BugsnagUnity.csproj");
-var version = "7.7.3";
+var version = "7.7.4";
 
 Task("Restore-NuGet-Packages")
     .Does(() => NuGetRestore(solution));

diff --git a/features/csharp/csharp_metadata.feature b/features/csharp/csharp_metadata.feature
@@ -40,4 +40,23 @@ Feature: Metadata
     And the event "metaData.numberArray.testKey.1" equals 2
     And the event "metaData.stringArray.testKey.1" equals "2"
     And the event "metaData.dictionary.foo" equals "bar"
-    And the event "metaData.number.testKey" equals 123
+    And the event "metaData.number.testKey" equals 123
+
+  # these platform specific tests are smoke tests, if os name is wrong then it's a sign that the native information has not been properly retrieved from the native layer and the unity placeholder data is being used
+  @ios_only
+  Scenario: iOS specific metadata
+    When I run the game in the "NotifySmokeTest" state
+    And I wait to receive an error
+    Then the error is valid for the error reporting API sent by the Unity notifier
+    And expected device metadata is included in the event
+    And expected app metadata is included in the event
+    And the event "device.osName" equals "iOS"
+
+  @android_only
+  Scenario: Android specific metadata
+    When I run the game in the "NotifySmokeTest" state
+    And I wait to receive an error
+    Then the error is valid for the error reporting API sent by the Unity notifier
+    And expected device metadata is included in the event
+    And expected app metadata is included in the event
+    And the event "device.osName" equals "android"
diff --git a/features/scripts/build_android.sh b/features/scripts/build_android.sh
@@ -25,4 +25,4 @@ $UNITY_PATH/Unity $DEFAULT_CLI_ARGS -projectPath $project_path -executeMethod Bu
 RESULT=$?
 if [ $RESULT -ne 0 ]; then exit $RESULT; fi
 
-mv $project_path/mazerunner.apk $project_path/mazerunner_$UNITY_VERSION.apk
+mv $project_path/mazerunner.apk $project_path/mazerunner_${UNITY_VERSION:0:4}.apk
diff --git a/features/scripts/build_edm.sh b/features/scripts/build_edm.sh
@@ -41,4 +41,4 @@ $UNITY_PATH/Unity $DEFAULT_CLI_ARGS -buildTarget Android -logFile $script_path/b
 RESULT=$?
 if [ $RESULT -ne 0 ]; then exit $RESULT; fi
 
-  mv $project_path/edm.apk $project_path/edm_$UNITY_VERSION.apk
+  mv $project_path/edm.apk $project_path/edm_${UNITY_VERSION:0:4}.apk
diff --git a/features/scripts/build_ios.sh b/features/scripts/build_ios.sh
@@ -38,4 +38,4 @@ if [ $? -ne 0 ]; then
 fi
 
 # Move to known location for running (note - the name of the .ipa differs between Xcode versions)
-find $project_path/output/ -name "*.ipa" -exec mv '{}' $project_path/mazerunner_$UNITY_VERSION.ipa \;
+find $project_path/output/ -name "*.ipa" -exec mv '{}' $project_path/mazerunner_${UNITY_VERSION:0:4}.ipa \;