1.3.1-alpha01 update

PR nuget with windows platfromfs Issue #55 Vulnerability: hard coded password for Android KeyStore
xamarin · Jun 27, 2016 · 0cb978a · 0cb978a
1 parent 2e3070a
commit 0cb978a
Show file tree

Hide file tree

Showing 20 changed files with 6,081 additions and 72 deletions.
diff --git a/...ions/Xamarin.Auth.Extensions.XamarinAndroid/Xamarin.Auth.Extensions.XamarinAndroid.csproj b/...ions/Xamarin.Auth.Extensions.XamarinAndroid/Xamarin.Auth.Extensions.XamarinAndroid.csproj
@@ -13,7 +13,7 @@
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
     <AssemblyName>Xamarin.Auth.Extensions</AssemblyName>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v6.0.99</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/source/Xamarin.Auth-Library.sln b/source/Xamarin.Auth-Library.sln
@@ -392,8 +392,8 @@ Global
 		{18B5054D-6035-40DB-B1AE-3E4FDE8DB6E9}.Release|ARM.Build.0 = Release|ARM
 		{18B5054D-6035-40DB-B1AE-3E4FDE8DB6E9}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{18B5054D-6035-40DB-B1AE-3E4FDE8DB6E9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{18B5054D-6035-40DB-B1AE-3E4FDE8DB6E9}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{18B5054D-6035-40DB-B1AE-3E4FDE8DB6E9}.Release|Mixed Platforms.Build.0 = Release|x86
+		{18B5054D-6035-40DB-B1AE-3E4FDE8DB6E9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{18B5054D-6035-40DB-B1AE-3E4FDE8DB6E9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{18B5054D-6035-40DB-B1AE-3E4FDE8DB6E9}.Release|x64.ActiveCfg = Release|Any CPU
 		{18B5054D-6035-40DB-B1AE-3E4FDE8DB6E9}.Release|x86.ActiveCfg = Release|x86
 		{18B5054D-6035-40DB-B1AE-3E4FDE8DB6E9}.Release|x86.Build.0 = Release|x86
@@ -487,8 +487,8 @@ Global
 		{C4202AC1-1027-4737-8215-16182421E342}.Release|ARM.Build.0 = Release|ARM
 		{C4202AC1-1027-4737-8215-16182421E342}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{C4202AC1-1027-4737-8215-16182421E342}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{C4202AC1-1027-4737-8215-16182421E342}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{C4202AC1-1027-4737-8215-16182421E342}.Release|Mixed Platforms.Build.0 = Release|x86
+		{C4202AC1-1027-4737-8215-16182421E342}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C4202AC1-1027-4737-8215-16182421E342}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C4202AC1-1027-4737-8215-16182421E342}.Release|x64.ActiveCfg = Release|x64
 		{C4202AC1-1027-4737-8215-16182421E342}.Release|x64.Build.0 = Release|x64
 		{C4202AC1-1027-4737-8215-16182421E342}.Release|x86.ActiveCfg = Release|x86
@@ -532,8 +532,8 @@ Global
 		{D07C6FC6-6860-495C-9BC8-0F731C74AE2F}.Release|ARM.Build.0 = Release|ARM
 		{D07C6FC6-6860-495C-9BC8-0F731C74AE2F}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{D07C6FC6-6860-495C-9BC8-0F731C74AE2F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D07C6FC6-6860-495C-9BC8-0F731C74AE2F}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{D07C6FC6-6860-495C-9BC8-0F731C74AE2F}.Release|Mixed Platforms.Build.0 = Release|x86
+		{D07C6FC6-6860-495C-9BC8-0F731C74AE2F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D07C6FC6-6860-495C-9BC8-0F731C74AE2F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D07C6FC6-6860-495C-9BC8-0F731C74AE2F}.Release|x64.ActiveCfg = Release|Any CPU
 		{D07C6FC6-6860-495C-9BC8-0F731C74AE2F}.Release|x86.ActiveCfg = Release|x86
 		{D07C6FC6-6860-495C-9BC8-0F731C74AE2F}.Release|x86.Build.0 = Release|x86
@@ -587,8 +587,8 @@ Global
 		{2D712AA6-7697-4F4D-B5F1-AA03476F59A7}.Release|iPhone.Build.0 = Release|Any CPU
 		{2D712AA6-7697-4F4D-B5F1-AA03476F59A7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{2D712AA6-7697-4F4D-B5F1-AA03476F59A7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2D712AA6-7697-4F4D-B5F1-AA03476F59A7}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{2D712AA6-7697-4F4D-B5F1-AA03476F59A7}.Release|Mixed Platforms.Build.0 = Release|x86
+		{2D712AA6-7697-4F4D-B5F1-AA03476F59A7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2D712AA6-7697-4F4D-B5F1-AA03476F59A7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2D712AA6-7697-4F4D-B5F1-AA03476F59A7}.Release|x64.ActiveCfg = Release|x64
 		{2D712AA6-7697-4F4D-B5F1-AA03476F59A7}.Release|x64.Build.0 = Release|x64
 		{2D712AA6-7697-4F4D-B5F1-AA03476F59A7}.Release|x86.ActiveCfg = Release|x86
@@ -846,8 +846,8 @@ Global
 		{C5DD0133-9A66-4489-91C3-745D6ED5FFE5}.Release|ARM.Build.0 = Release|ARM
 		{C5DD0133-9A66-4489-91C3-745D6ED5FFE5}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{C5DD0133-9A66-4489-91C3-745D6ED5FFE5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{C5DD0133-9A66-4489-91C3-745D6ED5FFE5}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{C5DD0133-9A66-4489-91C3-745D6ED5FFE5}.Release|Mixed Platforms.Build.0 = Release|x86
+		{C5DD0133-9A66-4489-91C3-745D6ED5FFE5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C5DD0133-9A66-4489-91C3-745D6ED5FFE5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C5DD0133-9A66-4489-91C3-745D6ED5FFE5}.Release|x64.ActiveCfg = Release|Any CPU
 		{C5DD0133-9A66-4489-91C3-745D6ED5FFE5}.Release|x86.ActiveCfg = Release|x86
 		{C5DD0133-9A66-4489-91C3-745D6ED5FFE5}.Release|x86.Build.0 = Release|x86
@@ -890,8 +890,8 @@ Global
 		{D77B034E-C3F0-4DA3-B193-9F4EB2C0CDE2}.Release|ARM.Build.0 = Release|ARM
 		{D77B034E-C3F0-4DA3-B193-9F4EB2C0CDE2}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{D77B034E-C3F0-4DA3-B193-9F4EB2C0CDE2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{D77B034E-C3F0-4DA3-B193-9F4EB2C0CDE2}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{D77B034E-C3F0-4DA3-B193-9F4EB2C0CDE2}.Release|Mixed Platforms.Build.0 = Release|x86
+		{D77B034E-C3F0-4DA3-B193-9F4EB2C0CDE2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D77B034E-C3F0-4DA3-B193-9F4EB2C0CDE2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D77B034E-C3F0-4DA3-B193-9F4EB2C0CDE2}.Release|x64.ActiveCfg = Release|Any CPU
 		{D77B034E-C3F0-4DA3-B193-9F4EB2C0CDE2}.Release|x86.ActiveCfg = Release|x86
 		{D77B034E-C3F0-4DA3-B193-9F4EB2C0CDE2}.Release|x86.Build.0 = Release|x86

diff --git a/source/Xamarin.Auth.LinkSource/Xamarin.Auth.LinkSource.csproj b/source/Xamarin.Auth.LinkSource/Xamarin.Auth.LinkSource.csproj
@@ -80,6 +80,7 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Authenticator.cs" />
     <Compile Include="AuthException.cs" />
+    <Compile Include="Evolve16.Labs\OAuthLoginPresenter.cs" />
     <Compile Include="Evolve16.Labs\Security\CryptoUtilities.cs" />
     <Compile Include="LibraryUtilities.cs" />
     <Compile Include="PlatformSpecific\FileHelper.cs" />

diff --git a/source/Xamarin.Auth.Portable/Xamarin.Auth.Portable.csproj b/source/Xamarin.Auth.Portable/Xamarin.Auth.Portable.csproj
@@ -63,6 +63,9 @@
     <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
       <Link>Evolve16.Labs\AccountManager.cs</Link>
     </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\OAuthLoginPresenter.cs">
+      <Link>Evolve16.Labs\OAuthLoginPresenter.cs</Link>
+    </Compile>
     <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
       <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
     </Compile>

diff --git a/source/Xamarin.Auth.UniversalPortable/Xamarin.Auth.UniversalPortable.csproj b/source/Xamarin.Auth.UniversalPortable/Xamarin.Auth.UniversalPortable.csproj
@@ -62,6 +62,15 @@
     <Compile Include="..\Xamarin.Auth.LinkSource\AuthException.cs">
       <Link>AuthException.cs</Link>
     </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
+      <Link>Evolve16.Labs\AccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\OAuthLoginPresenter.cs">
+      <Link>Evolve16.Labs\OAuthLoginPresenter.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
+      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
+    </Compile>
     <Compile Include="..\Xamarin.Auth.LinkSource\ExceptionEx.cs">
       <Link>ExceptionEx.cs</Link>
     </Compile>

diff --git a/source/Xamarin.Auth.UniversalWindowsPlatform/Xamarin.Auth.UniversalWindowsPlatform.csproj b/source/Xamarin.Auth.UniversalWindowsPlatform/Xamarin.Auth.UniversalWindowsPlatform.csproj
@@ -128,6 +128,15 @@
     <Compile Include="..\Xamarin.Auth.LinkSource\AuthException.cs">
       <Link>AuthException.cs</Link>
     </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
+      <Link>Evolve16.Labs\AccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\OAuthLoginPresenter.cs">
+      <Link>Evolve16.Labs\OAuthLoginPresenter.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
+      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
+    </Compile>	
     <Compile Include="..\Xamarin.Auth.LinkSource\ExceptionEx.cs">
       <Link>ExceptionEx.cs</Link>
     </Compile>
@@ -217,12 +226,6 @@
     <Compile Include="WebAuthenticatorPage.xaml.cs">
       <DependentUpon>WebAuthenticatorPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
-      <Link>Evolve16.Labs\AccountManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
-      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Properties\Xamarin.Auth.UniversalWindowsPlatform.rd.xml" />

diff --git a/source/Xamarin.Auth.WinRTWindows81/Xamarin.Auth.WinRTWindows81.csproj b/source/Xamarin.Auth.WinRTWindows81/Xamarin.Auth.WinRTWindows81.csproj
@@ -126,6 +126,15 @@
     <Compile Include="..\Xamarin.Auth.LinkSource\AuthException.cs">
       <Link>AuthException.cs</Link>
     </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
+      <Link>Evolve16.Labs\AccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\OAuthLoginPresenter.cs">
+      <Link>Evolve16.Labs\OAuthLoginPresenter.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
+      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
+    </Compile>
     <Compile Include="..\Xamarin.Auth.LinkSource\ExceptionEx.cs">
       <Link>ExceptionEx.cs</Link>
     </Compile>

diff --git a/source/Xamarin.Auth.WinRTWindowsPhone81/Xamarin.Auth.WinRTWindowsPhone81.csproj b/source/Xamarin.Auth.WinRTWindowsPhone81/Xamarin.Auth.WinRTWindowsPhone81.csproj
@@ -100,6 +100,15 @@
     <Compile Include="..\Xamarin.Auth.LinkSource\AuthException.cs">
       <Link>AuthException.cs</Link>
     </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
+      <Link>Evolve16.Labs\AccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\OAuthLoginPresenter.cs">
+      <Link>Evolve16.Labs\OAuthLoginPresenter.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
+      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
+    </Compile>
     <Compile Include="..\Xamarin.Auth.LinkSource\ExceptionEx.cs">
       <Link>ExceptionEx.cs</Link>
     </Compile>
@@ -199,12 +208,6 @@
     <Compile Include="..\Xamarin.Auth.WinRTWindows81\WebAuthenticatorPage.xaml.cs">
       <Link>WebAuthenticatorPage.xaml.cs</Link>
     </Compile>
-    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
-      <Link>Evolve16.Labs\AccountManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
-      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Page Include="..\Xamarin.Auth.WinRTWindows81\WebAuthenticatorPage.xaml">

diff --git a/source/Xamarin.Auth.Windows81Universal/Xamarin.Auth.Windows81Universal.csproj b/source/Xamarin.Auth.Windows81Universal/Xamarin.Auth.Windows81Universal.csproj
@@ -64,6 +64,15 @@
     <Compile Include="..\Xamarin.Auth.LinkSource\AuthException.cs">
       <Link>AuthException.cs</Link>
     </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
+      <Link>Evolve16.Labs\AccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\OAuthLoginPresenter.cs">
+      <Link>Evolve16.Labs\OAuthLoginPresenter.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
+      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
+    </Compile>
     <Compile Include="..\Xamarin.Auth.LinkSource\ExceptionEx.cs">
       <Link>ExceptionEx.cs</Link>
     </Compile>
@@ -145,12 +154,6 @@
     <Compile Include="..\Xamarin.Auth.Portable\System\TypeCode.cs">
       <Link>System\TypeCode.cs</Link>
     </Compile>
-    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
-      <Link>Evolve16.Labs\AccountManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
-      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="PCLCrypto, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d4421c8a4786956c, processorArchitecture=MSIL">

diff --git a/source/Xamarin.Auth.WindowsPhone8/Xamarin.Auth.WindowsPhone8.csproj b/source/Xamarin.Auth.WindowsPhone8/Xamarin.Auth.WindowsPhone8.csproj
@@ -106,6 +106,15 @@
     <Compile Include="..\Xamarin.Auth.LinkSource\AuthException.cs">
       <Link>AuthException.cs</Link>
     </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
+      <Link>Evolve16.Labs\AccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\OAuthLoginPresenter.cs">
+      <Link>Evolve16.Labs\OAuthLoginPresenter.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
+      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
+    </Compile>
     <Compile Include="..\Xamarin.Auth.LinkSource\ExceptionEx.cs">
       <Link>ExceptionEx.cs</Link>
     </Compile>
@@ -178,12 +187,6 @@
       <DependentUpon>WPAccountStore.cs</DependentUpon>
     </Compile>
     <Compile Include="PlatformSpecific\WPAccountStore.cs" />
-    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
-      <Link>Evolve16.Labs\AccountManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
-      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config">

diff --git a/source/Xamarin.Auth.WindowsPhone81/Xamarin.Auth.WindowsPhone81.csproj b/source/Xamarin.Auth.WindowsPhone81/Xamarin.Auth.WindowsPhone81.csproj
@@ -106,6 +106,15 @@
     <Compile Include="..\Xamarin.Auth.LinkSource\AuthException.cs">
       <Link>AuthException.cs</Link>
     </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
+      <Link>Evolve16.Labs\AccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\OAuthLoginPresenter.cs">
+      <Link>Evolve16.Labs\OAuthLoginPresenter.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
+      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
+    </Compile>
     <Compile Include="..\Xamarin.Auth.LinkSource\ExceptionEx.cs">
       <Link>ExceptionEx.cs</Link>
     </Compile>
@@ -203,12 +212,6 @@
       <Link>WebAuthenticatorPage.xaml.cs</Link>
       <DependentUpon>WebAuthenticatorPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
-      <Link>Evolve16.Labs\AccountManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
-      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config">

diff --git a/source/Xamarin.Auth.WindowsStore81WinRT/Xamarin.Auth.WindowsStore81WinRT.csproj b/source/Xamarin.Auth.WindowsStore81WinRT/Xamarin.Auth.WindowsStore81WinRT.csproj
@@ -132,6 +132,15 @@
     <Compile Include="..\Xamarin.Auth.LinkSource\AuthException.cs">
       <Link>AuthException.cs</Link>
     </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
+      <Link>Evolve16.Labs\AccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\OAuthLoginPresenter.cs">
+      <Link>Evolve16.Labs\OAuthLoginPresenter.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
+      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
+    </Compile>
     <Compile Include="..\Xamarin.Auth.LinkSource\ExceptionEx.cs">
       <Link>ExceptionEx.cs</Link>
     </Compile>

diff --git a/...ce/Xamarin.Auth.WindowsUniversal81Portable/Xamarin.Auth.WindowsUniversal81Portable.csproj b/...ce/Xamarin.Auth.WindowsUniversal81Portable/Xamarin.Auth.WindowsUniversal81Portable.csproj
@@ -64,6 +64,15 @@
     <Compile Include="..\Xamarin.Auth.LinkSource\AuthException.cs">
       <Link>AuthException.cs</Link>
     </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
+      <Link>Evolve16.Labs\AccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\OAuthLoginPresenter.cs">
+      <Link>Evolve16.Labs\OAuthLoginPresenter.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
+      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
+    </Compile>
     <Compile Include="..\Xamarin.Auth.LinkSource\ExceptionEx.cs">
       <Link>ExceptionEx.cs</Link>
     </Compile>

diff --git a/source/Xamarin.Auth.XamarinAndroid/Xamarin.Auth.XamarinAndroid.csproj b/source/Xamarin.Auth.XamarinAndroid/Xamarin.Auth.XamarinAndroid.csproj
@@ -16,7 +16,7 @@
     <DevInstrumentationEnabled>True</DevInstrumentationEnabled>
     <RestorePackages>true</RestorePackages>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v6.0.99</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -102,6 +102,15 @@
     <Compile Include="..\Xamarin.Auth.LinkSource\AuthException.cs">
       <Link>AuthException.cs</Link>
     </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
+      <Link>Evolve16.Labs\AccountManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\OAuthLoginPresenter.cs">
+      <Link>Evolve16.Labs\OAuthLoginPresenter.cs</Link>
+    </Compile>
+    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
+      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
+    </Compile>
     <Compile Include="..\Xamarin.Auth.LinkSource\ExceptionEx.cs">
       <Link>ExceptionEx.cs</Link>
     </Compile>
@@ -161,12 +170,6 @@
     <Compile Include="..\Xamarin.Auth.LinkSource\AccountStore.Async.cs">
       <Link>AccountStore.Async.cs</Link>
     </Compile>
-    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\AccountManager.cs">
-      <Link>Evolve16.Labs\AccountManager.cs</Link>
-    </Compile>
-    <Compile Include="..\Xamarin.Auth.LinkSource\Evolve16.Labs\Security\CryptoUtilities.cs">
-      <Link>Evolve16.Labs\Security\CryptoUtilities.cs</Link>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config">