Merge pull request #548 from Microsoft/master

Master
This commit is contained in:
Guillaume Perrot 2017-12-11 18:59:48 -08:00 коммит произвёл GitHub
Родитель 7d4a023bad 110ea65f35
Коммит f441179669
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
20 изменённых файлов: 49 добавлений и 67 удалений

Просмотреть файл

@ -23,6 +23,7 @@ namespace Contoso.Forms.Demo.Droid
Xamarin.Forms.Forms.Init(this, savedInstanceState);
Push.SetSenderId("177539951155");
LoadApplication(new App());
}

Просмотреть файл

@ -1,14 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.appcenter.xamarin.forms.demo" android:versionName="1.0.1" android:versionCode="45">
<uses-sdk android:minSdkVersion="15" />
<application android:label="ACFDemo">
<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver" android:exported="false" />
<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver" android:exported="true" android:permission="com.google.android.c2dm.permission.SEND">
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
<category android:name="${applicationId}" />
</intent-filter>
</receiver>
</application>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.appcenter.xamarin.forms.demo" android:versionName="1.1.0" android:versionCode="46">
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="26" />
<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
<permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature" />
<application android:label="ACFDemo" />
</manifest>

Просмотреть файл

@ -20,8 +20,8 @@ using Android.App;
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
[assembly: AssemblyInformationalVersion("1.0.1")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyInformationalVersion("1.1.0")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.

Просмотреть файл

@ -1,4 +1,3 @@
#!/usr/bin/env bash
echo "Executing post clone script in `pwd`"
sed -i '' "s/NUGET_PASSWORD/$NUGET_PASSWORD/g" ../../../NuGet.config
(cd ../../.. && ./build.sh -t=externals-ios)

Просмотреть файл

@ -1,9 +1 @@
-dontwarn com.google.android.gms.**
-dontwarn android.app.NotificationManager
-dontwarn android.app.NotificationChannel
-dontwarn android.app.Notification$Builder
-dontwarn android.content.pm.PackageManager
-keep class com.google.firebase.provider.FirebaseInitProvider
-keep class com.google.firebase.iid.FirebaseInstanceIdReceiver
-keep class com.microsoft.appcenter.push.TokenService
-keep class com.microsoft.appcenter.push.PushMessagingService
-dontwarn com.microsoft.appcenter.push.**

Просмотреть файл

@ -1,11 +1,11 @@
{
{
"dependencies": {
"Microsoft.AppCenter.Analytics": "1.0.1",
"Microsoft.AppCenter.Crashes": "1.0.1",
"Microsoft.AppCenter.Distribute": "1.0.1",
"Microsoft.AppCenter.Push": "1.0.1",
"Microsoft.AppCenter.Analytics": "1.1.0",
"Microsoft.AppCenter.Crashes": "1.1.0",
"Microsoft.AppCenter.Distribute": "1.1.0",
"Microsoft.AppCenter.Push": "1.1.0",
"Xamarin.Build.Download": "0.4.7",
"Xamarin.Forms": "2.5.0.91635"
"Xamarin.Forms": "2.5.0.121934"
},
"frameworks": {
"MonoAndroid,Version=v8.0": {}

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="10805zumoTestUser.AppCenter-Contoso.Forms.Demo.UWP" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="1.0.1.0" />
<Identity Name="10805zumoTestUser.AppCenter-Contoso.Forms.Demo.UWP" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="1.1.0.0" />
<mp:PhoneIdentity PhoneProductId="fbe02dcf-2c7d-4740-9c2b-0df5e15916e5" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>AppCenter-Contoso.Forms.Demo.UWP</DisplayName>

Просмотреть файл

@ -24,5 +24,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: ComVisible(false)]

Просмотреть файл

@ -1,9 +1,9 @@
{
"dependencies": {
"Microsoft.AppCenter.Analytics": "1.0.1",
"Microsoft.AppCenter.Crashes": "1.0.1",
"Microsoft.AppCenter.Distribute": "1.0.1",
"Microsoft.AppCenter.Push": "1.0.1",
"Microsoft.AppCenter.Analytics": "1.1.0",
"Microsoft.AppCenter.Crashes": "1.1.0",
"Microsoft.AppCenter.Distribute": "1.1.0",
"Microsoft.AppCenter.Push": "1.1.0",
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
"Xamarin.Forms": "2.5.0.91635"
},

Просмотреть файл

@ -5,7 +5,7 @@
<key>CFBundleIdentifier</key>
<string>com.microsoft.appcenter.xamarin.forms.demo</string>
<key>CFBundleVersion</key>
<string>1.0.1</string>
<string>1.1.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
@ -39,7 +39,7 @@
<key>CFBundleName</key>
<string>ACFDemo</string>
<key>CFBundleShortVersionString</key>
<string>1.0.1</string>
<string>1.1.0</string>
<key>CFBundleURLTypes</key>
<array>
<dict>

Просмотреть файл

@ -1,5 +1,3 @@
#!/usr/bin/env bash
echo "Executing post clone script in `pwd`"
sed -i '' "s/NUGET_PASSWORD/$NUGET_PASSWORD/g" ../../../NuGet.config
echo $GOOGLE_SERVICES_JSON | base64 -D > google-services.json
(cd ../../.. && ./build.sh -t=externals-android)

Просмотреть файл

@ -1,10 +1,10 @@
{
{
"dependencies": {
"Microsoft.AppCenter.Analytics": "1.0.1",
"Microsoft.AppCenter.Crashes": "1.0.1",
"Microsoft.AppCenter.Distribute": "1.0.1",
"Microsoft.AppCenter.Push": "1.0.1",
"Xamarin.Forms": "2.5.0.91635"
"Microsoft.AppCenter.Analytics": "1.1.0",
"Microsoft.AppCenter.Crashes": "1.1.0",
"Microsoft.AppCenter.Distribute": "1.1.0",
"Microsoft.AppCenter.Push": "1.1.0",
"Xamarin.Forms": "2.5.0.121934"
},
"frameworks": {
"Xamarin.iOS,Version=v1.0": {}

Просмотреть файл

@ -17,8 +17,8 @@ using System.Reflection;
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
[assembly: AssemblyInformationalVersion("1.0.1")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyInformationalVersion("1.1.0")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.

Просмотреть файл

@ -1,11 +1,11 @@
{
{
"dependencies": {
"Microsoft.AppCenter.Analytics": "1.0.1",
"Microsoft.AppCenter.Crashes": "1.0.1",
"Microsoft.AppCenter.Distribute": "1.0.1",
"Microsoft.AppCenter.Push": "1.0.1",
"Microsoft.AppCenter.Analytics": "1.1.0",
"Microsoft.AppCenter.Crashes": "1.1.0",
"Microsoft.AppCenter.Distribute": "1.1.0",
"Microsoft.AppCenter.Push": "1.1.0",
"NETStandard.Library": "1.6.1",
"Xamarin.Forms": "2.5.0.91635"
"Xamarin.Forms": "2.5.0.121934"
},
"frameworks": {
"netstandard1.0": {}

Просмотреть файл

@ -27,5 +27,5 @@ using System.Windows;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
[assembly: AssemblyInformationalVersion("1.0.1")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyInformationalVersion("1.1.0")]

Просмотреть файл

@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.AppCenter.Analytics": "1.0.1",
"Microsoft.AppCenter.Crashes": "1.0.1"
"Microsoft.AppCenter.Analytics": "1.1.0",
"Microsoft.AppCenter.Crashes": "1.1.0"
},
"frameworks": {
"net452": {}

Просмотреть файл

@ -25,5 +25,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
[assembly: AssemblyInformationalVersion("1.0.1")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyInformationalVersion("1.1.0")]

Просмотреть файл

@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.AppCenter.Analytics": "1.0.1",
"Microsoft.AppCenter.Crashes": "1.0.1"
"Microsoft.AppCenter.Analytics": "1.1.0",
"Microsoft.AppCenter.Crashes": "1.1.0"
},
"frameworks": {
"net452": {}

3
appcenter-post-clone.ps1 Normal file
Просмотреть файл

@ -0,0 +1,3 @@
#!/usr/bin/env bash
echo "Executing post clone script in $pwd"
(Get-Content NuGet.config).replace('NUGET_PASSWORD', $env:NUGET_PASSWORD) | Set-Content NuGet.config

Просмотреть файл

@ -1,4 +0,0 @@
#!/usr/bin/env bash
echo "Executing post clone script in $pwd"
(Get-Content NuGet.config).replace('NUGET_PASSWORD', $env:NUGET_PASSWORD) | Set-Content NuGet.config
[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($env:GOOGLE_SERVICES_JSON)) | Set-Content Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/google-services.json