Skip to content

Commit 2775efe

Browse files
glennawatsonglennawatson
authored
housekeeping: Update the integration tests to remove warnings. (#1842)
* Updated integration tests to comply with rules * Added support for myget for integration tests * Further fixes to the integration tests to avoid warnings and errors. Update versions. Add nuget myget support for integration tests * Got rid of warnings from Integration tests. Updated some libraries to use MsBuild.Sdk.Extras
1 parent 1a986a5 commit 2775efe

File tree

61 files changed

+1770
-1833
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1770
-1833
lines changed

‎integrationtests/Directory.Build.props‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<Project>
2+
<PropertyGroup>
3+
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
4+
<PackageLicenseUrl>https://opensource.org/licenses/mit</PackageLicenseUrl>
5+
<PackageProjectUrl>https://reactiveui.net</PackageProjectUrl>
6+
<PackageIconUrl>https://i.imgur.com/7WDbqSy.png</PackageIconUrl>
7+
<Authors>.NET Foundation and Contributors</Authors>
8+
<Owners>xpaulbettsx;ghuntley</Owners>
9+
<Product>ReactiveUI Integration Tests ($(TargetFramework))</Product>
10+
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;ios;mac;forms;monodroid;monotouch;xamarin.android;xamarin.ios;xamarin.forms;xamarin.mac;xamarin.tvos;wpf;net;netstandard;net461;uwp;tizen</PackageTags>
11+
<PackageReleaseNotes>https://reactiveui.net/blog/</PackageReleaseNotes>
12+
<RepositoryUrl>https://github.com/reactiveui/reactiveui</RepositoryUrl>
13+
<RepositoryType>git</RepositoryType>
14+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
15+
<Platform>AnyCPU</Platform>
16+
<SourceLinkEnabled></SourceLinkEnabled>
17+
</PropertyGroup>
18+
19+
<ItemGroup>
20+
<None Include="..\LICENSE" Pack="true" PackagePath="LICENSE" />
21+
</ItemGroup>
22+
23+
<PropertyGroup>
24+
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
25+
</PropertyGroup>
26+
<Import Project="..\directory.build.props" />
27+
</Project>

‎integrationtests/IntegrationTests.All.sln‎

Lines changed: 51 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.28010.2016
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.Android", "IntegrationTests.Android\IntegrationTests.Android.csproj", "{3BC0AC7E-3B3B-4D3F-9CC0-B2BDECC460A6}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.iOS", "IntegrationTests.iOS\IntegrationTests.iOS.csproj", "{101E3060-8799-4119-8A7A-4F86A01C0C84}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.iOS", "IntegrationTests.iOS\IntegrationTests.iOS.csproj", "{101E3060-8799-4119-8A7A-4F86A01C0C84}"
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.Mac", "IntegrationTests.Mac\IntegrationTests.Mac.csproj", "{84D75BEA-CDE7-4DF9-B51C-468F650BE924}"
1111
EndProject
@@ -15,9 +15,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.Shared.Tes
1515
EndProject
1616
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.UWP", "IntegrationTests.UWP\IntegrationTests.UWP.csproj", "{01B889B1-5492-403B-BB2C-947FDE4130F7}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.WinForms", "IntegrationTests.WinForms\IntegrationTests.WinForms.csproj", "{DF25062C-CD9E-4F64-B3A9-AF0DC656CB52}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.WinForms", "IntegrationTests.WinForms\IntegrationTests.WinForms.csproj", "{DF25062C-CD9E-4F64-B3A9-AF0DC656CB52}"
1919
EndProject
20-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.WPF", "IntegrationTests.WPF\IntegrationTests.WPF.csproj", "{1F07CDC4-B1B7-4D91-8F07-9AE1C648E316}"
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.WPF", "IntegrationTests.WPF\IntegrationTests.WPF.csproj", "{1F07CDC4-B1B7-4D91-8F07-9AE1C648E316}"
2121
EndProject
2222
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.XamarinForms", "IntegrationTests.XamarinForms\IntegrationTests.XamarinForms.csproj", "{413E3E76-5C3A-4069-AC11-7DF426C39EBA}"
2323
EndProject
@@ -127,47 +127,54 @@ Global
127127
{3BC0AC7E-3B3B-4D3F-9CC0-B2BDECC460A6}.Release|x86.ActiveCfg = Release|Any CPU
128128
{3BC0AC7E-3B3B-4D3F-9CC0-B2BDECC460A6}.Release|x86.Build.0 = Release|Any CPU
129129
{3BC0AC7E-3B3B-4D3F-9CC0-B2BDECC460A6}.Release|x86.Deploy.0 = Release|Any CPU
130-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|Any CPU.ActiveCfg = Release|iPhone
131-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|Any CPU.Build.0 = Release|iPhone
132-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|ARM.ActiveCfg = Release|iPhone
133-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|ARM.Build.0 = Release|iPhone
134-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhone.ActiveCfg = Release|iPhone
135-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhone.Build.0 = Release|iPhone
136-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
137-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
138-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x64.ActiveCfg = Release|iPhone
139-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x64.Build.0 = Release|iPhone
140-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x86.ActiveCfg = Release|iPhone
141-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x86.Build.0 = Release|iPhone
142-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|Any CPU.ActiveCfg = Release|iPhone
143-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|Any CPU.Build.0 = Release|iPhone
144-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|ARM.ActiveCfg = Release|iPhone
145-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|ARM.Build.0 = Release|iPhone
146-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhone.ActiveCfg = Release|iPhone
147-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhone.Build.0 = Release|iPhone
148-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
149-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
150-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x64.ActiveCfg = Release|iPhone
151-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x64.Build.0 = Release|iPhone
152-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x86.ActiveCfg = Release|iPhone
153-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x86.Build.0 = Release|iPhone
154-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|Any CPU.ActiveCfg = Debug|iPhone
155-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|Any CPU.Build.0 = Debug|iPhone
156-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|ARM.ActiveCfg = Debug|iPhone
157-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhone.ActiveCfg = Debug|iPhone
158-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhone.Build.0 = Debug|iPhone
159-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
160-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
161-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|x64.ActiveCfg = Debug|iPhone
162-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|x86.ActiveCfg = Debug|iPhone
163-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|Any CPU.ActiveCfg = Release|iPhone
164-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|ARM.ActiveCfg = Release|iPhone
165-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhone.ActiveCfg = Release|iPhone
166-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhone.Build.0 = Release|iPhone
167-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
168-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
169-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|x64.ActiveCfg = Release|iPhone
170-
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|x86.ActiveCfg = Release|iPhone
130+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
131+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
132+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
133+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
134+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
135+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
136+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
137+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
138+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
139+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
140+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
141+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
142+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
143+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|Any CPU.Build.0 = Debug|Any CPU
144+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|ARM.ActiveCfg = Debug|Any CPU
145+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|ARM.Build.0 = Debug|Any CPU
146+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
147+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhone.Build.0 = Debug|Any CPU
148+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
149+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
150+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x64.ActiveCfg = Debug|Any CPU
151+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x64.Build.0 = Debug|Any CPU
152+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x86.ActiveCfg = Debug|Any CPU
153+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x86.Build.0 = Debug|Any CPU
154+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
155+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|Any CPU.Build.0 = Debug|Any CPU
156+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|ARM.ActiveCfg = Debug|Any CPU
157+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|ARM.Build.0 = Debug|Any CPU
158+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhone.ActiveCfg = Debug|Any CPU
159+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhone.Build.0 = Debug|Any CPU
160+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
161+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
162+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|x64.ActiveCfg = Debug|Any CPU
163+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|x64.Build.0 = Debug|Any CPU
164+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|x86.ActiveCfg = Debug|Any CPU
165+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|x86.Build.0 = Debug|Any CPU
166+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|Any CPU.ActiveCfg = Release|Any CPU
167+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|Any CPU.Build.0 = Release|Any CPU
168+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|ARM.ActiveCfg = Release|Any CPU
169+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|ARM.Build.0 = Release|Any CPU
170+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhone.ActiveCfg = Release|Any CPU
171+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhone.Build.0 = Release|Any CPU
172+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
173+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
174+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|x64.ActiveCfg = Release|Any CPU
175+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|x64.Build.0 = Release|Any CPU
176+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|x86.ActiveCfg = Release|Any CPU
177+
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|x86.Build.0 = Release|Any CPU
171178
{84D75BEA-CDE7-4DF9-B51C-468F650BE924}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86
172179
{84D75BEA-CDE7-4DF9-B51C-468F650BE924}.Ad-Hoc|Any CPU.Build.0 = Release|x86
173180
{84D75BEA-CDE7-4DF9-B51C-468F650BE924}.Ad-Hoc|ARM.ActiveCfg = Release|x86
@@ -340,7 +347,6 @@ Global
340347
{01B889B1-5492-403B-BB2C-947FDE4130F7}.AppStore|x86.Build.0 = Release|x86
341348
{01B889B1-5492-403B-BB2C-947FDE4130F7}.AppStore|x86.Deploy.0 = Release|x86
342349
{01B889B1-5492-403B-BB2C-947FDE4130F7}.Debug|Any CPU.ActiveCfg = Debug|x86
343-
{01B889B1-5492-403B-BB2C-947FDE4130F7}.Debug|Any CPU.Build.0 = Debug|x86
344350
{01B889B1-5492-403B-BB2C-947FDE4130F7}.Debug|ARM.ActiveCfg = Debug|ARM
345351
{01B889B1-5492-403B-BB2C-947FDE4130F7}.Debug|ARM.Build.0 = Debug|ARM
346352
{01B889B1-5492-403B-BB2C-947FDE4130F7}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -597,7 +603,6 @@ Global
597603
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.AppStore|x64.ActiveCfg = AppStore|iPhone
598604
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.AppStore|x86.ActiveCfg = AppStore|iPhone
599605
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.Debug|Any CPU.ActiveCfg = Debug|iPhone
600-
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.Debug|Any CPU.Build.0 = Debug|iPhone
601606
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.Debug|ARM.ActiveCfg = Debug|iPhone
602607
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.Debug|iPhone.ActiveCfg = Debug|iPhone
603608
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.Debug|iPhone.Build.0 = Debug|iPhone

‎integrationtests/IntegrationTests.Android/IntegrationTests.Android.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1818
<AndroidResgenClass>Resource</AndroidResgenClass>
1919
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
20-
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
2120
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
2221
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
2322
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -34,6 +33,7 @@
3433
<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
3534
<AndroidLinkMode>None</AndroidLinkMode>
3635
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
36+
<DocumentationFile>bin\Debug\IntegrationTests.Android.xml</DocumentationFile>
3737
</PropertyGroup>
3838
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3939
<DebugType>PdbOnly</DebugType>
@@ -47,6 +47,7 @@
4747
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
4848
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
4949
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
50+
<DocumentationFile>bin\Release\IntegrationTests.Android.xml</DocumentationFile>
5051
</PropertyGroup>
5152
<ItemGroup>
5253
<Reference Include="System" />
@@ -61,7 +62,9 @@
6162
</ItemGroup>
6263
<ItemGroup>
6364
<None Include="Resources\AboutResources.txt" />
64-
<None Include="Properties\AndroidManifest.xml" />
65+
<None Include="Properties\AndroidManifest.xml">
66+
<SubType>Designer</SubType>
67+
</None>
6568
<None Include="Assets\AboutAssets.txt" />
6669
</ItemGroup>
6770
<ItemGroup>

‎integrationtests/IntegrationTests.Android/MainActivity.cs‎

Lines changed: 45 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,59 @@
1111

1212
namespace IntegrationTests.Android
1313
{
14-
[Activity(Label = "@string/app_name", Theme = "@style/AppTheme.NoActionBar", MainLauncher = true)]
15-
public class MainActivity : ReactiveActivity<LoginViewModel>
14+
/// <summary>
15+
/// The main activity for the application.
16+
/// </summary>
17+
[Activity(Label = "@string/app_name", Theme = "@style/AppTheme.NoActionBar", MainLauncher = true)]
18+
public class MainActivity : ReactiveActivity<LoginViewModel>
1619
{
20+
/// <summary>
21+
/// Gets or sets the user name edit text.
22+
/// </summary>
1723
public EditText Username { get; set; }
1824

25+
/// <summary>
26+
/// Gets or sets the password edit text.
27+
/// </summary>
1928
public EditText Password { get; set; }
2029

30+
/// <summary>
31+
/// Gets or sets the login button.
32+
/// </summary>
2133
public Button Login { get; set; }
2234

35+
/// <summary>
36+
/// Gets or sets the cancel butotn.
37+
/// </summary>
2338
public Button Cancel { get; set; }
2439

40+
/// <inheritdoc />
41+
public override bool OnCreateOptionsMenu(IMenu menu)
42+
{
43+
MenuInflater.Inflate(Resource.Menu.menu_main, menu);
44+
return true;
45+
}
46+
47+
/// <inheritdoc />
48+
public override bool OnOptionsItemSelected(IMenuItem item)
49+
{
50+
int id = item.ItemId;
51+
if (id == Resource.Id.action_settings)
52+
{
53+
return true;
54+
}
55+
56+
return base.OnOptionsItemSelected(item);
57+
}
58+
59+
/// <inheritdoc />
2560
protected override void OnCreate(Bundle savedInstanceState)
26-
{
27-
base.OnCreate(savedInstanceState);
61+
{
62+
base.OnCreate(savedInstanceState);
2863

29-
SetContentView(Resource.Layout.activity_main);
64+
SetContentView(Resource.Layout.activity_main);
3065

31-
var toolbar = FindViewById<Toolbar>(Resource.Id.toolbar);
66+
Toolbar toolbar = FindViewById<Toolbar>(Resource.Id.toolbar);
3267
SetActionBar(toolbar);
3368

3469
Username = FindViewById<EditText>(Resource.Id.Username);
@@ -55,18 +90,17 @@ protected override void OnCreate(Bundle savedInstanceState)
5590
.BindCommand(ViewModel, vm => vm.Cancel, v => v.Cancel)
5691
.DisposeWith(disposables);
5792

58-
this
59-
.ViewModel
93+
ViewModel
6094
.Login
6195
.SelectMany(
6296
result =>
6397
{
64-
if(!result.HasValue)
98+
if (!result.HasValue)
6599
{
66100
return Observable.Empty<Unit>();
67101
}
68102

69-
if(result.Value)
103+
if (result.Value)
70104
{
71105
new AlertDialog.Builder(this)
72106
.SetTitle("Login Successful")
@@ -87,23 +121,5 @@ protected override void OnCreate(Bundle savedInstanceState)
87121
.DisposeWith(disposables);
88122
});
89123
}
90-
91-
public override bool OnCreateOptionsMenu(IMenu menu)
92-
{
93-
MenuInflater.Inflate(Resource.Menu.menu_main, menu);
94-
return true;
95-
}
96-
97-
public override bool OnOptionsItemSelected(IMenuItem item)
98-
{
99-
int id = item.ItemId;
100-
if (id == Resource.Id.action_settings)
101-
{
102-
return true;
103-
}
104-
105-
return base.OnOptionsItemSelected(item);
106-
}
107-
}
124+
}
108125
}
109-

‎integrationtests/IntegrationTests.Android/Properties/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="IntegrationTests.Android.IntegrationTests.Android" android:installLocation="auto">
3-
<uses-sdk android:minSdkVersion="23" />
3+
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="27" />
44
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"></application>
55
</manifest>

‎integrationtests/IntegrationTests.Android/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Runtime.InteropServices;
44
using Android.App;
55

6-
// General Information about an assembly is controlled through the following
6+
// General Information about an assembly is controlled through the following
77
// set of attributes. Change these attribute values to modify the information
88
// associated with an assembly.
99
[assembly: AssemblyTitle("IntegrationTests.Android")]
@@ -19,11 +19,11 @@
1919
// Version information for an assembly consists of the following four values:
2020
//
2121
// Major Version
22-
// Minor Version
22+
// Minor Version
2323
// Build Number
2424
// Revision
2525
//
26-
// You can specify all the values or you can default the Build and Revision Numbers
26+
// You can specify all the values or you can default the Build and Revision Numbers
2727
// by using the '*' as shown below:
2828
// [assembly: AssemblyVersion("1.0.*")]
2929
[assembly: AssemblyVersion("1.0.0.0")]

‎integrationtests/IntegrationTests.Mac/AppDelegate.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,25 @@
33

44
namespace IntegrationTests.Mac
55
{
6+
/// <summary>
7+
/// The main application delegate.
8+
/// </summary>
69
[Register("AppDelegate")]
710
public class AppDelegate : NSApplicationDelegate
811
{
9-
public AppDelegate()
10-
{
11-
}
12-
12+
/// <inheritdoc />
1313
public override void DidFinishLaunching(NSNotification notification)
1414
{
1515
// Insert code here to initialize your application
1616
}
1717

18+
/// <inheritdoc />
1819
public override void WillTerminate(NSNotification notification)
1920
{
2021
// Insert code here to tear down your application
2122
}
2223

24+
/// <inheritdoc />
2325
[Export("applicationShouldTerminateAfterLastWindowClosed:")]
2426
public override bool ApplicationShouldTerminateAfterLastWindowClosed(NSApplication sender)
2527
{

0 commit comments

Comments
 (0)