From c8b65971c8b42f40139232b66318d710f1382ece Mon Sep 17 00:00:00 2001 From: Matthew Podwysocki Date: Sun, 26 Jul 2020 22:18:42 -0400 Subject: [PATCH 1/5] Update for GA --- XPlat/AzureMessaging/build.cake | 10 ++++- .../Xamarin.Azure.NotificationHubs.iOS.csproj | 45 ++++++++++++++----- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/XPlat/AzureMessaging/build.cake b/XPlat/AzureMessaging/build.cake index 69932345a1..ec12c73676 100644 --- a/XPlat/AzureMessaging/build.cake +++ b/XPlat/AzureMessaging/build.cake @@ -133,7 +133,15 @@ Task ("externals-ios") CopyFile( "./iOS/externals/WindowsAzureMessaging-SDK-Apple/iOS/WindowsAzureMessaging.framework/WindowsAzureMessaging", - "./iOS/externals/WindowsAzureMessaging.a"); + "./iOS/externals/iOS/WindowsAzureMessaging.a"); + + CopyFile( + "./iOS/externals/WindowsAzureMessaging-SDK-Apple/macOS/WindowsAzureMessaging.framework/WindowsAzureMessaging", + "./iOS/externals/macOS/WindowsAzureMessaging.a"); + + CopyFile( + "./iOS/externals/WindowsAzureMessaging-SDK-Apple/tvOS/WindowsAzureMessaging.framework/WindowsAzureMessaging", + "./iOS/externals/tvOS/WindowsAzureMessaging.a"); XmlPoke("./iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj", "/Project/PropertyGroup/PackageVersion", IOS_NUGET_VERSION); }); diff --git a/XPlat/AzureMessaging/iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj b/XPlat/AzureMessaging/iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj index f4c2e0a65e..a762179835 100644 --- a/XPlat/AzureMessaging/iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj +++ b/XPlat/AzureMessaging/iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj @@ -1,7 +1,6 @@ - - + - Xamarin.iOS10 + Xamarin.iOS10;Xamarin.TVOS10;Xamarin.Mac20 true WindowsAzure.Messaging Xamarin.Azure.NotificationHubs.iOS @@ -12,8 +11,8 @@ Xamarin.Azure.NotificationHubs.iOS - Azure Notification Hubs for Xamarin.iOS - Xamarin.iOS Bindings for Azure Notification Hubs. + Azure Notification Hubs for Xamarin.iOS, Xamarin.Mac and Xamarin.TVOS + Xamarin.iOS, Xamarin.Mac and Xamarin.TVOS Bindings for Azure Notification Hubs. Microsoft Microsoft © Microsoft Corporation. All rights reserved. @@ -21,26 +20,52 @@ https://go.microsoft.com/fwlink/?linkid=864962 https://go.microsoft.com/fwlink/?linkid=865062 true - 3.0.0-preview4 + 3.0.0 - + + + + + + + + + - - + + Static false Security SystemConfiguration Foundation UIKit UserNotifications - + + + + Static + false + Security SystemConfiguration Foundation UIKit + UserNotifications + + + + + + Static + false + Security SystemConfiguration Foundation AppKit + UserNotifications + + + From 828d64aa3f52f4c0c43932bb676c5fb6a4ab2c79 Mon Sep 17 00:00:00 2001 From: Matthew Podwysocki Date: Mon, 17 Aug 2020 21:17:49 -0400 Subject: [PATCH 2/5] Adding UserID for AzureMessaging --- XPlat/AzureMessaging/build.cake | 4 ++-- XPlat/AzureMessaging/iOS/source/ApiDefinition.cs | 9 +++++++++ .../iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/XPlat/AzureMessaging/build.cake b/XPlat/AzureMessaging/build.cake index 1f84fd6e6a..14f3d6f287 100644 --- a/XPlat/AzureMessaging/build.cake +++ b/XPlat/AzureMessaging/build.cake @@ -1,7 +1,7 @@ var TARGET = Argument ("t", Argument ("target", "ci")); -var IOS_VERSION = "3.0.2"; -var IOS_NUGET_VERSION = "3.0.2"; +var IOS_VERSION = "3.1.0"; +var IOS_NUGET_VERSION = "3.1.0"; var IOS_URL = $"https://github.com/Azure/azure-notificationhubs-ios/releases/download/{IOS_VERSION}/WindowsAzureMessaging-SDK-Apple-{IOS_VERSION}.zip"; var ANDROID_VERSION = "1.0.1"; diff --git a/XPlat/AzureMessaging/iOS/source/ApiDefinition.cs b/XPlat/AzureMessaging/iOS/source/ApiDefinition.cs index 91ebc068d6..5fc116f9ad 100644 --- a/XPlat/AzureMessaging/iOS/source/ApiDefinition.cs +++ b/XPlat/AzureMessaging/iOS/source/ApiDefinition.cs @@ -200,6 +200,12 @@ public partial interface MSNotificationHub [Static, Export("getInstallationId")] string GetInstallationId(); + [Static, Export("getUserId")] + string GetUserId(); + + [Static, Export("setUserId:")] + void SetUserId(string userId); + [Static, Export("willSaveInstallation")] void WillSaveInstallation(); @@ -322,6 +328,9 @@ public partial interface MSInstallation : MSTaggable, MSChangeTracking [Export("expirationTime")] NSDate ExpirationTime { get; set; } + [Export("userId")] + string UserId { get; set; } + [Export("templates")] NSDictionary Templates { get; } diff --git a/XPlat/AzureMessaging/iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj b/XPlat/AzureMessaging/iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj index c27ce68003..fc34885108 100644 --- a/XPlat/AzureMessaging/iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj +++ b/XPlat/AzureMessaging/iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj @@ -20,7 +20,7 @@ https://go.microsoft.com/fwlink/?linkid=864962 https://go.microsoft.com/fwlink/?linkid=865062 true - 3.0.2 + 3.1.0 From ec376e43277a34569f771f6ec780e7e9d41bd204 Mon Sep 17 00:00:00 2001 From: Matthew Podwysocki Date: Tue, 18 Aug 2020 14:00:10 -0400 Subject: [PATCH 3/5] Updating Android to latest --- .../NotificationHubsSample/NotificationHubsSample.csproj | 4 ++-- .../source/Xamarin.Azure.NotificationHubs.Android.csproj | 3 ++- XPlat/AzureMessaging/build.cake | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/XPlat/AzureMessaging/Android/samples/NotificationHubsSample/NotificationHubsSample.csproj b/XPlat/AzureMessaging/Android/samples/NotificationHubsSample/NotificationHubsSample.csproj index b01c0d3506..3d6d2d3d6c 100644 --- a/XPlat/AzureMessaging/Android/samples/NotificationHubsSample/NotificationHubsSample.csproj +++ b/XPlat/AzureMessaging/Android/samples/NotificationHubsSample/NotificationHubsSample.csproj @@ -70,8 +70,8 @@ - - 71.1610.1 + + diff --git a/XPlat/AzureMessaging/Android/source/Xamarin.Azure.NotificationHubs.Android.csproj b/XPlat/AzureMessaging/Android/source/Xamarin.Azure.NotificationHubs.Android.csproj index 92daa17a32..47c183d4c6 100644 --- a/XPlat/AzureMessaging/Android/source/Xamarin.Azure.NotificationHubs.Android.csproj +++ b/XPlat/AzureMessaging/Android/source/Xamarin.Azure.NotificationHubs.Android.csproj @@ -27,7 +27,7 @@ https://go.microsoft.com/fwlink/?linkid=864958 https://go.microsoft.com/fwlink/?linkid=864960 true - 1.0.1 + 1.1.0 @@ -43,6 +43,7 @@ + diff --git a/XPlat/AzureMessaging/build.cake b/XPlat/AzureMessaging/build.cake index 14f3d6f287..f244321d79 100644 --- a/XPlat/AzureMessaging/build.cake +++ b/XPlat/AzureMessaging/build.cake @@ -4,8 +4,8 @@ var IOS_VERSION = "3.1.0"; var IOS_NUGET_VERSION = "3.1.0"; var IOS_URL = $"https://github.com/Azure/azure-notificationhubs-ios/releases/download/{IOS_VERSION}/WindowsAzureMessaging-SDK-Apple-{IOS_VERSION}.zip"; -var ANDROID_VERSION = "1.0.1"; -var ANDROID_NUGET_VERSION = "1.0.1"; +var ANDROID_VERSION = "1.1.0"; +var ANDROID_NUGET_VERSION = "1.1.0"; var ANDROID_URL = string.Format ("https://dl.bintray.com/microsoftazuremobile/SDK/com/microsoft/azure/notification-hubs-android-sdk/{0}/notification-hubs-android-sdk-{0}.aar", ANDROID_VERSION); Task("libs-ios") From b48e63ce67d3f14f75d4e8aadb9137af21d6b55e Mon Sep 17 00:00:00 2001 From: Matthew Podwysocki Date: Mon, 24 Aug 2020 11:05:31 -0400 Subject: [PATCH 4/5] Update to 1.1.1 --- .../NotificationHubsSample/NotificationHubsSample.csproj | 2 +- .../source/Xamarin.Azure.NotificationHubs.Android.csproj | 2 +- XPlat/AzureMessaging/build.cake | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/XPlat/AzureMessaging/Android/samples/NotificationHubsSample/NotificationHubsSample.csproj b/XPlat/AzureMessaging/Android/samples/NotificationHubsSample/NotificationHubsSample.csproj index 3d6d2d3d6c..5a3ae49637 100644 --- a/XPlat/AzureMessaging/Android/samples/NotificationHubsSample/NotificationHubsSample.csproj +++ b/XPlat/AzureMessaging/Android/samples/NotificationHubsSample/NotificationHubsSample.csproj @@ -72,7 +72,7 @@ - + diff --git a/XPlat/AzureMessaging/Android/source/Xamarin.Azure.NotificationHubs.Android.csproj b/XPlat/AzureMessaging/Android/source/Xamarin.Azure.NotificationHubs.Android.csproj index 47c183d4c6..7de02da5dc 100644 --- a/XPlat/AzureMessaging/Android/source/Xamarin.Azure.NotificationHubs.Android.csproj +++ b/XPlat/AzureMessaging/Android/source/Xamarin.Azure.NotificationHubs.Android.csproj @@ -27,7 +27,7 @@ https://go.microsoft.com/fwlink/?linkid=864958 https://go.microsoft.com/fwlink/?linkid=864960 true - 1.1.0 + 1.1.1 diff --git a/XPlat/AzureMessaging/build.cake b/XPlat/AzureMessaging/build.cake index f244321d79..4eaa046f4d 100644 --- a/XPlat/AzureMessaging/build.cake +++ b/XPlat/AzureMessaging/build.cake @@ -4,8 +4,8 @@ var IOS_VERSION = "3.1.0"; var IOS_NUGET_VERSION = "3.1.0"; var IOS_URL = $"https://github.com/Azure/azure-notificationhubs-ios/releases/download/{IOS_VERSION}/WindowsAzureMessaging-SDK-Apple-{IOS_VERSION}.zip"; -var ANDROID_VERSION = "1.1.0"; -var ANDROID_NUGET_VERSION = "1.1.0"; +var ANDROID_VERSION = "1.1.1"; +var ANDROID_NUGET_VERSION = "1.1.1"; var ANDROID_URL = string.Format ("https://dl.bintray.com/microsoftazuremobile/SDK/com/microsoft/azure/notification-hubs-android-sdk/{0}/notification-hubs-android-sdk-{0}.aar", ANDROID_VERSION); Task("libs-ios") From 00752f3e21722605221bcbc3e54610b3b94fba5a Mon Sep 17 00:00:00 2001 From: Matthew Podwysocki Date: Thu, 10 Sep 2020 16:03:16 -0400 Subject: [PATCH 5/5] Updating iOS to 3.1.1 --- XPlat/AzureMessaging/build.cake | 4 ++-- .../iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/XPlat/AzureMessaging/build.cake b/XPlat/AzureMessaging/build.cake index 4eaa046f4d..16eba1996e 100644 --- a/XPlat/AzureMessaging/build.cake +++ b/XPlat/AzureMessaging/build.cake @@ -1,7 +1,7 @@ var TARGET = Argument ("t", Argument ("target", "ci")); -var IOS_VERSION = "3.1.0"; -var IOS_NUGET_VERSION = "3.1.0"; +var IOS_VERSION = "3.1.1"; +var IOS_NUGET_VERSION = "3.1.1"; var IOS_URL = $"https://github.com/Azure/azure-notificationhubs-ios/releases/download/{IOS_VERSION}/WindowsAzureMessaging-SDK-Apple-{IOS_VERSION}.zip"; var ANDROID_VERSION = "1.1.1"; diff --git a/XPlat/AzureMessaging/iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj b/XPlat/AzureMessaging/iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj index fc34885108..6aff793369 100644 --- a/XPlat/AzureMessaging/iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj +++ b/XPlat/AzureMessaging/iOS/source/Xamarin.Azure.NotificationHubs.iOS.csproj @@ -20,7 +20,7 @@ https://go.microsoft.com/fwlink/?linkid=864962 https://go.microsoft.com/fwlink/?linkid=865062 true - 3.1.0 + 3.1.1