Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit b652773

Browse files
RedthRedth
authored
Merge pull request #39 from xamarin/v25.1.1
V25.1.1
2 parents 95d680f + a381302 commit b652773

File tree

6 files changed

+55
-233
lines changed

6 files changed

+55
-233
lines changed

‎build.cake‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#addin nuget:?package=Cake.Json
77
#addin nuget:?package=Cake.XCode
88
#addin nuget:?package=Cake.Xamarin
9-
#addin nuget:?package=Cake.Xamarin.Build&version=1.1.8
9+
#addin nuget:?package=Cake.Xamarin.Build&version=1.1.13
1010
#addin nuget:?package=Cake.FileHelpers
1111
#addin nuget:?package=Cake.MonoApiTools
1212

@@ -15,14 +15,14 @@ LogSystemInfo ();
1515

1616
var TARGET = Argument ("t", Argument ("target", "Default"));
1717

18-
var NUGET_VERSION = "25.1.0";
19-
var COMPONENT_VERSION = "25.1.0.0";
20-
var AAR_VERSION = "25.1.0";
18+
var NUGET_VERSION = "25.1.1";
19+
var COMPONENT_VERSION = "25.1.1.0";
20+
var AAR_VERSION = "25.1.1";
2121

2222
// FROM: https://dl.google.com/android/repository/addon.xml
2323
// FROM: https://dl.google.com/android/repository/addon2-1.xml
24-
var M2_REPOSITORY_URL = "https://dl-ssl.google.com/android/repository/android_m2repository_r41.zip";
25-
var M2_REPOSITORY_SHA1 = "782e7233f18c890463e8602571d304e680ce354c";
24+
var M2_REPOSITORY_URL = "https://dl-ssl.google.com/android/repository/android_m2repository_r42.zip";
25+
var M2_REPOSITORY_SHA1 = "175c56e2e2aa6fec560430318f56ed98eaeaea04";
2626
var BUILD_TOOLS_URL = "https://dl-ssl.google.com/android/repository/build-tools_r25-macosx.zip";
2727
//var DOCS_URL = "https://dl-ssl.google.com/android/repository/docs-23_r01.zip";
2828
var ANDROID_SDK_VERSION = IsRunningOnWindows () ? "v7.0" : "android-24";
@@ -329,14 +329,24 @@ Task ("component-setup").Does (() =>
329329
}
330330
});
331331

332-
333-
Task ("nuget-setup").IsDependentOn ("buildtasks").Does (() => {
332+
Task ("nuget-setup").IsDependentOn ("buildtasks").IsDependentOn ("externals")
333+
.WithCriteria (!FileExists ("./generated.targets")).Does (() => {
334334
var templateText = FileReadText ("./template.targets");
335335

336336
if (FileExists ("./generated.targets"))
337337
DeleteFile ("./generated.targets");
338338

339-
var downloadParts = DeserializeJsonFromFile<List<PartialZipInfo>> ("./partial-download-info.json");
339+
// Get the zip file offsets for the relevant aar's
340+
var downloadParts = FindZipEntries ("./externals/m2repository.zip")
341+
.Where (e => e.EntryName.Contains (AAR_VERSION)
342+
&& (e.EntryName.Contains (".aar") || e.EntryName.Contains (".jar")))
343+
.Select (e => new PartialZipInfo {
344+
RangeStart = e.RangeStart,
345+
RangeEnd = e.RangeEnd,
346+
Url = M2_REPOSITORY_URL,
347+
LocalPath = e.EntryName,
348+
Md5 = ReadZipEntryText ("./externals/m2repository.zip", e.EntryName + ".md5", readBinaryAsHex: false)
349+
}).ToList ();
340350

341351
foreach (var aar in AAR_INFOS) {
342352

‎design/samples/Cheesesquare.UITests/Tests.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void BeforeEachTest ()
2626
public void ClickingHamburgerShouldRevealDrawer ()
2727
{
2828
app.Screenshot ("Launch");
29-
app.Tap(t => t.Class("ImageButton"));
29+
app.Tap(t => t.Marked("Navigate up"));
3030
app.WaitForElement(t => t.Text("Discussion"));
3131
app.Screenshot ("Tap Hamburger");
3232
}
@@ -36,8 +36,6 @@ public void ClickingFloatingActionButtonShouldDisplaySnackbar ()
3636
{
3737
app.Screenshot ("Launch");
3838
app.Tap (q => q.Id ("fab"));
39-
app.Screenshot ("Tap Button");
40-
app.WaitForElement (q => q.Id ("snackbar_text"));
4139
app.Screenshot ("Snackbar");
4240
}
4341

‎partial-download-info.json‎

Lines changed: 0 additions & 202 deletions
This file was deleted.

‎v7-appcompat/samples/AndroidSupportSample.UITests/Tests.cs‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,24 +91,20 @@ public void ActionBarTabs ()
9191
public void DisplayOptions ()
9292
{
9393
app.Screenshot ("Launch");
94-
app.Tap(q => q.Text("Display Options"));
95-
app.WaitForElement (q => q.Class ("Toolbar"));
94+
app.Tap(q => q.Marked("Display Options"));
95+
app.WaitForElement (q => q.Marked ("toggle_navigation"));
9696
app.Screenshot ("Display Options");
9797

98-
app.Tap (q => q.Id ("toggle_home_as_up"));
99-
app.WaitForElement (q => q.Class ("ImageButton"));
98+
app.Tap (q => q.Marked ("toggle_home_as_up"));
99+
app.WaitForElement (q => q.Marked ("Navigate up"));
100100
app.Screenshot ("Toggle Home as Up");
101101

102-
app.Tap (q => q.Id ("toggle_show_title"));
103-
app.WaitForNoElement (q => q.Text ("Display Options"));
102+
app.Tap (q => q.Marked ("toggle_show_title"));
103+
app.WaitForNoElement (q => q.Marked ("Display Options"));
104104
app.Screenshot ("Hide Title");
105-
app.Tap (q => q.Id ("toggle_show_title"));
106-
app.WaitForElement (q => q.Text ("Display Options"));
105+
app.Tap (q => q.Marked ("toggle_show_title"));
106+
app.WaitForElement (q => q.Marked ("Display Options"));
107107
app.Screenshot ("Show Title");
108-
109-
app.Tap (q => q.Id ("toggle_visibility"));
110-
app.WaitForNoElement (q => q.Class ("Toolbar"));
111-
app.Screenshot ("Hide Toolbar");
112108
}
113109

114110
[Test]

‎v7-gridlayout/samples/AndroidSupportSample.UITests/Tests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void BeforeEachTest ()
2222
.StartApp ();
2323
}
2424

25-
// [Test]
25+
[Test]
2626
public void Repl ()
2727
{
2828
app.Repl ();
@@ -55,13 +55,13 @@ public void FormXml ()
5555
}
5656

5757
[Test]
58-
public void FormJava ()
58+
public void FormCSharp ()
5959
{
6060
app.Screenshot ("Launch");
61-
app.Tap (q => q.Text ("3. Form (Java)"));
62-
app.Screenshot ("Tap 3. Form (Java)");
61+
app.Tap (q => q.Text ("3. Form (C#)"));
62+
app.Screenshot ("Tap 3. Form (C#)");
6363
app.WaitForElement (q => q.Class ("GridLayout"));
64-
app.Screenshot ("Form Java");
64+
app.Screenshot ("Form C#");
6565
}
6666
}
6767
}

‎v7-preference/samples/AndroidSupportSample.UITests/Tests.cs‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void BeforeEachTest ()
2222
.StartApp ();
2323
}
2424

25-
//[Test]
25+
[Test]
2626
public void Repl ()
2727
{
2828
app.Repl ();
@@ -32,8 +32,28 @@ public void Repl ()
3232
public void AppLaunches ()
3333
{
3434
app.Screenshot ("Launch");
35-
app.WaitForElement (q => q.Class ("PercentFrameLayout"));
35+
app.WaitForElement (q => q.Marked ("List Preference"));
3636
}
37+
38+
[Test]
39+
public void ListPreference()
40+
{
41+
app.Screenshot("Launch");
42+
app.WaitForElement(q => q.Marked("List Preference"));
43+
app.Tap(q => q.Marked("List Preference"));
44+
app.WaitForElement(q => q.Marked("Three"));
45+
app.Screenshot("List Preference");
46+
}
47+
48+
[Test]
49+
public void EditTextPreference()
50+
{
51+
app.Screenshot("Launch");
52+
app.WaitForElement(q => q.Marked("Edit Text Preference"));
53+
app.Tap(q => q.Marked("Edit Text Preference"));
54+
app.WaitForElement(q => q.Marked("Dialog Title Edit Text Preference"));
55+
app.Screenshot("Edit Text Preference");
56+
}
3757
}
3858
}
3959

0 commit comments

Comments
 (0)