Skip to content
Permalink
Browse files

housekeeping: fix the integration tests (#2175)

  • Loading branch information...
glennawatson committed Sep 21, 2019
1 parent 3956417 commit 66c2f08c8c42b384ee60aa4672d6d6b5bdd164c3
Showing with 23,244 additions and 300 deletions.
  1. +10 −6 integrationtests/Directory.Build.props
  2. +2 −2 integrationtests/IntegrationTests.Android/IntegrationTests.Android.csproj
  3. +13 −13 integrationtests/IntegrationTests.Android/MainActivity.cs
  4. +1 −1 integrationtests/IntegrationTests.Android/Properties/AndroidManifest.xml
  5. +0 −15 integrationtests/IntegrationTests.Android/Properties/AssemblyInfo.cs
  6. +8,397 −126 integrationtests/IntegrationTests.Android/Resources/Resource.Designer.cs
  7. +0 −13 integrationtests/IntegrationTests.Mac/Properties/AssemblyInfo.cs
  8. +1 −8 integrationtests/IntegrationTests.Shared.Tests/IntegrationTests.Shared.Tests.csproj
  9. +1 −1 integrationtests/IntegrationTests.UWP/IntegrationTests.UWP.csproj
  10. +0 −2 integrationtests/IntegrationTests.UWP/Properties/AssemblyInfo.cs
  11. +3 −3 integrationtests/IntegrationTests.WPF/IntegrationTests.WPF.csproj
  12. +9 −7 integrationtests/IntegrationTests.XamarinForms.Android/IntegrationTests.XamarinForms.Android.csproj
  13. +1 −1 integrationtests/IntegrationTests.XamarinForms.Android/Properties/AndroidManifest.xml
  14. +0 −13 integrationtests/IntegrationTests.XamarinForms.Android/Properties/AssemblyInfo.cs
  15. +14,802 −73 integrationtests/IntegrationTests.XamarinForms.Android/Resources/Resource.designer.cs
  16. +1 −0 integrationtests/IntegrationTests.XamarinForms.UWP/App.xaml.cs
  17. +1 −1 integrationtests/IntegrationTests.XamarinForms.UWP/IntegrationTests.XamarinForms.UWP.csproj
  18. +0 −13 integrationtests/IntegrationTests.XamarinForms.UWP/Properties/AssemblyInfo.cs
  19. +1 −1 integrationtests/IntegrationTests.XamarinForms.iOS/IntegrationTests.XamarinForms.iOS.csproj
  20. +1 −1 integrationtests/IntegrationTests.XamarinForms/IntegrationTests.XamarinForms.csproj
@@ -15,7 +15,12 @@
<Platform>AnyCPU</Platform>
<SourceLinkEnabled></SourceLinkEnabled>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
</PropertyGroup>

<PropertyGroup>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\src\analyzers.tests.ruleset</CodeAnalysisRuleSet>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" PackagePath="LICENSE" />
@@ -25,12 +30,11 @@
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="stylecop.analyzers" Version="1.1.1-beta.61" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" PrivateAssets="all" />
<PackageReference Include="Roslynator.Analyzers" Version="2.0.0" PrivateAssets="All" />
<PackageReference Include="stylecop.analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4" PrivateAssets="all" />
<PackageReference Include="Roslynator.Analyzers" Version="2.1.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
</ItemGroup>
<Import Project="..\src\directory.build.props" />
</Project>
</Project>
@@ -17,7 +17,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
@@ -99,7 +99,7 @@
<AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_round.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design" Version="27.*" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\IntegrationTests.Shared\IntegrationTests.Shared.csproj">
@@ -37,6 +37,19 @@ public class MainActivity : ReactiveActivity<LoginViewModel>
/// </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)
{
return item.ItemId == Resource.Id.action_settings || base.OnOptionsItemSelected(item);
}

/// <inheritdoc />
protected override void OnCreate(Bundle savedInstanceState)
{
@@ -90,18 +103,5 @@ protected override void OnCreate(Bundle savedInstanceState)
.DisposeWith(disposables);
});
}

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

/// <inheritdoc />
public override bool OnOptionsItemSelected(IMenuItem item)
{
return item.ItemId == Resource.Id.action_settings || 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" android:targetSdkVersion="27" />
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
<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>
@@ -1,7 +1,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Android.App;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -15,16 +13,3 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// 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")]
[assembly: AssemblyFileVersion("1.0.0.0")]

0 comments on commit 66c2f08

Please sign in to comment.
You can’t perform that action at this time.