From 365d56552ae7a0ecee1fa0bae50ec6416eb8b8ff Mon Sep 17 00:00:00 2001 From: Logan McKinley Date: Mon, 1 Apr 2019 14:50:34 -0400 Subject: [PATCH] updated nuget packages and added appcenter.setuserid for #712 --- .../AndroidSensusServiceHelper.cs | 2 + Sensus.Android/Sensus.Android.csproj | 38 +++++++++--------- Sensus.Android/packages.config | 6 +-- Sensus.iOS.Tests/Sensus.iOS.Tests.csproj | 40 +++++++++---------- Sensus.iOS.Tests/packages.config | 6 +-- Sensus.iOS/Sensus.iOS.csproj | 40 +++++++++---------- Sensus.iOS/iOSSensusServiceHelper.cs | 4 ++ Sensus.iOS/packages.config | 6 +-- 8 files changed, 74 insertions(+), 68 deletions(-) diff --git a/Sensus.Android.Shared/AndroidSensusServiceHelper.cs b/Sensus.Android.Shared/AndroidSensusServiceHelper.cs index 4ee67b35d..dada555be 100644 --- a/Sensus.Android.Shared/AndroidSensusServiceHelper.cs +++ b/Sensus.Android.Shared/AndroidSensusServiceHelper.cs @@ -238,6 +238,8 @@ public void SetService(AndroidSensusService service) _wakeLock = (_service.GetSystemService(global::Android.Content.Context.PowerService) as PowerManager).NewWakeLock(WakeLockFlags.Partial, "SENSUS"); _wakeLockAcquisitionCount = 0; _deviceId = Settings.Secure.GetString(_service.ContentResolver, Settings.Secure.AndroidId); + + Microsoft.AppCenter.AppCenter.SetUserId(_deviceId); } } diff --git a/Sensus.Android/Sensus.Android.csproj b/Sensus.Android/Sensus.Android.csproj index b2e22aa17..c1aaf7bf0 100644 --- a/Sensus.Android/Sensus.Android.csproj +++ b/Sensus.Android/Sensus.Android.csproj @@ -57,6 +57,24 @@ Store. It is possible to run and debug this project on physical and virtual Andr 2G + + ..\packages\Microsoft.AppCenter.1.13.2\lib\MonoAndroid403\Microsoft.AppCenter.dll + + + ..\packages\Microsoft.AppCenter.Analytics.1.13.2\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll + + + ..\packages\Microsoft.AppCenter.Analytics.1.13.2\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.Android.Bindings.dll + + + ..\packages\Microsoft.AppCenter.1.13.2\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll + + + ..\packages\Microsoft.AppCenter.Crashes.1.13.2\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.dll + + + ..\packages\Microsoft.AppCenter.Crashes.1.13.2\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll + @@ -301,24 +319,6 @@ Store. It is possible to run and debug this project on physical and virtual Andr ..\packages\Xamarin.Azure.NotificationHubs.Android.0.5.0\lib\MonoAndroid403\Xamarin.Azure.NotificationHubs.Android.dll - - ..\packages\Microsoft.AppCenter.1.11.0\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll - - - ..\packages\Microsoft.AppCenter.1.11.0\lib\MonoAndroid403\Microsoft.AppCenter.dll - - - ..\packages\Microsoft.AppCenter.Analytics.1.11.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.Android.Bindings.dll - - - ..\packages\Microsoft.AppCenter.Analytics.1.11.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll - - - ..\packages\Microsoft.AppCenter.Crashes.1.11.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll - - - ..\packages\Microsoft.AppCenter.Crashes.1.11.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.dll - ..\packages\Newtonsoft.Json.12.0.1\lib\netstandard2.0\Newtonsoft.Json.dll @@ -387,7 +387,7 @@ Store. It is possible to run and debug this project on physical and virtual Andr - + diff --git a/Sensus.Android/packages.config b/Sensus.Android/packages.config index a5a8192b3..5fc3f188e 100644 --- a/Sensus.Android/packages.config +++ b/Sensus.Android/packages.config @@ -9,9 +9,9 @@ - - - + + + diff --git a/Sensus.iOS.Tests/Sensus.iOS.Tests.csproj b/Sensus.iOS.Tests/Sensus.iOS.Tests.csproj index b8fb59181..156bd4157 100644 --- a/Sensus.iOS.Tests/Sensus.iOS.Tests.csproj +++ b/Sensus.iOS.Tests/Sensus.iOS.Tests.csproj @@ -1,4 +1,4 @@ - + @@ -80,6 +80,24 @@ iPhone Developer + + ..\packages\Microsoft.AppCenter.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.dll + + + ..\packages\Microsoft.AppCenter.Analytics.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.dll + + + ..\packages\Microsoft.AppCenter.Analytics.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.iOS.Bindings.dll + + + ..\packages\Microsoft.AppCenter.Crashes.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.dll + + + ..\packages\Microsoft.AppCenter.Crashes.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.iOS.Bindings.dll + + + ..\packages\Microsoft.AppCenter.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.iOS.Bindings.dll + @@ -216,24 +234,6 @@ ..\packages\TTGSnackbar.1.3.5\lib\Xamarin.iOS10\TTGSnackbar.dll - - ..\packages\Microsoft.AppCenter.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.dll - - - ..\packages\Microsoft.AppCenter.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.iOS.Bindings.dll - - - ..\packages\Microsoft.AppCenter.Analytics.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.dll - - - ..\packages\Microsoft.AppCenter.Analytics.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.iOS.Bindings.dll - - - ..\packages\Microsoft.AppCenter.Crashes.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.dll - - - ..\packages\Microsoft.AppCenter.Crashes.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.iOS.Bindings.dll - ..\packages\Newtonsoft.Json.12.0.1\lib\netstandard2.0\Newtonsoft.Json.dll @@ -415,4 +415,4 @@ - + \ No newline at end of file diff --git a/Sensus.iOS.Tests/packages.config b/Sensus.iOS.Tests/packages.config index d5bd85226..4ed366e83 100644 --- a/Sensus.iOS.Tests/packages.config +++ b/Sensus.iOS.Tests/packages.config @@ -6,9 +6,9 @@ - - - + + + diff --git a/Sensus.iOS/Sensus.iOS.csproj b/Sensus.iOS/Sensus.iOS.csproj index 68cbe29ab..d311dbdd6 100644 --- a/Sensus.iOS/Sensus.iOS.csproj +++ b/Sensus.iOS/Sensus.iOS.csproj @@ -72,7 +72,7 @@ Store. It is possible to run and debug this project on physical and virtual iOS Sensus App Store false 1701 -true + true true @@ -94,6 +94,24 @@ Store. It is possible to run and debug this project on physical and virtual iOS iPhone Developer + + ..\packages\Microsoft.AppCenter.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.dll + + + ..\packages\Microsoft.AppCenter.Analytics.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.dll + + + ..\packages\Microsoft.AppCenter.Analytics.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.iOS.Bindings.dll + + + ..\packages\Microsoft.AppCenter.Crashes.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.dll + + + ..\packages\Microsoft.AppCenter.Crashes.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.iOS.Bindings.dll + + + ..\packages\Microsoft.AppCenter.1.13.2\lib\Xamarin.iOS10\Microsoft.AppCenter.iOS.Bindings.dll + ..\dependencies\msband\ios\Microsoft.Band.iOS.dll @@ -236,24 +254,6 @@ Store. It is possible to run and debug this project on physical and virtual iOS ..\packages\Estimote.iOS.Proximity.1.2.0\lib\xamarinios10\Estimote.iOS.Proximity.dll - - ..\packages\Microsoft.AppCenter.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.dll - - - ..\packages\Microsoft.AppCenter.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.iOS.Bindings.dll - - - ..\packages\Microsoft.AppCenter.Analytics.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.dll - - - ..\packages\Microsoft.AppCenter.Analytics.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Analytics.iOS.Bindings.dll - - - ..\packages\Microsoft.AppCenter.Crashes.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.dll - - - ..\packages\Microsoft.AppCenter.Crashes.1.11.0\lib\Xamarin.iOS10\Microsoft.AppCenter.Crashes.iOS.Bindings.dll - ..\packages\Newtonsoft.Json.12.0.1\lib\netstandard2.0\Newtonsoft.Json.dll @@ -379,7 +379,7 @@ Store. It is possible to run and debug this project on physical and virtual iOS - + diff --git a/Sensus.iOS/iOSSensusServiceHelper.cs b/Sensus.iOS/iOSSensusServiceHelper.cs index 8dc574fc1..f800f9e92 100644 --- a/Sensus.iOS/iOSSensusServiceHelper.cs +++ b/Sensus.iOS/iOSSensusServiceHelper.cs @@ -148,6 +148,10 @@ public iOSSensusServiceHelper() // time the app is killed and restarted. but the NRE condition above should be very rare. _deviceId = Guid.NewGuid().ToString(); } + finally + { + Microsoft.AppCenter.AppCenter.SetUserId(_deviceId); + } try { diff --git a/Sensus.iOS/packages.config b/Sensus.iOS/packages.config index 4d6df00ed..bf17b66f6 100644 --- a/Sensus.iOS/packages.config +++ b/Sensus.iOS/packages.config @@ -8,9 +8,9 @@ - - - + + +