Permalink
Browse files

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
  • Loading branch information...
glennawatson committed Nov 21, 2018
1 parent 1a986a5 commit 2775efe1b315036999276cc12a3e51073668d26f
Showing with 1,770 additions and 1,833 deletions.
  1. +27 −0 integrationtests/Directory.Build.props
  2. +51 −46 integrationtests/IntegrationTests.All.sln
  3. +5 −2 integrationtests/IntegrationTests.Android/IntegrationTests.Android.csproj
  4. +45 −29 integrationtests/IntegrationTests.Android/MainActivity.cs
  5. +1 −1 integrationtests/IntegrationTests.Android/Properties/AndroidManifest.xml
  6. +3 −3 integrationtests/IntegrationTests.Android/Properties/AssemblyInfo.cs
  7. +6 −4 integrationtests/IntegrationTests.Mac/AppDelegate.cs
  8. +6 −3 integrationtests/IntegrationTests.Mac/IntegrationTests.Mac.csproj
  9. +35 −16 integrationtests/IntegrationTests.Mac/LoginViewController.cs
  10. +0 −13 integrationtests/IntegrationTests.Mac/Main.cs
  11. +20 −0 integrationtests/IntegrationTests.Mac/MainClass.cs
  12. +7 −14 integrationtests/{IntegrationTests.iOS → IntegrationTests.Mac}/Properties/AssemblyInfo.cs
  13. +37 −2 integrationtests/IntegrationTests.Shared.Tests/BuilderExtensions.cs
  14. +36 −13 integrationtests/IntegrationTests.Shared.Tests/Features/Initialize/DependencyResolverMixinsTests.cs
  15. +34 −7 integrationtests/IntegrationTests.Shared.Tests/Features/Login/LoginViewModelBuilder.cs
  16. +80 −63 integrationtests/IntegrationTests.Shared.Tests/Features/Login/LoginViewModelTests.cs
  17. +3 −0 integrationtests/IntegrationTests.Shared.Tests/IBuilder.cs
  18. +15 −7 integrationtests/IntegrationTests.Shared.Tests/IntegrationTests.Shared.Tests.csproj
  19. +6 −2 integrationtests/IntegrationTests.Shared/IntegrationTests.Shared.csproj
  20. +4 −6 integrationtests/IntegrationTests.Shared/LoginViewModel.cs
  21. +15 −22 integrationtests/IntegrationTests.UWP/App.xaml.cs
  22. +3 −0 integrationtests/IntegrationTests.UWP/IntegrationTests.UWP.csproj
  23. +19 −21 integrationtests/IntegrationTests.UWP/LoginControl.xaml.cs
  24. +17 −0 integrationtests/IntegrationTests.UWP/LoginControlBase.cs
  25. +4 −3 integrationtests/IntegrationTests.UWP/MainPage.xaml.cs
  26. +4 −4 integrationtests/IntegrationTests.UWP/Properties/AssemblyInfo.cs
  27. +2 −13 integrationtests/IntegrationTests.WPF/App.xaml.cs
  28. +12 −92 integrationtests/IntegrationTests.WPF/IntegrationTests.WPF.csproj
  29. +35 −41 integrationtests/IntegrationTests.WPF/LoginControl.xaml.cs
  30. +8 −6 integrationtests/IntegrationTests.WPF/MainWindow.xaml.cs
  31. +12 −40 integrationtests/IntegrationTests.WPF/Properties/AssemblyInfo.cs
  32. +15 −3 integrationtests/IntegrationTests.WPF/UserControlExtensions.cs
  33. +11 −82 integrationtests/IntegrationTests.WinForms/IntegrationTests.WinForms.csproj
  34. +21 −13 integrationtests/IntegrationTests.WinForms/LoginControl.cs
  35. +6 −0 integrationtests/IntegrationTests.WinForms/MainForm.cs
  36. +5 −2 integrationtests/IntegrationTests.WinForms/Program.cs
  37. +2 −25 integrationtests/IntegrationTests.WinForms/Properties/AssemblyInfo.cs
  38. +10 −10 integrationtests/IntegrationTests.XamarinForms.Android/IntegrationTests.XamarinForms.Android.csproj
  39. +6 −3 integrationtests/IntegrationTests.XamarinForms.Android/MainActivity.cs
  40. +1 −1 integrationtests/IntegrationTests.XamarinForms.Android/Properties/AndroidManifest.xml
  41. +3 −3 integrationtests/IntegrationTests.XamarinForms.Android/Properties/AssemblyInfo.cs
  42. +909 −933 integrationtests/IntegrationTests.XamarinForms.Android/Resources/Resource.designer.cs
  43. +12 −12 integrationtests/IntegrationTests.XamarinForms.UWP/App.xaml.cs
  44. +3 −2 integrationtests/IntegrationTests.XamarinForms.UWP/IntegrationTests.XamarinForms.UWP.csproj
  45. +9 −18 integrationtests/IntegrationTests.XamarinForms.UWP/MainPage.xaml.cs
  46. +4 −4 integrationtests/IntegrationTests.XamarinForms.UWP/Properties/AssemblyInfo.cs
  47. +15 −10 integrationtests/IntegrationTests.XamarinForms.iOS/AppDelegate.cs
  48. +26 −0 integrationtests/IntegrationTests.XamarinForms.iOS/AppLaunch.cs
  49. +17 −2 integrationtests/IntegrationTests.XamarinForms.iOS/IntegrationTests.XamarinForms.iOS.csproj
  50. +0 −20 integrationtests/IntegrationTests.XamarinForms.iOS/Main.cs
  51. +5 −5 integrationtests/IntegrationTests.XamarinForms.iOS/Properties/AssemblyInfo.cs
  52. +12 −5 integrationtests/IntegrationTests.XamarinForms/App.xaml.cs
  53. +1 −1 integrationtests/IntegrationTests.XamarinForms/IntegrationTests.XamarinForms.csproj
  54. +16 −11 integrationtests/IntegrationTests.XamarinForms/MainPage.xaml.cs
  55. +55 −47 integrationtests/IntegrationTests.iOS/AppDelegate.cs
  56. +22 −0 integrationtests/IntegrationTests.iOS/Application.cs
  57. +6 −132 integrationtests/IntegrationTests.iOS/IntegrationTests.iOS.csproj
  58. +14 −1 integrationtests/IntegrationTests.iOS/LoginViewController.cs
  59. +0 −15 integrationtests/IntegrationTests.iOS/Main.cs
  60. +5 −0 integrationtests/global.json
  61. +7 −0 integrationtests/nuget.config
@@ -0,0 +1,27 @@
<Project>
<PropertyGroup>
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
<PackageLicenseUrl>https://opensource.org/licenses/mit</PackageLicenseUrl>
<PackageProjectUrl>https://reactiveui.net</PackageProjectUrl>
<PackageIconUrl>https://i.imgur.com/7WDbqSy.png</PackageIconUrl>
<Authors>.NET Foundation and Contributors</Authors>
<Owners>xpaulbettsx;ghuntley</Owners>
<Product>ReactiveUI Integration Tests ($(TargetFramework))</Product>
<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>
<PackageReleaseNotes>https://reactiveui.net/blog/</PackageReleaseNotes>
<RepositoryUrl>https://github.com/reactiveui/reactiveui</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<Platform>AnyCPU</Platform>
<SourceLinkEnabled></SourceLinkEnabled>
</PropertyGroup>

<ItemGroup>
<None Include="..\LICENSE" Pack="true" PackagePath="LICENSE" />
</ItemGroup>

<PropertyGroup>
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
</PropertyGroup>
<Import Project="..\directory.build.props" />
</Project>
@@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.28010.2016
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.Android", "IntegrationTests.Android\IntegrationTests.Android.csproj", "{3BC0AC7E-3B3B-4D3F-9CC0-B2BDECC460A6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.iOS", "IntegrationTests.iOS\IntegrationTests.iOS.csproj", "{101E3060-8799-4119-8A7A-4F86A01C0C84}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.iOS", "IntegrationTests.iOS\IntegrationTests.iOS.csproj", "{101E3060-8799-4119-8A7A-4F86A01C0C84}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.Mac", "IntegrationTests.Mac\IntegrationTests.Mac.csproj", "{84D75BEA-CDE7-4DF9-B51C-468F650BE924}"
EndProject
@@ -15,9 +15,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.Shared.Tes
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.UWP", "IntegrationTests.UWP\IntegrationTests.UWP.csproj", "{01B889B1-5492-403B-BB2C-947FDE4130F7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.WinForms", "IntegrationTests.WinForms\IntegrationTests.WinForms.csproj", "{DF25062C-CD9E-4F64-B3A9-AF0DC656CB52}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.WinForms", "IntegrationTests.WinForms\IntegrationTests.WinForms.csproj", "{DF25062C-CD9E-4F64-B3A9-AF0DC656CB52}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.WPF", "IntegrationTests.WPF\IntegrationTests.WPF.csproj", "{1F07CDC4-B1B7-4D91-8F07-9AE1C648E316}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.WPF", "IntegrationTests.WPF\IntegrationTests.WPF.csproj", "{1F07CDC4-B1B7-4D91-8F07-9AE1C648E316}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.XamarinForms", "IntegrationTests.XamarinForms\IntegrationTests.XamarinForms.csproj", "{413E3E76-5C3A-4069-AC11-7DF426C39EBA}"
EndProject
@@ -127,47 +127,54 @@ Global
{3BC0AC7E-3B3B-4D3F-9CC0-B2BDECC460A6}.Release|x86.ActiveCfg = Release|Any CPU
{3BC0AC7E-3B3B-4D3F-9CC0-B2BDECC460A6}.Release|x86.Build.0 = Release|Any CPU
{3BC0AC7E-3B3B-4D3F-9CC0-B2BDECC460A6}.Release|x86.Deploy.0 = Release|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|Any CPU.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|Any CPU.Build.0 = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|ARM.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|ARM.Build.0 = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhone.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhone.Build.0 = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x64.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x64.Build.0 = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x86.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x86.Build.0 = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|Any CPU.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|Any CPU.Build.0 = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|ARM.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|ARM.Build.0 = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhone.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhone.Build.0 = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x64.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x64.Build.0 = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x86.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x86.Build.0 = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|Any CPU.ActiveCfg = Debug|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|Any CPU.Build.0 = Debug|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|ARM.ActiveCfg = Debug|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhone.ActiveCfg = Debug|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhone.Build.0 = Debug|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|x64.ActiveCfg = Debug|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|x86.ActiveCfg = Debug|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|Any CPU.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|ARM.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhone.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhone.Build.0 = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|x64.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|x86.ActiveCfg = Release|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|ARM.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhone.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x64.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x64.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x86.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.AppStore|x86.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|Any CPU.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|ARM.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|ARM.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhone.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|x64.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|x64.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|x86.ActiveCfg = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|x86.Build.0 = Debug|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|Any CPU.ActiveCfg = Release|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|Any CPU.Build.0 = Release|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|ARM.ActiveCfg = Release|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|ARM.Build.0 = Release|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhone.ActiveCfg = Release|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhone.Build.0 = Release|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|x64.ActiveCfg = Release|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|x64.Build.0 = Release|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|x86.ActiveCfg = Release|Any CPU
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Release|x86.Build.0 = Release|Any CPU
{84D75BEA-CDE7-4DF9-B51C-468F650BE924}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86
{84D75BEA-CDE7-4DF9-B51C-468F650BE924}.Ad-Hoc|Any CPU.Build.0 = Release|x86
{84D75BEA-CDE7-4DF9-B51C-468F650BE924}.Ad-Hoc|ARM.ActiveCfg = Release|x86
@@ -340,7 +347,6 @@ Global
{01B889B1-5492-403B-BB2C-947FDE4130F7}.AppStore|x86.Build.0 = Release|x86
{01B889B1-5492-403B-BB2C-947FDE4130F7}.AppStore|x86.Deploy.0 = Release|x86
{01B889B1-5492-403B-BB2C-947FDE4130F7}.Debug|Any CPU.ActiveCfg = Debug|x86
{01B889B1-5492-403B-BB2C-947FDE4130F7}.Debug|Any CPU.Build.0 = Debug|x86
{01B889B1-5492-403B-BB2C-947FDE4130F7}.Debug|ARM.ActiveCfg = Debug|ARM
{01B889B1-5492-403B-BB2C-947FDE4130F7}.Debug|ARM.Build.0 = Debug|ARM
{01B889B1-5492-403B-BB2C-947FDE4130F7}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -597,7 +603,6 @@ Global
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.AppStore|x64.ActiveCfg = AppStore|iPhone
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.AppStore|x86.ActiveCfg = AppStore|iPhone
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.Debug|Any CPU.ActiveCfg = Debug|iPhone
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.Debug|Any CPU.Build.0 = Debug|iPhone
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.Debug|ARM.ActiveCfg = Debug|iPhone
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.Debug|iPhone.ActiveCfg = Debug|iPhone
{9D0A3580-F5F9-4CD8-A800-0CACE438742E}.Debug|iPhone.Build.0 = Debug|iPhone
@@ -17,7 +17,6 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -34,6 +33,7 @@
<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
<AndroidLinkMode>None</AndroidLinkMode>
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
<DocumentationFile>bin\Debug\IntegrationTests.Android.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>PdbOnly</DebugType>
@@ -47,6 +47,7 @@
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
<DocumentationFile>bin\Release\IntegrationTests.Android.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -61,7 +62,9 @@
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
<None Include="Properties\AndroidManifest.xml" />
<None Include="Properties\AndroidManifest.xml">
<SubType>Designer</SubType>
</None>
<None Include="Assets\AboutAssets.txt" />
</ItemGroup>
<ItemGroup>
@@ -11,24 +11,59 @@

namespace IntegrationTests.Android
{
[Activity(Label = "@string/app_name", Theme = "@style/AppTheme.NoActionBar", MainLauncher = true)]
public class MainActivity : ReactiveActivity<LoginViewModel>
/// <summary>
/// The main activity for the application.
/// </summary>
[Activity(Label = "@string/app_name", Theme = "@style/AppTheme.NoActionBar", MainLauncher = true)]
public class MainActivity : ReactiveActivity<LoginViewModel>
{
/// <summary>
/// Gets or sets the user name edit text.
/// </summary>
public EditText Username { get; set; }

/// <summary>
/// Gets or sets the password edit text.
/// </summary>
public EditText Password { get; set; }

/// <summary>
/// Gets or sets the login button.
/// </summary>
public Button Login { get; set; }

/// <summary>
/// Gets or sets the cancel butotn.
/// </summary>
public Button Cancel { get; set; }

/// <inheritdoc />
public override bool OnCreateOptionsMenu(IMenu menu)
{
MenuInflater.Inflate(Resource.Menu.menu_main, menu);
return true;
}

/// <inheritdoc />
public override bool OnOptionsItemSelected(IMenuItem item)
{
int id = item.ItemId;
if (id == Resource.Id.action_settings)
{
return true;
}

return base.OnOptionsItemSelected(item);
}

/// <inheritdoc />
protected override void OnCreate(Bundle savedInstanceState)
{
base.OnCreate(savedInstanceState);
{
base.OnCreate(savedInstanceState);

SetContentView(Resource.Layout.activity_main);
SetContentView(Resource.Layout.activity_main);

var toolbar = FindViewById<Toolbar>(Resource.Id.toolbar);
Toolbar toolbar = FindViewById<Toolbar>(Resource.Id.toolbar);
SetActionBar(toolbar);

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

this
.ViewModel
ViewModel
.Login
.SelectMany(
result =>
{
if(!result.HasValue)
if (!result.HasValue)
{
return Observable.Empty<Unit>();
}

if(result.Value)
if (result.Value)
{
new AlertDialog.Builder(this)
.SetTitle("Login Successful")
@@ -87,23 +121,5 @@ protected override void OnCreate(Bundle savedInstanceState)
.DisposeWith(disposables);
});
}

public override bool OnCreateOptionsMenu(IMenu menu)
{
MenuInflater.Inflate(Resource.Menu.menu_main, menu);
return true;
}

public override bool OnOptionsItemSelected(IMenuItem item)
{
int id = item.ItemId;
if (id == Resource.Id.action_settings)
{
return true;
}

return base.OnOptionsItemSelected(item);
}
}
}
}

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<uses-sdk android:minSdkVersion="23" />
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="27" />
<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>
</manifest>
@@ -3,7 +3,7 @@
using System.Runtime.InteropServices;
using Android.App;

// General Information about an assembly is controlled through the following
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("IntegrationTests.Android")]
@@ -19,11 +19,11 @@
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
@@ -3,23 +3,25 @@

namespace IntegrationTests.Mac
{
/// <summary>
/// The main application delegate.
/// </summary>
[Register("AppDelegate")]
public class AppDelegate : NSApplicationDelegate
{
public AppDelegate()
{
}

/// <inheritdoc />
public override void DidFinishLaunching(NSNotification notification)
{
// Insert code here to initialize your application
}

/// <inheritdoc />
public override void WillTerminate(NSNotification notification)
{
// Insert code here to tear down your application
}

/// <inheritdoc />
[Export("applicationShouldTerminateAfterLastWindowClosed:")]
public override bool ApplicationShouldTerminateAfterLastWindowClosed(NSApplication sender)
{
Oops, something went wrong.

0 comments on commit 2775efe

Please sign in to comment.