-
Notifications
You must be signed in to change notification settings - Fork 141
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #690 from Microsoft/develop
Merge develop to master
- Loading branch information
Showing
71 changed files
with
209 additions
and
203 deletions.
There are no files selected for viewing
98 changes: 49 additions & 49 deletions
98
Apps/Contoso.Android.Puppet/Contoso.Android.Puppet.csproj
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,28 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Xamarin.Android.Arch.Core.Common" version="1.0.0" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.0.0" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="26.1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Support.Annotations" version="26.1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Support.Compat" version="26.1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Support.Core.UI" version="26.1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Support.Core.Utils" version="26.1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Support.Design" version="26.1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Support.Fragment" version="26.1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Support.Media.Compat" version="26.1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Support.Transition" version="26.1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Support.v4" version="26.1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Support.v7.AppCompat" version="26.1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Support.v7.RecyclerView" version="26.1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Support.Vector.Drawable" version="26.1.0.1" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Build.Download" version="0.4.7" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Firebase.Analytics" version="60.1142.0-beta2" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Firebase.Analytics.Impl" version="60.1142.0-beta2" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Firebase.Common" version="60.1142.0-beta2" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Firebase.Core" version="60.1142.0-beta2" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Firebase.Iid" version="60.1142.0-beta2" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Firebase.Messaging" version="60.1142.0-beta2" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.GooglePlayServices.Basement" version="60.1142.0-beta2" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.GooglePlayServices.Tasks" version="60.1142.0-beta2" targetFramework="monoandroid80" /> | ||
<package id="Xamarin.Android.Arch.Core.Common" version="1.0.0.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.0.3.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.0.3.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="27.0.2.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Support.Annotations" version="27.0.2.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Support.Compat" version="27.0.2.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Support.Core.UI" version="27.0.2.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Support.Core.Utils" version="27.0.2.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Support.Design" version="27.0.2.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Support.Fragment" version="27.0.2.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Support.Media.Compat" version="27.0.2.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Support.Transition" version="27.0.2.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Support.v4" version="27.0.2.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Support.v7.AppCompat" version="27.0.2.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Support.v7.RecyclerView" version="27.0.2.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Android.Support.Vector.Drawable" version="27.0.2.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Build.Download" version="0.4.11" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Firebase.Analytics" version="60.1142.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Firebase.Analytics.Impl" version="60.1142.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Firebase.Common" version="60.1142.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Firebase.Core" version="60.1142.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Firebase.Iid" version="60.1142.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.Firebase.Messaging" version="60.1142.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.GooglePlayServices.Basement" version="60.1142.1" targetFramework="monoandroid81" /> | ||
<package id="Xamarin.GooglePlayServices.Tasks" version="60.1142.1" targetFramework="monoandroid81" /> | ||
</packages> |
Binary file modified
BIN
+1.13 KB
(180%)
Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Assets/LockScreenLogo.scale-200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+543 Bytes
(140%)
Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Assets/StoreLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion
2
Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Package.appxmanifest
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 4 additions & 3 deletions
7
...AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android.Bindings/Transforms/Metadata.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<metadata> | ||
<remove-node path="/api/package[@name='com.microsoft.appcenter.analytics.ingestion.models.json']" /> | ||
<attr path="/api/package[@name='com.microsoft.appcenter.analytics']/class[@name='Analytics']" name="managedName">AndroidAnalytics</attr> | ||
<attr path="/api/package[@name='com.microsoft.appcenter.analytics']/class[@name='Analytics']/method[@name='setListener']" name="visibility">public</attr> | ||
<remove-node path="/api/package[@name='com.microsoft.appcenter.analytics.ingestion.models.json']" /> | ||
<remove-node path="/api/package[@name='com.microsoft.appcenter.analytics.ingestion.models.one.json']" /> | ||
<attr path="/api/package[@name='com.microsoft.appcenter.analytics']/class[@name='Analytics']" name="managedName">AndroidAnalytics</attr> | ||
<attr path="/api/package[@name='com.microsoft.appcenter.analytics']/class[@name='Analytics']/method[@name='setListener']" name="visibility">public</attr> | ||
</metadata> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.