Merge branch 'develop'

HockeySDK.nuspec

@@ -18,15 +18,15 @@
   <files>
 
     <!-- Core -->
-    <file src="./source/HockeySDK/bin/Release/HockeySDK.dll" target="lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\HockeySDK.dll" />
+    <file src="./source/HockeySDK/bin/Release/HockeySDK.dll" target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10/HockeySDK.dll" />
 
     <!-- Android -->
-    <file src="./source/HockeySDK.Android/bin/Release/HockeySDK.dll" target="lib\MonoAndroid403\HockeySDK.dll" />
-    <file src="./source/HockeySDK.AndroidBindings/bin/Release/HockeySDK.AndroidBindings.dll" target="lib\MonoAndroid403\HockeySDK.AndroidBindings.dll" />
+    <file src="./source/HockeySDK.Android/bin/Release/HockeySDK.dll" target="lib/MonoAndroid403/HockeySDK.dll" />
+    <file src="./source/HockeySDK.AndroidBindings/bin/Release/HockeySDK.AndroidBindings.dll" target="lib/MonoAndroid403/HockeySDK.AndroidBindings.dll" />
 
     <!-- iOS -->
-    <file src="./source/HockeySDK.iOS/bin/Release/HockeySDK.dll" target="lib\Xamarin.iOS10\HockeySDK.dll" />
-    <file src="./source/HockeySDK.iOSBindings/bin/full/Release/HockeySDK.iOSBindings.dll" target="lib\Xamarin.iOS10\HockeySDK.iOSBindings.dll" />
+    <file src="./source/HockeySDK.iOS/bin/Release/HockeySDK.dll" target="lib/Xamarin.iOS10/HockeySDK.dll" />
+    <file src="./source/HockeySDK.iOSBindings/bin/full/Release/HockeySDK.iOSBindings.dll" target="lib/Xamarin.iOS10/HockeySDK.iOSBindings.dll" />
 
   </files>
 </package>

bootstrapper.sh

@@ -52,7 +52,7 @@ fi
 # Download NuGet if it does not exist.
 if [ ! -f $NUGET_EXE ]; then
     echo "Downloading NuGet..."
-    curl -Lsfo $NUGET_EXE https://www.nuget.org/nuget.exe
+    curl -Lsfo $NUGET_EXE https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
     if [ $? -ne 0 ]; then
         echo "An error occured while downloading nuget.exe."
         exit 1

build.cake

@@ -2,11 +2,11 @@
 #addin nuget:?package=Cake.Xamarin
 #addin nuget:?package=Cake.FileHelpers
 
-var COMPONENT_VERSION = "4.1.0.2";
-var NUGET_VERSION = "4.1.0-beta3";
+var COMPONENT_VERSION = "4.1.0.3";
+var NUGET_VERSION = "4.1.0";
 
-var ANDROID_URL = "https://download.hockeyapp.net/sdk/xamarin/android/HockeySDK-Android-4.1.0-beta.2.zip";
-var IOS_URL = "https://download.hockeyapp.net/sdk/xamarin/ios/HockeySDK-iOS-4.1.0-beta.2.zip";
+var ANDROID_URL = "https://download.hockeyapp.net/sdk/xamarin/android/HockeySDK-Android-4.1.1.zip";
+var IOS_URL = "https://download.hockeyapp.net/sdk/xamarin/ios/HockeySDK-iOS-4.1.1.zip";
 
 var SAMPLES = new [] {
 	"./samples/HockeyAppSampleAndroid.sln",
@@ -68,10 +68,10 @@ Task ("externals-ios")
 	DownloadFile (IOS_URL, "./externals/ios/hockeyapp.ios.zip");
 	Unzip ("./externals/ios/hockeyapp.ios.zip", "./externals/ios/");
 
-	CopyFile ("./externals/ios/HockeySDK-iOS/HockeySDK.embeddedframework/HockeySDK.framework/Versions/A/HockeySDK", "./externals/ios/libHockeySDK.a");
+	CopyFile ("./externals/ios/HockeySDK-iOS/HockeySDKAllFeatures/HockeySDK.embeddedframework/HockeySDK.framework/Versions/A/HockeySDK", "./externals/ios/libHockeySDK.a");
 	CopyFile ("./externals/ios/HockeySDK-iOS/HockeySDKCrashOnly/HockeySDK.framework/Versions/A/HockeySDK", "./externals/ios/libHockeySDKCrashOnly.a");
 	
-	CopyDirectory ("./externals/ios/HockeySDK-iOS/HockeySDK.embeddedframework/HockeySDK.framework/Versions/A/Resources/HockeySDKResources.bundle", "./externals/ios/HockeySDKResources.bundle");
+	CopyDirectory ("./externals/ios/HockeySDK-iOS/HockeySDKAllFeatures/HockeySDK.embeddedframework/HockeySDK.framework/Versions/A/Resources/HockeySDKResources.bundle", "./externals/ios/HockeySDKResources.bundle");
 });
 
 // Create a common externals task depending on platform specific ones

component/forms/GettingStarted.md

@@ -8,7 +8,7 @@ Configuration and Initialization must be done in platform specific projects usin
 You can check if a crash occured in the last session by adding the following lines:
 
 ```csharp
-using HockeySDK;
+using HockeyApp;
 ```
 
 ```csharp
@@ -20,7 +20,7 @@ CrashManager.DidCrashCrashInLastSession;
 You can enable/disable the  MetricsManager and track custom events using the following lines:
 
 ```csharp
-using HockeySDK;
+using HockeyApp;
 ```
 
 ```csharp
@@ -41,7 +41,7 @@ This will add crash reporting capabilities to your app.
 Open your AppDelegate.cs file, and add the following lines:
 
 ```csharp
-using HockeySDK.iOS;
+using HockeyApp.iOS;
 
 namespace YourNameSpace
 {

component/ios.crashonly/GettingStarted.md

@@ -9,7 +9,7 @@ This will add crash reporting capabilities to your app.
 Open your AppDelegate.cs file, and add the following lines:
 
 ```csharp
-using HockeySDK.iOS;
+using HockeyApp.iOS;
 
 namespace YourNameSpace
 {

component/ios/GettingStarted.md

@@ -9,7 +9,7 @@ This will add crash reporting capabilities to your app.
 Open your AppDelegate.cs file, and add the following lines:
 
 ```csharp
-using HockeySDK.iOS;
+using HockeyApp.iOS;
 
 namespace YourNameSpace
 {

source/HockeySDK.Android/PlatformMetricsManager.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using HockeyMetrics = HockeyApp.Android.Metrics;
 
 namespace HockeyApp
@@ -52,6 +53,22 @@ public void TrackEvent(string eventName)
 		{
 			HockeyMetrics.MetricsManager.TrackEvent(eventName);
 		}
+
+		public void TrackEvent(string eventName, Dictionary<string, string> properties, Dictionary<string, double> measurements)
+		{
+			Dictionary<string, Java.Lang.Double> measurementsHelper = null;
+			if (measurements != null)
+			{
+				measurementsHelper = new Dictionary<string, Java.Lang.Double>();
+				foreach (KeyValuePair<string, double> pair in measurements)
+				{
+					measurementsHelper.Add(pair.Key, new Java.Lang.Double(pair.Value));
+				}
+			}
+
+			HockeyMetrics.MetricsManager.TrackEvent(eventName, properties, measurementsHelper);
+		}
+
 	}
 }
 

source/HockeySDK.Build/HockeySDK.Build.csproj

@@ -17,7 +17,7 @@
       <CustomCommands>
         <Command type="Build" command="sh ./bootstrapper.sh -t nuget" workingdir="${ProjectDir}/../.." />
         <Command type="Clean" command="sh ./bootstrapper.sh -t clean" workingdir="${ProjectDir}/../.." />
-        <Command type="Execute" />
+        <Command type="Execute" command="" />
       </CustomCommands>
     </CustomCommands>
   </PropertyGroup>
@@ -29,7 +29,7 @@
       <CustomCommands>
         <Command type="Build" command="sh ./bootstrapper.sh -t components" workingdir="${ProjectDir}/../.." />
         <Command type="Clean" command="sh ./bootstrapper.sh -t clean" workingdir="${ProjectDir}/../.." />
-        <Command type="Execute" />
+        <Command type="Execute" command="" />
       </CustomCommands>
     </CustomCommands>
   </PropertyGroup>

source/HockeySDK.Shared/Interfaces/IPlatformMetricsManager.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace HockeyApp
 {
@@ -7,6 +8,8 @@ internal interface IPlatformMetricsManager
 		bool Disabled { get; set; }
 
 		void TrackEvent(string eventName);
+
+		void TrackEvent(string eventName, Dictionary<string, string> properties, Dictionary<string, double> measurements);
 	}
 }
 

source/HockeySDK.Shared/MetricsManager.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace HockeyApp
 {
@@ -34,6 +35,17 @@ public static void TrackEvent(string eventName)
 		{
 			PlatformMetricsManager.TrackEvent(eventName);
 		}
+
+		/// <summary>
+		/// This method allows to track an event that happened in your app. Remember to choose meaningful event names to have the best experience when diagnosing your app in the HockeyApp web portal.
+		/// </summary>
+		/// <param name="eventName">The event’s name as a string.</param>
+		/// <param name="properties">A dictionary of properties to attach to the event.</param>
+		/// <param name="measurements">A dictionary of measurements to attach to the event.</param>
+		public static void TrackEvent(string eventName, Dictionary<string, string> properties, Dictionary<string, double> measurements)
+		{
+			PlatformMetricsManager.TrackEvent(eventName, properties, measurements);
+		}
 	}
 }
 

source/HockeySDK.iOS/PlatformMetricsManager.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using HockeyApp.iOS;
+using Foundation;
 
 namespace HockeyApp
 {
@@ -17,6 +19,35 @@ public void TrackEvent(string eventName)
 		{
 			BITHockeyManager.SharedHockeyManager.MetricsManager.TrackEvent(eventName);
 		}
+
+		public void TrackEvent(string eventName, Dictionary<string, string> properties, Dictionary<string, double> measurements)
+		{
+			NSMutableDictionary propertiesHelper = null;
+			if (properties != null)
+			{
+				propertiesHelper = new NSMutableDictionary();
+				foreach (KeyValuePair<string, string> pair in properties)
+				{
+					propertiesHelper.Add(NSString.FromObject(pair.Key), NSString.FromObject(pair.Value));
+				}
+			}
+
+			NSMutableDictionary measurementsHelper = null;
+			if (measurements != null)
+			{
+				measurementsHelper = new NSMutableDictionary();
+				foreach (KeyValuePair<string, double> pair in measurements)
+				{
+					measurementsHelper.Add(NSString.FromObject(pair.Key), NSNumber.FromDouble(pair.Value));
+				}
+			}
+
+			BITHockeyManager.SharedHockeyManager.MetricsManager.TrackEvent(eventName, 
+			                                                               propertiesHelper,
+			                                                               measurementsHelper);
+		}
+
+
 	}
 }
 

source/HockeySDK.iOSBindings/ApiDefinition.cs

@@ -259,6 +259,10 @@ public partial interface BITMetricsManager
         [Export ("trackEventWithName:")]
         void TrackEvent (string eventName);
 
+		// - (void)trackEventWithName:(nonnull NSString *)eventName properties:(nullable NSDictionary<NSString *, NSString *> *)properties measurements:(nullable NSDictionary<NSString *, NSNumber *> *)measurements;
+		[Export("trackEventWithName:properties:measurements:")]
+		void TrackEvent(string eventName, [NullAllowed] NSDictionary properties, [NullAllowed] NSDictionary measurements);
+
 		[Export ("serverURL", ArgumentSemantic.Retain)]
 		string ServerURL { get; set; }
     }

source/HockeySDK/PlatformMetricsManager.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace HockeyApp
 {
@@ -16,6 +17,11 @@ public void TrackEvent(string eventName)
 		{
 			throw new NotImplementedException(PCL.BaitWithoutSwitchMessage);
 		}
+
+		public void TrackEvent(string eventName, Dictionary<string, string> properties, Dictionary<string, double> measurements)
+		{
+			throw new NotImplementedException(PCL.BaitWithoutSwitchMessage);
+		}
 	}
 }