Merge aritchie

merging in recent changes
red-rj · Aug 5, 2018 · 0c4dfa0 · 0c4dfa0
2 parents c03b525 + ea5d7f4
commit 0c4dfa0
Show file tree

Hide file tree

Showing 74 changed files with 3,564 additions and 33,578 deletions.
diff --git a/.gitignore b/.gitignore
@@ -190,3 +190,6 @@ ModelManifest.xml
 /nuspec/*.nupkg
 *.ide
 .vs/Plugin.Notifications/v15/sqlite3/storage.ide
+.vs/Plugin.Notifications/v15/sqlite3/storage.ide
+.vs/Plugin.Notifications/v15/sqlite3/storage.ide
+.vs/Plugin.Notifications/v15/sqlite3/storage.ide
diff --git a/.vs/Plugin.Notifications/v15/sqlite3/storage.ide b/.vs/Plugin.Notifications/v15/sqlite3/storage.ide
diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
diff --git a/Acr.Notifications.userprefs b/Acr.Notifications.userprefs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,11 @@
 # CHANGE LOG
 
 ## 5.0.0
+* [feature] .NET Standard 2.0 (and latest android support libs)
 * [feature] Notification events!
-* [feature] Control the notification icon used in Android ()
+* [feature] Control the notification icon used in Android
+* [feature] Control launch intent flags on Android
+* [fix][ios] Metadata wasn't being sent
 * [fix][android] cancelling a single notification would not remove it from the schedule database
 
 ## 4.0.2

diff --git a/Plugin.Notifications.Abstractions/Plugin.Notifications.Abstractions.csproj b/Plugin.Notifications.Abstractions/Plugin.Notifications.Abstractions.csproj
diff --git a/Plugin.Notifications.Android/NotificationActionService.cs b/Plugin.Notifications.Android/NotificationActionService.cs
diff --git a/Plugin.Notifications.Android/Plugin.Notifications.Android.csproj b/Plugin.Notifications.Android/Plugin.Notifications.Android.csproj
diff --git a/Plugin.Notifications.Android/Plugin.Notifications.Android.csproj.bak b/Plugin.Notifications.Android/Plugin.Notifications.Android.csproj.bak
diff --git a/Plugin.Notifications.Android/Properties/AssemblyInfo.cs b/Plugin.Notifications.Android/Properties/AssemblyInfo.cs
diff --git a/Plugin.Notifications.Android/Resources/Resource.Designer.cs b/Plugin.Notifications.Android/Resources/Resource.Designer.cs
diff --git a/Plugin.Notifications.Shared/AssemblyInfo.cs b/Plugin.Notifications.Shared/AssemblyInfo.cs
diff --git a/Plugin.Notifications.Shared/Plugin.Notifications.Shared.projitems b/Plugin.Notifications.Shared/Plugin.Notifications.Shared.projitems
diff --git a/Plugin.Notifications.Shared/Plugin.Notifications.Shared.shproj b/Plugin.Notifications.Shared/Plugin.Notifications.Shared.shproj