diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
index de50a1475..8588f5fb7 100644
--- a/azure-pipelines.yaml
+++ b/azure-pipelines.yaml
@@ -79,6 +79,8 @@ jobs:
       - powershell: .\build.ps1 --target=nuget --verbosity=diagnostic
         displayName: Run Cake Build
 
+
+
   - job: build_windows_vs2017_quick_and_dirty
     displayName: Build on Windows VS2017 Redth's Quick and Dirty
     pool:
diff --git a/build.cake b/build.cake
index 02a86627e..354a9e654 100644
--- a/build.cake
+++ b/build.cake
@@ -547,12 +547,14 @@ Task ("source-nuget-restore")
                     else if (source_solution.Contains("-VS2017.sln"))
                     {
                         nuget_restore_settings.ToolPath = nuget_4;
-                        NuGetRestore(source_solution, nuget_restore_settings);
+                        //NuGetRestore(source_solution, nuget_restore_settings);
+                        DotNetCoreRestore(source_solution);
                     }
                     else
                     {
                         nuget_restore_settings.ToolPath = nuget_5;
-                        NuGetRestore(source_solution, nuget_restore_settings);
+                        //NuGetRestore(source_solution, nuget_restore_settings);
+                        DotNetCoreRestore(source_solution);
                     }
                 }
                 else
diff --git a/nuget/Xamarin.Auth.Extensions.nuspec b/nuget/Xamarin.Auth.Extensions.nuspec
index 55078ff25..aee68d512 100644
--- a/nuget/Xamarin.Auth.Extensions.nuspec
+++ b/nuget/Xamarin.Auth.Extensions.nuspec
@@ -21,20 +21,22 @@
 		http://semver.org/
 		-->
 		<version>
-			1.6.0.5
+			1.7.0.0-alpha01
 		</version>
 		<releaseNotes>
-            - Fix migrations from old PasswordHardCoded value to new
+            - FindAccountsForService throws on iOS #370
+            - updates to stale projects (dependencies, targets)
+            - removed unsupported platforms (Windows Phone, Windows 8.x)
 		</releaseNotes>
-		<licenseUrl>
-			https://github.com/xamarin/Xamarin.Auth/blob/master/License.md
-		</licenseUrl>
-		<projectUrl>
-			https://github.com/xamarin/Xamarin.Auth
-		</projectUrl>
-		<iconUrl>
-			https://xamarin-component-icons.s3.amazonaws.com/Xamarin.Auth.png
-		</iconUrl>
+        <licenseUrl>
+            https://go.microsoft.com/fwlink/?linkid=2021795&clcid=0x409
+        </licenseUrl>
+        <projectUrl>
+            https://go.microsoft.com/fwlink/?linkid=2021816&clcid=0x409
+        </projectUrl>
+        <iconUrl>
+            https://go.microsoft.com/fwlink/?linkid=2094632&clcid=0x409
+        </iconUrl>
 		<requireLicenseAcceptance>
 			true
 		</requireLicenseAcceptance>
@@ -52,16 +54,15 @@
 			Android.
 		</summary>
 		<tags>
-			xamarin,
-			pcl,
-			android, monoandroid, monodroid, xamarin.android,
-			ios,  monotouch, xamarin.ios
-			plugin for xamarin, plugin,
-			xamarin.forms,
-			windows phone, winphone, wp8,
-			wp81
-			windows 8, winrt,
-            windows, universal, platform, windows universal platform, uwp
+			oauth, oauth 1, oauth 2, authentication, xamarin.auth
+            xamarin,
+            pcl,
+            android, monoandroid, monodroid, xamarin.android,
+            ios,  monotouch, xamarin.ios
+            universal windows platform, uwp, windows 10
+            plugin for xamarin, plugin,
+            xamarin.forms,
+            netstandard
 		</tags>
         <dependencies>
 			<!--
@@ -84,12 +85,12 @@
 			Core - .NET Standard
 		-->
 		<file
-			src="output/netstandard1.0/Xamarin.Auth.Extensions.dll"
+			src="source\Extensions\Xamarin.Auth.Extensions.NetStandard10.ReferenceAssembly\bin\Release\netstandard1.0\Xamarin.Auth.Extensions.dll"
 			target="lib/netstandard1.0/Xamarin.Auth.Extensions.dll"
 			>
 		</file>
 		<file
-			src="output/netstandard1.6/Xamarin.Auth.Extensions.dll"
+			src="source\Extensions\Xamarin.Auth.Extensions.NetStandard10.ReferenceAssembly\bin\Release\netstandard1.0\Xamarin.Auth.Extensions.dll"
 			target="lib/netstandard1.6/Xamarin.Auth.Extensions.dll"
 			>
 		</file>
@@ -99,7 +100,7 @@
 			Core - Portable
 		-->
 		<file
-			src="output/pcl/Xamarin.Auth.dll"
+			src="source\Extensions\Xamarin.Auth.Extensions.Portable\bin\Release\Xamarin.Auth.dll"
 			target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+XamarinIOS10/Xamarin.Auth.dll"
 			>
 		</file>
@@ -108,7 +109,7 @@
 			Xamarin.Android
 		-->
 		<file
-			src="output/android/Xamarin.Auth.Extensions.dll"
+			src="source\Extensions\Xamarin.Auth.Extensions.XamarinAndroid\bin\Release\Xamarin.Auth.Extensions.dll"
 			target="lib/MonoAndroid10/Xamarin.Auth.Extensions.dll"
 			>
 		</file>
@@ -118,7 +119,7 @@
 				Unified
 		-->
 		<file
-			src="output/ios/Xamarin.Auth.Extensions.dll"
+			src="source\Extensions\Xamarin.Auth.Extensions.XamarinIOS\bin\Release\Xamarin.Auth.Extensions.dll"
 			target="lib/Xamarin.iOS10/Xamarin.Auth.Extensions.dll"
 			>
 		</file>
@@ -150,5 +151,20 @@
 		</file>
 		-->
 
+
+        <!--
+            Universal Windows Platform, UWP
+            Windows 10
+
+            .
+            ├── Release
+            │   ├── Xamarin.Auth
+            │   │   ├── WebAuthenticatorPage.xaml
+            │   │   └── Xamarin.Auth.xr.xml
+            │   ├── Xamarin.Auth.dll
+            │   ├── Xamarin.Auth.pdb
+            │   └── Xamarin.Auth.pri
+        -->
+
 	</files>
 </package>
diff --git a/nuget/Xamarin.Auth.XamarinForms.nuspec b/nuget/Xamarin.Auth.XamarinForms.nuspec
index c6fc5c092..ed68c9a8d 100644
--- a/nuget/Xamarin.Auth.XamarinForms.nuspec
+++ b/nuget/Xamarin.Auth.XamarinForms.nuspec
@@ -24,20 +24,22 @@
 		http://semver.org/
 		-->
 		<version>
-			1.6.0.5
+			1.7.0.0-alpha01
 		</version>
 		<releaseNotes>
-            - Fix migrations from old PasswordHardCoded value to new
+            - FindAccountsForService throws on iOS #370
+            - updates to stale projects (dependencies, targets)
+            - removed unsupported platforms (Windows Phone, Windows 8.x)
 		</releaseNotes>
-		<licenseUrl>
-			https://github.com/xamarin/Xamarin.Auth/blob/master/License.md
-		</licenseUrl>
-		<projectUrl>
-			https://github.com/xamarin/Xamarin.Auth
-		</projectUrl>
-		<iconUrl>
-			https://xamarin-component-icons.s3.amazonaws.com/Xamarin.Auth.png
-		</iconUrl>
+        <licenseUrl>
+            https://go.microsoft.com/fwlink/?linkid=2021795&clcid=0x409
+        </licenseUrl>
+        <projectUrl>
+            https://go.microsoft.com/fwlink/?linkid=2021816&clcid=0x409
+        </projectUrl>
+        <iconUrl>
+            https://go.microsoft.com/fwlink/?linkid=2094632&clcid=0x409
+        </iconUrl>
 		<requireLicenseAcceptance>
 			true
 		</requireLicenseAcceptance>
@@ -52,18 +54,15 @@
 			Android.
 		</summary>
 		<tags>
-			xamarin,
-			pcl,
-			android, monoandroid, monodroid, xamarin.android,
-			ios,  monotouch, xamarin.ios
-			windows phone, winphone, wp, 
-			windows phone 8 silverlight, winphone 8 sl, wp8 sl
-			windows phone 8.1 silverlight, winphone 8.1 sl, wp81 sl
-			windows 8.1, windows 8.1 winrt, win81
-			windows phone 8.1 winrt, winphone 8.1 winrt, wpa81
-			universal windows platform, uwp, windows 10
-			plugin for xamarin, plugin,
-			xamarin.forms,
+			oauth, oauth 1, oauth 2, authentication, xamarin.auth
+            xamarin,
+            pcl,
+            android, monoandroid, monodroid, xamarin.android,
+            ios,  monotouch, xamarin.ios
+            universal windows platform, uwp, windows 10
+            plugin for xamarin, plugin,
+            xamarin.forms,
+            netstandard
 		</tags>
 		<frameworkAssemblies>
 			<frameworkAssembly
@@ -103,12 +102,12 @@
 			Core - .NET Standard
 		-->
 		<file
-			src="output/netstandard1.0/Xamarin.Auth.XamarinForms.dll"
+			src="source\XamarinForms\Xamarin.Auth.Forms.NetStandard10.ReferenceAssembly\bin\Release\netstandard1.0\Xamarin.Auth.XamarinForms.dll"
 			target="lib/netstandard1.0/Xamarin.Auth.XamarinForms.dll"
 			>
 		</file>
 		<file
-			src="output/netstandard1.6/Xamarin.Auth.XamarinForms.dll"
+			src="source\XamarinForms\Xamarin.Auth.Forms.NetStandard16\bin\Release\netstandard1.6\Xamarin.Auth.XamarinForms.dll"
 			target="lib/netstandard1.6/Xamarin.Auth.XamarinForms.dll"
 			>
 		</file>
@@ -116,7 +115,7 @@
 			Core - Portable
 		-->
 		<file
-			src="output/pcl/Xamarin.Auth.XamarinForms.dll"
+			src="source\XamarinForms\Xamarin.Auth.Forms\bin\Release\Xamarin.Auth.XamarinForms.dll"
 			target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+XamarinIOS10/Xamarin.Auth.XamarinForms.dll"
 			>
 		</file>
@@ -125,7 +124,7 @@
 			Xamarin.Android
 		-->
 		<file
-			src="output/android/Xamarin.Auth.XamarinForms.dll"
+			src="source\XamarinForms\Xamarin.Auth.Forms.Droid\bin\Release\Xamarin.Auth.XamarinForms.dll"
 			target="lib/MonoAndroid10/Xamarin.Auth.XamarinForms.dll"
 			>
 		</file>
@@ -135,7 +134,7 @@
 				Unified
 		-->
 		<file
-			src="output/ios/Xamarin.Auth.XamarinForms.dll"
+			src="source\XamarinForms\Xamarin.Auth.Forms.iOS\bin\iPhone\Release\Xamarin.Auth.XamarinForms.dll"
 			target="lib/Xamarin.iOS10/Xamarin.Auth.XamarinForms.dll"
 			>
 		</file>
@@ -248,6 +247,7 @@
 			│   ├── Xamarin.Auth.XamarinForms.dll
 			│   ├── Xamarin.Auth.XamarinForms.pdb
 			│   └── Xamarin.Auth.XamarinForms.pri
+		-->
 		<file
 			src="output/uap10.0/Xamarin.Auth.XamarinForms.dll"
 			target="lib/uap10.0/Xamarin.Auth.XamarinForms.dll"
@@ -273,7 +273,6 @@
 			target="lib/uap10.0/Xamarin.Auth/Xamarin.Auth.XamarinForms.xr.xml"
 			>
 		</file>
-		-->
 
 	</files>
 </package>
diff --git a/nuget/Xamarin.Auth.nuspec b/nuget/Xamarin.Auth.nuspec
index 7648aec93..84c133986 100644
--- a/nuget/Xamarin.Auth.nuspec
+++ b/nuget/Xamarin.Auth.nuspec
@@ -24,19 +24,21 @@
         http://semver.org/
         -->
 		<version>
-			1.6.0.5
-		</version>
+			1.7.0.0-alpha01
+        </version>
 		<releaseNotes>
-            - Fix migrations from old PasswordHardCoded value to new
+            - FindAccountsForService throws on iOS #370
+            - updates to stale projects (dependencies, targets)
+            - removed unsupported platforms (Windows Phone, Windows 8.x)
 		</releaseNotes>
         <licenseUrl>
-            https://github.com/xamarin/Xamarin.Auth/blob/master/License.md
+            https://go.microsoft.com/fwlink/?linkid=2021795&clcid=0x409
         </licenseUrl>
         <projectUrl>
-            https://github.com/xamarin/Xamarin.Auth
+            https://go.microsoft.com/fwlink/?linkid=2021816&clcid=0x409
         </projectUrl>
         <iconUrl>
-            https://xamarin-component-icons.s3.amazonaws.com/Xamarin.Auth.png
+            https://go.microsoft.com/fwlink/?linkid=2094632&clcid=0x409
         </iconUrl>
         <requireLicenseAcceptance>
             true
@@ -52,18 +54,15 @@
             Android.
         </summary>
         <tags>
+			oauth, oauth 1, oauth 2, authentication, xamarin.auth
             xamarin,
             pcl,
             android, monoandroid, monodroid, xamarin.android,
             ios,  monotouch, xamarin.ios
-            windows phone, winphone, wp, 
-            windows phone 8 silverlight, winphone 8 sl, wp8 sl
-            windows phone 8.1 silverlight, winphone 8.1 sl, wp81 sl
-            windows 8.1, windows 8.1 winrt, win81
-            windows phone 8.1 winrt, winphone 8.1 winrt, wpa81
             universal windows platform, uwp, windows 10
             plugin for xamarin, plugin,
             xamarin.forms,
+            netstandard
             <!--
             -->
         </tags>
@@ -94,8 +93,11 @@
                 <dependency id="Xamarin.Android.Support.CustomTabs" version="[23.3.0,)" />
             </group>
             <group targetFramework="MonoAndroid71">
-                <dependency id="Xamarin.Android.Support.CustomTabs" version="[25.4.0.2,)" />
-            </group>			
+                <dependency id="Xamarin.Android.Support.CustomTabs" version="[27.4.0.2,)" />
+            </group>
+            <group targetFramework="MonoAndroid80">
+                <dependency id="Xamarin.Android.Support.CustomTabs" version="[28.0.0.1,)" />
+            </group>
         </dependencies>
     </metadata>
     <files>
@@ -109,12 +111,12 @@
             Core - .NET Standard
         -->
         <file
-            src="output/netstandard1.0/Xamarin.Auth.dll"
+            src="source\Core\Xamarin.Auth.NetStandard10.ReferenceAssembly\bin\Release\netstandard1.0\Xamarin.Auth.dll"
             target="lib/netstandard1.0/Xamarin.Auth.dll"
             >
         </file>
         <file
-            src="output/netstandard1.6/Xamarin.Auth.dll"
+            src="source\Core\Xamarin.Auth.NetStandard16\bin\Release\netstandard1.6\Xamarin.Auth.dll"
             target="lib/netstandard1.6/Xamarin.Auth.dll"
             >
         </file>
@@ -122,12 +124,12 @@
             Core - Portable
         -->
         <file
-            src="output/pcl/Xamarin.Auth.dll"
+            src="source\Core\Xamarin.Auth.Portable\bin\Release\Xamarin.Auth.dll"
             target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+XamarinIOS10/Xamarin.Auth.dll"
             >
         </file>
         <file
-            src="output/pcl/Xamarin.Auth.pdb"
+            src="source\Core\Xamarin.Auth.Portable\bin\Release\Xamarin.Auth.pdb"
             target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+XamarinIOS10/Xamarin.Auth.pdb"
             >
         </file>
@@ -136,12 +138,12 @@
             Xamarin.Android
         -->
         <file
-            src="output/android/Xamarin.Auth.dll"
+            src="source\Core\Xamarin.Auth.XamarinAndroid\bin\Release\Xamarin.Auth.dll"
             target="lib/MonoAndroid10/Xamarin.Auth.dll"
             >
         </file>
         <file
-            src="output/android/Xamarin.Auth.pdb"
+            src="source\Core\Xamarin.Auth.XamarinAndroid\bin\Release\Xamarin.Auth.pdb"
             target="lib/MonoAndroid10/Xamarin.Auth.pdb"
             >
         </file>
@@ -151,12 +153,12 @@
                 Unified
         -->
         <file
-            src="output/ios/Xamarin.Auth.dll"
+            src="source\Core\Xamarin.Auth.XamarinIOS\bin\Release\Xamarin.Auth.dll"
             target="lib/Xamarin.iOS10/Xamarin.Auth.dll"
             >
         </file>
         <file
-            src="output/ios/Xamarin.Auth.pdb"
+            src="source\Core\Xamarin.Auth.XamarinIOS\bin\Release\Xamarin.Auth.pdb"
             target="lib/Xamarin.iOS10/Xamarin.Auth.pdb"
             >
         </file>
@@ -164,6 +166,7 @@
         <!--
             Windows Phone 8 Silverlight
         -->
+        <!-- 
         <file
             src="output/wp80/Xamarin.Auth.dll"
             target="lib/wp8/Xamarin.Auth.dll"
@@ -173,7 +176,7 @@
             src="output/wp80/Xamarin.Auth.pdb"
             target="lib/wp8/Xamarin.Auth.pdb"
             >
-        </file>
+        </file> -->
 
         <!--
             Windows Phone 8.1 WinRT
@@ -187,6 +190,7 @@
             │   ├── Xamarin.Auth.pdb
             │   └── Xamarin.Auth.pri
         -->
+        <!-- 
         <file
             src="output/wpa81/Xamarin.Auth.dll"
             target="lib/wpa81/Xamarin.Auth.dll"
@@ -217,6 +221,7 @@
             target="lib/wpa81/Xamarin.Auth/Xamarin.Auth.xr.xml"
             >
         </file>
+         -->
 
         <!--
             Windows 8.1 WinRT
@@ -231,7 +236,8 @@
             │   ├── Xamarin.Auth.pdb
             │   └── Xamarin.Auth.pri
         -->
-        <file
+        <!--
+         <file
             src="output/win81/Xamarin.Auth.dll"
             target="lib/win81/Xamarin.Auth.dll"
             >
@@ -260,7 +266,8 @@
             src="output/win81/Xamarin.Auth/Xamarin.Auth.xr.xml"
             target="lib/win81/Xamarin.Auth/Xamarin.Auth.xr.xml"
             >
-        </file>
+        </file> 
+        -->
         <!--
             Universal Windows Platform, UWP
             Windows 10
@@ -275,17 +282,17 @@
             │   └── Xamarin.Auth.pri
         -->
         <file
-            src="output/uap10.0/Xamarin.Auth.dll"
+            src="source\Core\Xamarin.Auth.UniversalWindowsPlatform\bin\x86\Release\Xamarin.Auth.dll"
             target="lib/uap10.0/Xamarin.Auth.dll"
             >
         </file>
         <file
-            src="output/uap10.0/Xamarin.Auth.pdb"
+            src="source\Core\Xamarin.Auth.UniversalWindowsPlatform\bin\x86\Release\Xamarin.Auth.pdb"
             target="lib/uap10.0/Xamarin.Auth.pdb"
             >
         </file>
         <file
-            src="output/uap10.0/Xamarin.Auth.pri"
+            src="source\Core\Xamarin.Auth.UniversalWindowsPlatform\bin\x86\Release\Xamarin.Auth.pri"
             target="lib/uap10.0/Xamarin.Auth.pri"
             >
         </file>
@@ -298,12 +305,12 @@
         </file>
         -->		
         <file
-            src="output/uap10.0/Xamarin.Auth/WebAuthenticatorPage.xbf"
+            src="source\Core\Xamarin.Auth.UniversalWindowsPlatform\bin\x86\Release\WebAuthenticatorPage.xbf"
             target="lib/uap10.0/Xamarin.Auth/WebAuthenticatorPage.xbf"
             >
         </file>
         <file
-            src="output/uap10.0/Xamarin.Auth/Xamarin.Auth.xr.xml"
+            src="source\Core\Xamarin.Auth.UniversalWindowsPlatform\bin\x86\Release\Xamarin.Auth.xr.xml"
             target="lib/uap10.0/Xamarin.Auth/Xamarin.Auth.xr.xml"
             >
         </file>