6.5 merge

aritchie · May 30, 2017 · 471a55f · 471a55f
2 parents 1f197d2 + 04373ba
commit 471a55f
Show file tree

Hide file tree

Showing 184 changed files with 3,961 additions and 44,800 deletions.
diff --git a/ISSUE_TEMPLATE b/ISSUE_TEMPLATE
@@ -1,11 +1,9 @@
-# IF YOU DO NOT USE THIS TEMPLATE - YOUR ISSUE WILL BE CLOSED.  PLEASE READ THE FAQ AND THE CODE OF CONDUCT BELOW!
-
 ## Please check all of the platforms you are having the issue on (if platform is not listed, it is not supported)
 
  - [] iOS
  - [] Android
  - [] UWP
- - [] PCL
+ - [] NET Standard 1.1
 
 ## Version of OS(s) listed above with issue
 

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,6 +1,7 @@
 # CHANGELOG
 
-## 6.4.2
+## 6.5.0
+* [semi-breaking] NET Standard is here!
 * [feature] Toast position can now be set to the top on all platforms
 * [obsolete] methods ShowSuccess and ShowError are obsolete.  Use ShowImage and supply your own image
 

diff --git a/experimental/Acr.UserDialogs.Mac/Acr.UserDialogs.Mac.csproj b/experimental/Acr.UserDialogs.Mac/Acr.UserDialogs.Mac.csproj
diff --git a/experimental/Acr.UserDialogs.Mac/Properties/AssemblyInfo.cs b/experimental/Acr.UserDialogs.Mac/Properties/AssemblyInfo.cs
diff --git a/experimental/Acr.UserDialogs.Mac/UserDialogsImpl.cs b/experimental/Acr.UserDialogs.Mac/UserDialogsImpl.cs
diff --git a/experimental/Acr.UserDialogs.Mac/packages.config b/experimental/Acr.UserDialogs.Mac/packages.config
diff --git a/experimental/Acr.UserDialogs.WP81/Acr.UserDialogs.WP81.csproj b/experimental/Acr.UserDialogs.WP81/Acr.UserDialogs.WP81.csproj
diff --git a/experimental/Acr.UserDialogs.WP81/Properties/AssemblyInfo.cs b/experimental/Acr.UserDialogs.WP81/Properties/AssemblyInfo.cs
diff --git a/experimental/Acr.UserDialogs.WP81/packages.config b/experimental/Acr.UserDialogs.WP81/packages.config