Skip to content

Commit

Permalink
Merge pull request #1267 from microsoft/develop
Browse files Browse the repository at this point in the history
Merge develop -> master
  • Loading branch information
YuyaoHu authored Dec 16, 2019
2 parents 9d64b63 + d6dd550 commit 750319c
Show file tree
Hide file tree
Showing 83 changed files with 211 additions and 157 deletions.
2 changes: 1 addition & 1 deletion Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.appcenter.xamarin.puppet" android:versionCode="68" android:versionName="2.6.3-SNAPSHOT" android:installLocation="auto">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.appcenter.xamarin.puppet" android:versionCode="69" android:versionName="2.6.4-SNAPSHOT" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26" />
<application android:label="SXPuppet" android:icon="@drawable/Icon" android:theme="@style/PuppetTheme">
<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver" android:exported="false" />
Expand Down
4 changes: 2 additions & 2 deletions Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
[assembly: AssemblyInformationalVersion("2.6.3-SNAPSHOT")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: AssemblyInformationalVersion("2.6.4-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public CrashesContentPage()
protected override async void OnAppearing()
{
base.OnAppearing();
CrashesEnabledSwitchCell.On = await Crashes.IsEnabledAsync();
CrashesEnabledSwitchCell.IsEnabled = await AppCenter.IsEnabledAsync();
RefreshEnabled();
var hasLowMemoryWarning = await Crashes.HasReceivedMemoryWarningInLastSessionAsync();
MemoryWarningLabel.Text = hasLowMemoryWarning ? "Yes" : "No";

Expand Down Expand Up @@ -72,6 +71,7 @@ protected override async void OnAppearing()
async void UpdateEnabled(object sender, ToggledEventArgs e)
{
await Crashes.SetEnabledAsync(e.Value);
RefreshEnabled();
}

async void TextAttachment(object sender, EventArgs e)
Expand Down Expand Up @@ -116,6 +116,12 @@ async void PropertiesCellTapped(object sender, EventArgs e)
await Navigation.PushAsync(new PropertiesContentPage(Properties));
}

async void RefreshEnabled()
{
CrashesEnabledSwitchCell.On = await Crashes.IsEnabledAsync();
CrashesEnabledSwitchCell.IsEnabled = await AppCenter.IsEnabledAsync();
}

void RefreshPropCount()
{
NumPropertiesLabel.Text = Properties.Count.ToString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,9 @@ protected override async void OnAppearing()
{
base.OnAppearing();
var acEnabled = await AppCenter.IsEnabledAsync();
DistributeEnabledSwitchCell.On = await Distribute.IsEnabledAsync();
DistributeEnabledSwitchCell.IsEnabled = acEnabled;
PushEnabledSwitchCell.On = await Push.IsEnabledAsync();
PushEnabledSwitchCell.IsEnabled = acEnabled;
AuthEnabledSwitchCell.On = await Auth.IsEnabledAsync();
AuthEnabledSwitchCell.IsEnabled = acEnabled;
RefreshDistributeEnabled(acEnabled);
RefreshPushEnabled(acEnabled);
RefreshAuthEnabled(acEnabled);
EventFilterEnabledSwitchCell.On = _eventFilterStarted && await EventFilterHolder.Implementation?.IsEnabledAsync();
EventFilterEnabledSwitchCell.IsEnabled = acEnabled && EventFilterHolder.Implementation != null;
if (!Application.Current.Properties.ContainsKey(AccountId))
Expand All @@ -81,16 +78,40 @@ protected override async void OnAppearing()
async void UpdateDistributeEnabled(object sender, ToggledEventArgs e)
{
await Distribute.SetEnabledAsync(e.Value);
var acEnabled = await AppCenter.IsEnabledAsync();
RefreshDistributeEnabled(acEnabled);
}

async void UpdatePushEnabled(object sender, ToggledEventArgs e)
{
await Push.SetEnabledAsync(e.Value);
var acEnabled = await AppCenter.IsEnabledAsync();
RefreshPushEnabled(acEnabled);
}

async void UpdateAuthEnabled(object sender, ToggledEventArgs e)
{
await Auth.SetEnabledAsync(e.Value);
var acEnabled = await AppCenter.IsEnabledAsync();
RefreshAuthEnabled(acEnabled);
}

async void RefreshDistributeEnabled(bool _appCenterEnabled)
{
DistributeEnabledSwitchCell.On = await Distribute.IsEnabledAsync();
DistributeEnabledSwitchCell.IsEnabled = _appCenterEnabled;
}

async void RefreshPushEnabled(bool _appCenterEnabled)
{
PushEnabledSwitchCell.On = await Push.IsEnabledAsync();
PushEnabledSwitchCell.IsEnabled = _appCenterEnabled;
}

async void RefreshAuthEnabled(bool _appCenterEnabled)
{
AuthEnabledSwitchCell.On = await Auth.IsEnabledAsync();
AuthEnabledSwitchCell.IsEnabled = _appCenterEnabled;
}

async void ChangeAuthType(object sender, PropertyChangedEventArgs e)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="69" android:versionName="2.6.3-SNAPSHOT" package="com.microsoft.appcenter.xamarin.forms.puppet">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="70" android:versionName="2.6.4-SNAPSHOT" package="com.microsoft.appcenter.xamarin.forms.puppet">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
<application android:label="ACFPuppet">
<activity android:name="com.microsoft.identity.client.BrowserTabActivity">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
[assembly: AssemblyInformationalVersion("2.6.3-SNAPSHOT")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: AssemblyInformationalVersion("2.6.4-SNAPSHOT")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?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.Puppet.U" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="2.6.3.0" />
<Identity Name="10805zumoTestUser.AppCenter-Contoso.Forms.Puppet.U" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="2.6.4.0" />
<mp:PhoneIdentity PhoneProductId="55497ed8-b2ac-4485-ba79-e2b65bb720ed" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>AppCenter-Contoso.Forms.Puppet.UWP</DisplayName>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: ComVisible(false)]
4 changes: 2 additions & 2 deletions Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<key>CFBundleIdentifier</key>
<string>com.microsoft.appcenter.xamarin.forms.ios.puppet</string>
<key>CFBundleShortVersionString</key>
<string>2.6.3</string>
<string>2.6.4</string>
<key>CFBundleVersion</key>
<string>2.6.3</string>
<string>2.6.4</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public CrashesContentPage()
protected override async void OnAppearing()
{
base.OnAppearing();
CrashesEnabledSwitchCell.On = await Crashes.IsEnabledAsync();
CrashesEnabledSwitchCell.IsEnabled = await AppCenter.IsEnabledAsync();
RefreshEnabled();
var hasLowMemoryWarning = await Crashes.HasReceivedMemoryWarningInLastSessionAsync();
MemoryWarningLabel.Text = hasLowMemoryWarning ? "Yes" : "No";

Expand Down Expand Up @@ -72,6 +71,7 @@ protected override async void OnAppearing()
async void UpdateEnabled(object sender, ToggledEventArgs e)
{
await Crashes.SetEnabledAsync(e.Value);
RefreshEnabled();
}

async void TextAttachment(object sender, EventArgs e)
Expand Down Expand Up @@ -116,6 +116,12 @@ async void PropertiesCellTapped(object sender, EventArgs e)
await Navigation.PushAsync(new PropertiesContentPage(Properties));
}

async void RefreshEnabled()
{
CrashesEnabledSwitchCell.On = await Crashes.IsEnabledAsync();
CrashesEnabledSwitchCell.IsEnabled = await AppCenter.IsEnabledAsync();
}

void RefreshPropCount()
{
NumPropertiesLabel.Text = Properties.Count.ToString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,9 @@ protected override async void OnAppearing()
{
base.OnAppearing();
var acEnabled = await AppCenter.IsEnabledAsync();
DistributeEnabledSwitchCell.On = await Distribute.IsEnabledAsync();
DistributeEnabledSwitchCell.IsEnabled = acEnabled;
PushEnabledSwitchCell.On = await Push.IsEnabledAsync();
PushEnabledSwitchCell.IsEnabled = acEnabled;
AuthEnabledSwitchCell.On = await Auth.IsEnabledAsync();
AuthEnabledSwitchCell.IsEnabled = acEnabled;
RefreshDistributeEnabled(acEnabled);
RefreshPushEnabled(acEnabled);
RefreshAuthEnabled(acEnabled);
RumEnabledSwitchCell.On = _rumStarted && await RealUserMeasurements.IsEnabledAsync();
RumEnabledSwitchCell.IsEnabled = acEnabled;
EventFilterEnabledSwitchCell.On = _eventFilterStarted && await EventFilterHolder.Implementation?.IsEnabledAsync();
Expand All @@ -86,16 +83,40 @@ protected override async void OnAppearing()
async void UpdateDistributeEnabled(object sender, ToggledEventArgs e)
{
await Distribute.SetEnabledAsync(e.Value);
var acEnabled = await AppCenter.IsEnabledAsync();
RefreshDistributeEnabled(acEnabled);
}

async void UpdatePushEnabled(object sender, ToggledEventArgs e)
{
await Push.SetEnabledAsync(e.Value);
var acEnabled = await AppCenter.IsEnabledAsync();
RefreshPushEnabled(acEnabled);
}

async void UpdateAuthEnabled(object sender, ToggledEventArgs e)
{
await Auth.SetEnabledAsync(e.Value);
var acEnabled = await AppCenter.IsEnabledAsync();
RefreshAuthEnabled(acEnabled);
}

async void RefreshDistributeEnabled(bool _appCenterEnabled)
{
DistributeEnabledSwitchCell.On = await Distribute.IsEnabledAsync();
DistributeEnabledSwitchCell.IsEnabled = _appCenterEnabled;
}

async void RefreshPushEnabled(bool _appCenterEnabled)
{
PushEnabledSwitchCell.On = await Push.IsEnabledAsync();
PushEnabledSwitchCell.IsEnabled = _appCenterEnabled;
}

async void RefreshAuthEnabled(bool _appCenterEnabled)
{
AuthEnabledSwitchCell.On = await Auth.IsEnabledAsync();
AuthEnabledSwitchCell.IsEnabled = _appCenterEnabled;
}

async void ChangeAuthType(object sender, PropertyChangedEventArgs e)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
[assembly: AssemblyInformationalVersion("2.6.3-SNAPSHOT")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: AssemblyInformationalVersion("2.6.4-SNAPSHOT")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
Expand Down
2 changes: 1 addition & 1 deletion Apps/Contoso.UWP.Puppet/Package.appxmanifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?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.UWP.Puppet" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="2.6.3.0" />
<Identity Name="10805zumoTestUser.AppCenter-Contoso.UWP.Puppet" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="2.6.4.0" />
<mp:PhoneIdentity PhoneProductId="ce1e8604-09a9-4ffb-846b-8762beb84188" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>AppCenter-Contoso.UWP.Puppet</DisplayName>
Expand Down
2 changes: 1 addition & 1 deletion Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: ComVisible(false)]
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<UseWPF>true</UseWPF>
<Version>2.6.3-SNAPSHOT</Version>
<Version>2.6.4-SNAPSHOT</Version>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
<FileVersion>2.6.3.0</FileVersion>
<FileVersion>2.6.4.0</FileVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
Expand Down
4 changes: 2 additions & 2 deletions Apps/Contoso.WPF.Puppet/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
[assembly: AssemblyInformationalVersion("2.6.3-SNAPSHOT")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: AssemblyInformationalVersion("2.6.4-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<Version>2.6.3-SNAPSHOT</Version>
<Version>2.6.4-SNAPSHOT</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
Expand Down
4 changes: 2 additions & 2 deletions Apps/Contoso.WinForms.Puppet/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
[assembly: AssemblyInformationalVersion("2.6.3-SNAPSHOT")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: AssemblyInformationalVersion("2.6.4-SNAPSHOT")]
4 changes: 2 additions & 2 deletions Apps/Contoso.iOS.Puppet/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<key>CFBundleIdentifier</key>
<string>com.microsoft.appcenter.xamarin.ios.puppet</string>
<key>CFBundleShortVersionString</key>
<string>2.6.3</string>
<string>2.6.4</string>
<key>CFBundleVersion</key>
<string>2.6.3</string>
<string>2.6.4</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# App Center SDK for .NET Change Log

## Version 2.6.3
## Version 2.6.4

### App Center

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
[assembly: AssemblyInformationalVersion("2.6.3-SNAPSHOT")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: AssemblyInformationalVersion("2.6.4-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
[assembly: AssemblyInformationalVersion("2.6.3-SNAPSHOT")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: AssemblyInformationalVersion("2.6.4-SNAPSHOT")]
2 changes: 1 addition & 1 deletion SDK/AppCenter/Microsoft.AppCenter.Shared/WrapperSdk.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ public partial class WrapperSdk
public const string Name = "appcenter.xamarin";

/* We can't use reflection for assemblyInformationalVersion on iOS with "Link All" optimization. */
internal const string Version = "2.6.3-SNAPSHOT";
internal const string Version = "2.6.4-SNAPSHOT";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
[assembly: AssemblyInformationalVersion("2.6.3-SNAPSHOT")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: AssemblyInformationalVersion("2.6.4-SNAPSHOT")]
[assembly: ComVisible(false)]
[assembly: InternalsVisibleTo("Microsoft.AppCenter.Test.UWP")]
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<TargetFrameworks>netcoreapp3.0;net45</TargetFrameworks>
<RootNamespace>Microsoft.AppCenter</RootNamespace>
<UseWindowsForms>true</UseWindowsForms>
<Version>2.6.3-SNAPSHOT</Version>
<Version>2.6.4-SNAPSHOT</Version>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
<FileVersion>2.6.3.0</FileVersion>
<FileVersion>2.6.4.0</FileVersion>
<AssemblyName>Microsoft.AppCenter</AssemblyName>
<DocumentationFile>bin\Microsoft.AppCenter.xml</DocumentationFile>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
[assembly: AssemblyInformationalVersion("2.6.3-SNAPSHOT")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: AssemblyInformationalVersion("2.6.4-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.6.3.0")]
[assembly: AssemblyInformationalVersion("2.6.3-SNAPSHOT")]
[assembly: AssemblyFileVersion("2.6.4.0")]
[assembly: AssemblyInformationalVersion("2.6.4-SNAPSHOT")]
4 changes: 2 additions & 2 deletions SDK/AppCenter/Microsoft.AppCenter/Microsoft.AppCenter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<Copyright>Microsoft Corp. All rights reserved.</Copyright>
<Product>Microsoft.AppCenter.Core</Product>
<Company>Microsoft Corporation</Company>
<Version>2.6.3-SNAPSHOT</Version>
<Version>2.6.4-SNAPSHOT</Version>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
<FileVersion>2.6.3.0</FileVersion>
<FileVersion>2.6.4.0</FileVersion>
<AssemblyTitle>Microsoft.AppCenter.Core</AssemblyTitle>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Microsoft.AppCenter.xml</DocumentationFile>
</PropertyGroup>
Expand Down
Loading

0 comments on commit 750319c

Please sign in to comment.