Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
## [4.0.5] - 2021-05-06
### Fixes
* Fix issue with changelog.

## [4.0.4] - 2021-05-04
### Fixes
* Fix issue with analytics on some platforms.
  • Loading branch information
Unity Technologies committed May 6, 2021
1 parent 81ef9c5 commit 6e839d7
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 11 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ All notable changes to this package will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [4.0.5] - 2021-05-06
### Fixes
* Fix issue with changelog.

## [4.0.4] - 2021-05-04
### Fixes
* Fix issue with analytics on some platforms.

## [4.0.3] - 2021-04-22
### Fixes
* Minor fix to deprecation messaging for Windows Mixed Reality.
Expand Down
17 changes: 10 additions & 7 deletions Runtime/XRManagementAnalytics.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
using UnityEditor;
#endif

#if UNITY_ANALYTICS
#if UNITY_ANALYTICS && ENABLE_CLOUD_SERVICES_ANALYTICS
using UnityEngine.Analytics;
#endif
#endif //UNITY_ANALYTICS && ENABLE_CLOUD_SERVICES_ANALYTICS

[assembly:InternalsVisibleTo("Unity.XR.Management.Editor")]
namespace UnityEngine.XR.Management
Expand All @@ -22,7 +22,9 @@ internal static class XRManagementAnalytics
private const string kVendorKey = "unity.xrmanagement";
private const string kEventBuild = "xrmanagment_build";

#if ENABLE_CLOUD_SERVICES_ANALYTICS && UNITY_ANALYTICS
private static bool s_Initialized = false;
#endif //ENABLE_CLOUD_SERVICES_ANALYTICS && UNITY_ANALYTICS

[Serializable]
private struct BuildEvent
Expand All @@ -35,7 +37,7 @@ private struct BuildEvent

private static bool Initialize()
{
#if ENABLE_TEST_SUPPORT || !UNITY_ANALYTICS
#if ENABLE_TEST_SUPPORT || !ENABLE_CLOUD_SERVICES_ANALYTICS || !UNITY_ANALYTICS
return false;
#else

Expand All @@ -46,16 +48,17 @@ private static bool Initialize()
if(AnalyticsResult.Ok != EditorAnalytics.RegisterEventWithLimit(kEventBuild, kMaxEventsPerHour, kMaxNumberOfElements, kVendorKey))
return false;
s_Initialized = true;
#endif
#endif //UNITY_EDITOR
return s_Initialized;
#endif
#endif //ENABLE_TEST_SUPPORT || !ENABLE_CLOUD_SERVICES_ANALYTICS || !UNITY_ANALYTICS

}

#if UNITY_EDITOR
public static void SendBuildEvent(GUID guid, BuildTarget buildTarget, BuildTargetGroup buildTargetGroup, IEnumerable<XRLoader> loaders)
{

#if UNITY_ANALYTICS
#if UNITY_ANALYTICS && ENABLE_CLOUD_SERVICES_ANALYTICS

if (!s_Initialized && !Initialize())
{
Expand All @@ -78,7 +81,7 @@ public static void SendBuildEvent(GUID guid, BuildTarget buildTarget, BuildTarge

EditorAnalytics.SendEventWithLimit(kEventBuild, data);

#endif //UNITY_ANALYTICS
#endif //UNITY_ANALYTICS && ENABLE_CLOUD_SERVICES_ANALYTICS

}
#endif //UNITY_EDITOR
Expand Down
2 changes: 1 addition & 1 deletion ValidationExceptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"ValidationTest": "API Validation",
"ExceptionError": "",
"PackageVersion": "4.0.3"
"PackageVersion": "4.0.5"
}
]
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.unity.xr.management",
"displayName": "XR Plugin Management",
"version": "4.0.3",
"version": "4.0.5",
"unity": "2019.4",
"unityRelease": "15f1",
"description": "Package that provides simple management of XR plug-ins. Manages and offers help with loading, initialization, settings, and build support for XR plug-ins.",
Expand All @@ -24,10 +24,10 @@
"repository": {
"url": "https://github.cds.internal.unity3d.com/unity/xr.sdk.management.git",
"type": "git",
"revision": "90add3ccd1d83da63b45c95b69fbbfb3b42d689f"
"revision": "59665b284b3b388bea2dcb98a8f3e4748694f3e6"
},
"upmCi": {
"footprint": "7e3c60590e751eda72763db776a1d7abde8e6b4a"
"footprint": "a881f9784f5415835b3f235181661038d23b73e2"
},
"samples": [
{
Expand Down

0 comments on commit 6e839d7

Please sign in to comment.