Merge branch 'feature/data-portable' of https://github.com/Microsoft/AppCenter-SDK-DotNet into feature/data-ios

# Conflicts: # scripts/configuration/ac-build-config.xml
2019-04-25 11:16:58 +03:00 · 2019-04-25 11:16:58 +03:00 · ef413f2fca
--- a/SDK/AppCenterAuth/Microsoft.AppCenter.Auth.Android.Bindings.Msal.Common/Jars/AboutJars.txt
+++ b/SDK/AppCenterAuth/Microsoft.AppCenter.Auth.Android.Bindings.Msal.Common/Jars/AboutJars.txt
@ -23,9 +23,9 @@ based on the Target Framework selected.

 Set the build action for these jars in the properties page to "ReferenceJar".

-+--- project :sdk:appcenter-identity
+--- project :sdk:appcenter-auth
 |    +--- project :sdk:appcenter
-|    \--- com.microsoft.identity.client:msal:0.3.1-RC2
+|    \--- com.microsoft.identity.client:msal:0.3.1-alpha
 |         +--- com.android.support:appcompat-v7:27.1.1 -> 28.0.0 (*)
 |         +--- com.android.support:customtabs:27.1.1 -> 28.0.0 (*)
 |         +--- com.google.code.gson:gson:2.8.4 -> 2.8.5
@ -34,8 +34,8 @@ Set the build action for these jars in the properties page to "ReferenceJar".
 |         |    \--- net.minidev:json-smart:[1.3.1,2.3] -> 2.3
 |         |         \--- net.minidev:accessors-smart:1.2
 |         |              \--- org.ow2.asm:asm:5.0.4
-|         \--- com.microsoft.identity:common:0.0.10-RC10
+|         \--- com.microsoft.identity:common:0.0.10-alpha
 |              +--- com.nimbusds:nimbus-jose-jwt:5.7 (*)
-|              +--- com.android.support:appcompat-v7:27.1.+ -> 28.0.0 (*)
+|              +--- com.android.support:appcompat-v7:27.1.1 -> 28.0.0 (*)
 |              +--- com.google.code.gson:gson:2.8.4 -> 2.8.5
-|              \--- com.android.support:customtabs:27.1.+ -> 28.0.0 (*)
+|              \--- com.android.support:customtabs:27.1.1 -> 28.0.0 (*)
--- a/SDK/AppCenterAuth/Microsoft.AppCenter.Auth.Android.Bindings.Msal.Common/Microsoft.AppCenter.Auth.Android.Bindings.Msal.Common.csproj
+++ b/SDK/AppCenterAuth/Microsoft.AppCenter.Auth.Android.Bindings.Msal.Common/Microsoft.AppCenter.Auth.Android.Bindings.Msal.Common.csproj
@ -92,11 +92,6 @@
    <TransformFile Include="Transforms\EnumFields.xml" />
    <TransformFile Include="Transforms\EnumMethods.xml" />
  </ItemGroup>
-  <ItemGroup>
-    <LibraryProjectZip Include="..\..\..\externals\android\common-0.0.10-RC10.aar">
-      <Link>Jars\common-0.0.10-RC10.aar</Link>
-    </LibraryProjectZip>
-  </ItemGroup>
  <ItemGroup>
    <EmbeddedReferenceJar Include="..\..\..\externals\android\accessors-smart-1.2.jar">
      <Link>Jars\accessors-smart-1.2.jar</Link>
@ -111,6 +106,11 @@
      <Link>Jars\nimbus-jose-jwt-5.7.jar</Link>
    </EmbeddedReferenceJar>
  </ItemGroup>
+  <ItemGroup>
+    <LibraryProjectZip Include="..\..\..\externals\android\common-0.0.10-alpha.aar">
+      <Link>Jars\common-0.0.10-alpha.aar</Link>
+    </LibraryProjectZip>
+  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/SDK/AppCenterAuth/Microsoft.AppCenter.Auth.Android.Bindings.Msal/Microsoft.AppCenter.Auth.Android.Bindings.Msal.csproj
+++ b/SDK/AppCenterAuth/Microsoft.AppCenter.Auth.Android.Bindings.Msal/Microsoft.AppCenter.Auth.Android.Bindings.Msal.csproj
@ -63,8 +63,8 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <LibraryProjectZip Include="..\..\..\externals\android\msal-0.3.1-RC2.aar">
-      <Link>Jars\msal-0.3.1-RC2.aar</Link>
+    <LibraryProjectZip Include="..\..\..\externals\android\msal-0.3.1-alpha.aar">
+      <Link>Jars\msal-0.3.1-alpha.aar</Link>
    </LibraryProjectZip>
  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
--- a/SDK/AppCenterData/Microsoft.AppCenter.Data/Microsoft.AppCenter.Data.csproj
+++ b/SDK/AppCenterData/Microsoft.AppCenter.Data/Microsoft.AppCenter.Data.csproj
@ -14,13 +14,6 @@
  <ItemGroup>
    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.1.0" PrivateAssets="All" />
  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Models\Page.cs" />
-    <Compile Remove="Models\PendingOperation.cs" />
-    <Compile Remove="Models\TokenResult.cs" />
-    <Compile Remove="Models\TokensResponse.cs" />
-    <Compile Remove="Models\PaginatedDocuments.cs" />
-  </ItemGroup>
  <Import Project="..\Microsoft.AppCenter.Data.Shared\Microsoft.AppCenter.Data.Shared.projitems" Label="Shared" Condition="Exists('..\Microsoft.AppCenter.Data.Shared\Microsoft.AppCenter.Data.Shared.projitems')" />
  <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
  <Target Name="GetPackagingOutputs" />
--- a/build.cake
+++ b/build.cake
@ -51,8 +51,8 @@ var AndroidMsalDependencies = new string [] {
    "https://jcenter.bintray.com/net/minidev/json-smart/2.3/json-smart-2.3.jar",
    "https://jcenter.bintray.com/net/minidev/accessors-smart/1.2/accessors-smart-1.2.jar",
    "https://jcenter.bintray.com/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar",
-    "https://mobilecentersdkdev.blob.core.windows.net/sdk/AppCenter-SDK-DotNet/AndroidMsal/common-0.0.10-RC10.aar",
-    "https://mobilecentersdkdev.blob.core.windows.net/sdk/AppCenter-SDK-DotNet/AndroidMsal/msal-0.3.1-RC2.aar"
+    "https://jcenter.bintray.com/com/microsoft/identity/common/0.0.10-alpha/common-0.0.10-alpha.aar",
+    "https://jcenter.bintray.com/com/microsoft/identity/client/msal/0.3.1-alpha/msal-0.3.1-alpha.aar"
 };

 // Task Target for build
--- a/nuget/MacAppCenterAuth.nuspec
+++ b/nuget/MacAppCenterAuth.nuspec
@ -6,8 +6,8 @@
    <authors>Microsoft</authors>
    <owners>microsoft,appcenter</owners>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <summary>The App Center Data Storage service provides functionality enabling developers to persist app data in the cloud in both online and offline scenarios. This enables you to store and manage both user-specific data as well as data shared between users on multiple platforms. In addition, this service includes basic conflict resolution out of the box.</summary>
-    <description>This package enables you to create, read, update, and delete private documents and read public documents. In addition, this package allows you to configure offline document persistence, enabling offline access for data in your app. </description>
+    <summary>App Center Auth is an identity management service.</summary>
+    <description>App Center Auth is an identity management service that allows you to customize and control how your users interact with your app. We provide an out of the box UI that allows app developers to authenticate their users to an app. In addition, app developers may use and track the user's identity across App Center services.</description>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
    <tags>app center appcenter auth</tags>
    <language>en-US</language>
--- a/scripts/configuration/ac-build-config.xml
+++ b/scripts/configuration/ac-build-config.xml
@ -2,8 +2,8 @@
 <config>
    <sdkInfo>
        <sdkVersion>2.0.0-SNAPSHOT</sdkVersion>
-        <iosVersion>2.0.0-213+72c67b9f582182106db459d3795bbe9c7334deda</iosVersion>
-        <androidVersion>2.0.0-22+097dc7c3c</androidVersion>
+        <iosVersion>2.0.0-199+d9a6779827e91f0386e064669a10353c510a62d1</iosVersion>
+        <androidVersion>2.0.0-27+47317b8bc</androidVersion>
    </sdkInfo>
    <group id="ios" folder="iOSAssemblies" buildGroup="mac">
        <assembly path="SDK/AppCenter/Microsoft.AppCenter.iOS/bin/Release/Microsoft.AppCenter.dll"/>