Skip to content

Commit 004bde0

Browse files
glennawatsonglennawatson
committed
housekeeping: Update the integrated tests
1 parent 56cd266 commit 004bde0

Some content is hidden

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

53 files changed

+277
-489
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,4 +366,7 @@ src/Tools/
366366
**/*.Droid/**/[Rr]esource.[Dd]esigner.cs
367367
**/Android/**/[Rr]esource.[Dd]esigner.cs
368368
**/Droid/**/[Rr]esource.[Dd]esigner.cs
369-
**/[Rr]esources/[Rr]esource.[Dd]esigner.cs
369+
**/[Rr]esources/[Rr]esource.[Dd]esigner.cs
370+
371+
# MSBuild generator editor configs
372+
**/*.GeneratedMSBuildEditorConfig.editorconfig

‎integrationtests/Directory.Build.props‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<PackageProjectUrl>https://reactiveui.net</PackageProjectUrl>
55
<PackageIconUrl>https://i.imgur.com/7WDbqSy.png</PackageIconUrl>
66
<Authors>.NET Foundation and Contributors</Authors>
7-
<Owners>xanaisbettsx;ghuntley</Owners>
87
<Product>ReactiveUI Integration Tests ($(TargetFramework))</Product>
98
<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>
109
<PackageReleaseNotes>https://reactiveui.net/blog/</PackageReleaseNotes>
@@ -18,7 +17,7 @@
1817
</PropertyGroup>
1918

2019
<PropertyGroup>
21-
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\src\analyzers.tests.ruleset</CodeAnalysisRuleSet>
20+
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\src\analyzers.ruleset</CodeAnalysisRuleSet>
2221
<IsPackable>false</IsPackable>
2322
</PropertyGroup>
2423

@@ -30,11 +29,11 @@
3029
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
3130
</PropertyGroup>
3231
<ItemGroup>
33-
<PackageReference Include="stylecop.analyzers" Version="1.1.118" PrivateAssets="all" />
34-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2" PrivateAssets="all" />
32+
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.312" PrivateAssets="all" />
33+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.1" PrivateAssets="all" />
3534
<PackageReference Include="Roslynator.Analyzers" Version="3.0.0" PrivateAssets="All" />
3635
</ItemGroup>
3736
<ItemGroup>
38-
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
37+
<AdditionalFiles Include="$(MSBuildThisFileDirectory)..\src\stylecop.json" Link="stylecop.json" />
3938
</ItemGroup>
40-
</Project>
39+
</Project>

‎integrationtests/IntegrationTests.All.sln‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.28010.2016
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30804.86
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
@@ -25,7 +25,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.XamarinFor
2525
EndProject
2626
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.XamarinForms.UWP", "IntegrationTests.XamarinForms.UWP\IntegrationTests.XamarinForms.UWP.csproj", "{E9EBDB50-A696-4157-86FC-200E325CCE33}"
2727
EndProject
28-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.WinForms", "IntegrationTests.WinForms\IntegrationTests.WinForms.csproj", "{DF25062C-CD9E-4F64-B3A9-AF0DC656CB52}"
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.WinForms", "IntegrationTests.WinForms\IntegrationTests.WinForms.csproj", "{DF25062C-CD9E-4F64-B3A9-AF0DC656CB52}"
29+
EndProject
30+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5523AC0B-CCDB-491A-8E09-6B55EEA54A42}"
31+
ProjectSection(SolutionItems) = preProject
32+
Directory.Build.props = Directory.Build.props
33+
global.json = global.json
34+
README.md = README.md
35+
EndProjectSection
2936
EndProject
3037
Global
3138
GlobalSection(SolutionConfigurationPlatforms) = preSolution

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1818
<AndroidResgenClass>Resource</AndroidResgenClass>
1919
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
20-
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
2121
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
2222
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
2323
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>

‎integrationtests/IntegrationTests.Android/MainActivity.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
using System;
1+
// Copyright (c) 2020 .NET Foundation and Contributors. All rights reserved.
2+
// Licensed to the .NET Foundation under one or more agreements.
3+
// The .NET Foundation licenses this file to you under the MIT license.
4+
// See the LICENSE file in the project root for full license information.
5+
6+
using System;
27
using System.Reactive;
38
using System.Reactive.Disposables;
49
using System.Reactive.Linq;

‎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" android:targetSdkVersion="28" />
3+
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
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: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
using System.Reflection;
1+
// Copyright (c) 2020 .NET Foundation and Contributors. All rights reserved.
2+
// Licensed to the .NET Foundation under one or more agreements.
3+
// The .NET Foundation licenses this file to you under the MIT license.
4+
// See the LICENSE file in the project root for full license information.
5+
6+
using System.Reflection;
27
using System.Runtime.InteropServices;
38

49
// General Information about an assembly is controlled through the following
@@ -13,3 +18,4 @@
1318
[assembly: AssemblyTrademark("")]
1419
[assembly: AssemblyCulture("")]
1520
[assembly: ComVisible(false)]
21+
[assembly: AssemblyVersion("1.0.0.0")]

‎integrationtests/IntegrationTests.Mac/AppDelegate.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
using AppKit;
1+
// Copyright (c) 2020 .NET Foundation and Contributors. All rights reserved.
2+
// Licensed to the .NET Foundation under one or more agreements.
3+
// The .NET Foundation licenses this file to you under the MIT license.
4+
// See the LICENSE file in the project root for full license information.
5+
6+
using AppKit;
27
using Foundation;
38

49
namespace IntegrationTests.Mac

‎integrationtests/IntegrationTests.Mac/LoginViewController.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
using System;
1+
// Copyright (c) 2020 .NET Foundation and Contributors. All rights reserved.
2+
// Licensed to the .NET Foundation under one or more agreements.
3+
// The .NET Foundation licenses this file to you under the MIT license.
4+
// See the LICENSE file in the project root for full license information.
5+
6+
using System;
27
using System.Reactive;
38
using System.Reactive.Disposables;
49
using System.Reactive.Linq;

‎integrationtests/IntegrationTests.Mac/MainClass.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
using AppKit;
1+
// Copyright (c) 2020 .NET Foundation and Contributors. All rights reserved.
2+
// Licensed to the .NET Foundation under one or more agreements.
3+
// The .NET Foundation licenses this file to you under the MIT license.
4+
// See the LICENSE file in the project root for full license information.
5+
6+
using AppKit;
27

38
namespace IntegrationTests.Mac
49
{

0 commit comments

Comments
 (0)