summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Xamarin.Forms.ControlGallery.iOS/Info.plist91
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs3
-rw-r--r--Xamarin.Forms.Core.Windows.UITests/App.cs5
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/App.cs2
-rw-r--r--docs/Xamarin.Forms.Core/Xamarin.Forms/Command.xml4
5 files changed, 50 insertions, 55 deletions
diff --git a/Xamarin.Forms.ControlGallery.iOS/Info.plist b/Xamarin.Forms.ControlGallery.iOS/Info.plist
index 1d9d4de3..97cdf2e7 100644
--- a/Xamarin.Forms.ControlGallery.iOS/Info.plist
+++ b/Xamarin.Forms.ControlGallery.iOS/Info.plist
@@ -18,16 +18,12 @@
<array/>
<key>MinimumOSVersion</key>
<string>6.1</string>
- <key>NSMainNibFile</key>
- <string></string>
<key>CFBundleDisplayName</key>
<string>XamControl</string>
<key>CFBundleIdentifier</key>
<string>com.xamarin.quickui.controlgallery</string>
<key>CFBundleVersion</key>
<string>1.0</string>
- <key>NSMainNibFile~ipad</key>
- <string></string>
<key>CFBundleIconFiles</key>
<array>
<string>Default@2x.png</string>
@@ -41,50 +37,49 @@
<string>Can we use your location</string>
<key>CFBundleShortVersionString</key>
<string></string>
- <key>UILaunchImages</key>
- <array>
- <dict>
- <key>UILaunchImageMinimumOSVersion</key>
- <string>8.0</string>
- <key>UILaunchImageName</key>
- <string>Default-667h</string>
- <key>UILaunchImageOrientation</key>
- <string>Portrait</string>
- <key>UILaunchImageSize</key>
- <string>{375, 667}</string>
- </dict>
- <dict>
- <key>UILaunchImageMinimumOSVersion</key>
- <string>8.0</string>
- <key>UILaunchImageName</key>
- <string>Default-736h</string>
- <key>UILaunchImageOrientation</key>
- <string>Portrait</string>
- <key>UILaunchImageSize</key>
- <string>{414, 736}</string>
- </dict>
- <dict>
- <key>UILaunchImageMinimumOSVersion</key>
- <string>7.0</string>
- <key>UILaunchImageName</key>
- <string>Default-568h</string>
- <key>UILaunchImageOrientation</key>
- <string>Portrait</string>
- <key>UILaunchImageSize</key>
- <string>{320, 568}</string>
- </dict>
- <dict>
- <key>UILaunchImageMinimumOSVersion</key>
- <string>6.0</string>
- <key>UILaunchImageName</key>
- <string>Default</string>
- <key>UILaunchImageOrientation</key>
- <string>Portrait</string>
- <key>UILaunchImageSize</key>
- <string>{320, 480}</string>
-
- </dict>
- </array>
+ <key>UILaunchImages</key>
+ <array>
+ <dict>
+ <key>UILaunchImageMinimumOSVersion</key>
+ <string>8.0</string>
+ <key>UILaunchImageName</key>
+ <string>Default-667h</string>
+ <key>UILaunchImageOrientation</key>
+ <string>Portrait</string>
+ <key>UILaunchImageSize</key>
+ <string>{375, 667}</string>
+ </dict>
+ <dict>
+ <key>UILaunchImageMinimumOSVersion</key>
+ <string>8.0</string>
+ <key>UILaunchImageName</key>
+ <string>Default-736h</string>
+ <key>UILaunchImageOrientation</key>
+ <string>Portrait</string>
+ <key>UILaunchImageSize</key>
+ <string>{414, 736}</string>
+ </dict>
+ <dict>
+ <key>UILaunchImageMinimumOSVersion</key>
+ <string>7.0</string>
+ <key>UILaunchImageName</key>
+ <string>Default-568h</string>
+ <key>UILaunchImageOrientation</key>
+ <string>Portrait</string>
+ <key>UILaunchImageSize</key>
+ <string>{320, 568}</string>
+ </dict>
+ <dict>
+ <key>UILaunchImageMinimumOSVersion</key>
+ <string>6.0</string>
+ <key>UILaunchImageName</key>
+ <string>Default</string>
+ <key>UILaunchImageOrientation</key>
+ <string>Portrait</string>
+ <key>UILaunchImageSize</key>
+ <string>{320, 480}</string>
+ </dict>
+ </array>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads </key>
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
index 156a701d..15e658ce 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
@@ -16,6 +16,9 @@ namespace Xamarin.Forms.Controls
internal static class AppPaths
{
public static string ApkPath = "../../../Xamarin.Forms.ControlGallery.Android/bin/Debug/AndroidControlGallery.AndroidControlGallery-Signed.apk";
+
+ // Have to continue using the old BundleId for now; Test Cloud doesn't like
+ // when you change the BundleId
public static string BundleId = "com.xamarin.quickui.controlgallery";
}
diff --git a/Xamarin.Forms.Core.Windows.UITests/App.cs b/Xamarin.Forms.Core.Windows.UITests/App.cs
index 966ef261..8c0ddc0f 100644
--- a/Xamarin.Forms.Core.Windows.UITests/App.cs
+++ b/Xamarin.Forms.Core.Windows.UITests/App.cs
@@ -14,11 +14,6 @@ namespace Xamarin.Forms.Core.UITests
public static void Restart ()
{
App = null;
- //App = ConfigureApp
- // .iOS
- // .Debug ()
- // .InstalledApp ("com.xamarin.quickui.controlgallery")
- // .StartApp ();
}
}
}
diff --git a/Xamarin.Forms.Core.iOS.UITests/App.cs b/Xamarin.Forms.Core.iOS.UITests/App.cs
index 845bb9a5..dee82d8c 100644
--- a/Xamarin.Forms.Core.iOS.UITests/App.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/App.cs
@@ -20,6 +20,8 @@ namespace Xamarin.Forms.Core.UITests
App = ConfigureApp
.iOS
.Debug ()
+ // Keeping the old BundleId for now, Test Cloud doesn't
+ // like it when we update the BundleId for an existing app
.InstalledApp ("com.xamarin.quickui.controlgallery")
.StartApp (Xamarin.UITest.Configuration.AppDataMode.Clear);
}
diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/Command.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/Command.xml
index e8ad13ea..9fdc1182 100644
--- a/docs/Xamarin.Forms.Core/Xamarin.Forms/Command.xml
+++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/Command.xml
@@ -116,7 +116,7 @@ var button = new Button {
<param name="execute">An Action to execute when the Command is executed.</param>
<param name="canExecute">A <see cref="T:System.Func&lt;bool&gt;" /> indicating if the Command can be executed.</param>
<summary>Initializes a new instance of the Command class.</summary>
- <remarks>Wehenever the value returned by canExecute has changed, a call to <see cref="M:Xamarin.QuickuI.Command.ChangeCanExecute" /> is required to trigger <see cref="E:System.Windows.Input.ICommand.CanExecuteChanged" />.</remarks>
+ <remarks>Whenever the value returned by canExecute has changed, a call to <see cref="M:Xamarin.Forms.Core.Command.ChangeCanExecute" /> is required to trigger <see cref="E:System.Windows.Input.ICommand.CanExecuteChanged" />.</remarks>
</Docs>
</Member>
<Member MemberName=".ctor">
@@ -140,7 +140,7 @@ var button = new Button {
<param name="execute">An Action&lt;object&gt; to execute when the Command is executed.</param>
<param name="canExecute">A <see cref="T:System.Func&lt;object,bool&gt;" /> indicating if the Command can be executed.</param>
<summary>Initializes a new instance of the Command class.</summary>
- <remarks>Wehenever the value returned by canExecute has changed, a call to <see cref="M:Xamarin.QuickuI.Command.ChangeCanExecute" /> is required to trigger <see cref="E:System.Windows.Input.ICommand.CanExecuteChanged" />.</remarks>
+ <remarks>Whenever the value returned by canExecute has changed, a call to <see cref="M:Xamarin.Forms.Core.Command.ChangeCanExecute" /> is required to trigger <see cref="E:System.Windows.Input.ICommand.CanExecuteChanged" />.</remarks>
</Docs>
</Member>
<Member MemberName="CanExecute">