housekeeping: fix the integration tests (reactiveui#2175)

InitialForce · Sep 21, 2019 · 66c2f08 · 66c2f08
1 parent 3956417
commit 66c2f08
Show file tree

Hide file tree

Showing 20 changed files with 23,244 additions and 300 deletions.
diff --git a/integrationtests/Directory.Build.props b/integrationtests/Directory.Build.props
@@ -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>
diff --git a/integrationtests/IntegrationTests.Android/IntegrationTests.Android.csproj b/integrationtests/IntegrationTests.Android/IntegrationTests.Android.csproj
@@ -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">

diff --git a/integrationtests/IntegrationTests.Android/MainActivity.cs b/integrationtests/IntegrationTests.Android/MainActivity.cs
@@ -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);
-        }
     }
 }
diff --git a/integrationtests/IntegrationTests.Android/Properties/AndroidManifest.xml b/integrationtests/IntegrationTests.Android/Properties/AndroidManifest.xml
@@ -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>
diff --git a/integrationtests/IntegrationTests.Android/Properties/AssemblyInfo.cs b/integrationtests/IntegrationTests.Android/Properties/AssemblyInfo.cs
@@ -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")]