housekeeping: updated integration tests and cleaned up references (#2851)

Integration test projects were referencing packages instead of the source, which has a meaningless build test. Updated to use source to give a meaningful build test.
This commit is contained in:
Chris Pulman 2021-08-04 03:29:37 +01:00 коммит произвёл GitHub
Родитель da6b269a8a
Коммит f933502ce7
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
38 изменённых файлов: 692 добавлений и 177 удалений

Просмотреть файл

@ -24,7 +24,7 @@
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.321" PrivateAssets="all" />
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="all" />
<PackageReference Include="Roslynator.Analyzers" Version="3.2.0" PrivateAssets="All" />
</ItemGroup>

Просмотреть файл

@ -34,6 +34,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.md = README.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI", "..\src\ReactiveUI\ReactiveUI.csproj", "{17CAF778-0FC0-46DE-9BF0-B36049715EAA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Testing", "..\src\ReactiveUI.Testing\ReactiveUI.Testing.csproj", "{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Winforms", "..\src\ReactiveUI.Winforms\ReactiveUI.Winforms.csproj", "{A7FF8004-2723-4035-BE4A-DBB4D268656A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Wpf", "..\src\ReactiveUI.Wpf\ReactiveUI.Wpf.csproj", "{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{34A7ABF0-30C6-48EA-94F0-8B116E995464}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.XamForms", "..\src\ReactiveUI.XamForms\ReactiveUI.XamForms.csproj", "{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.AndroidSupport", "..\src\ReactiveUI.AndroidSupport\ReactiveUI.AndroidSupport.csproj", "{E6284535-0B6E-42AA-9113-5230AB09E8E6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@ -686,10 +700,306 @@ Global
{DF25062C-CD9E-4F64-B3A9-AF0DC656CB52}.Release|x64.Build.0 = Release|Any CPU
{DF25062C-CD9E-4F64-B3A9-AF0DC656CB52}.Release|x86.ActiveCfg = Release|Any CPU
{DF25062C-CD9E-4F64-B3A9-AF0DC656CB52}.Release|x86.Build.0 = Release|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.AppStore|ARM.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.AppStore|iPhone.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.AppStore|x64.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.AppStore|x64.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.AppStore|x86.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.AppStore|x86.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Debug|ARM.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Debug|ARM.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Debug|iPhone.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Debug|x64.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Debug|x64.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Debug|x86.ActiveCfg = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Debug|x86.Build.0 = Debug|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Release|Any CPU.Build.0 = Release|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Release|ARM.ActiveCfg = Release|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Release|ARM.Build.0 = Release|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Release|iPhone.ActiveCfg = Release|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Release|iPhone.Build.0 = Release|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Release|x64.ActiveCfg = Release|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Release|x64.Build.0 = Release|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Release|x86.ActiveCfg = Release|Any CPU
{17CAF778-0FC0-46DE-9BF0-B36049715EAA}.Release|x86.Build.0 = Release|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.AppStore|ARM.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.AppStore|iPhone.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.AppStore|x64.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.AppStore|x64.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.AppStore|x86.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.AppStore|x86.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Debug|ARM.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Debug|ARM.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Debug|iPhone.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Debug|x64.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Debug|x64.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Debug|x86.ActiveCfg = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Debug|x86.Build.0 = Debug|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Release|Any CPU.Build.0 = Release|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Release|ARM.ActiveCfg = Release|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Release|ARM.Build.0 = Release|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Release|iPhone.ActiveCfg = Release|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Release|iPhone.Build.0 = Release|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Release|x64.ActiveCfg = Release|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Release|x64.Build.0 = Release|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Release|x86.ActiveCfg = Release|Any CPU
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B}.Release|x86.Build.0 = Release|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.AppStore|ARM.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.AppStore|iPhone.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.AppStore|x64.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.AppStore|x64.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.AppStore|x86.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.AppStore|x86.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Debug|ARM.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Debug|ARM.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Debug|iPhone.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Debug|x64.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Debug|x64.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Debug|x86.ActiveCfg = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Debug|x86.Build.0 = Debug|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Release|Any CPU.Build.0 = Release|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Release|ARM.ActiveCfg = Release|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Release|ARM.Build.0 = Release|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Release|iPhone.ActiveCfg = Release|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Release|iPhone.Build.0 = Release|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Release|x64.ActiveCfg = Release|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Release|x64.Build.0 = Release|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Release|x86.ActiveCfg = Release|Any CPU
{A7FF8004-2723-4035-BE4A-DBB4D268656A}.Release|x86.Build.0 = Release|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.AppStore|ARM.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.AppStore|iPhone.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.AppStore|x64.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.AppStore|x64.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.AppStore|x86.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.AppStore|x86.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Debug|ARM.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Debug|ARM.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Debug|iPhone.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Debug|x64.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Debug|x64.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Debug|x86.ActiveCfg = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Debug|x86.Build.0 = Debug|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Release|Any CPU.Build.0 = Release|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Release|ARM.ActiveCfg = Release|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Release|ARM.Build.0 = Release|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Release|iPhone.ActiveCfg = Release|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Release|iPhone.Build.0 = Release|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Release|x64.ActiveCfg = Release|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Release|x64.Build.0 = Release|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Release|x86.ActiveCfg = Release|Any CPU
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154}.Release|x86.Build.0 = Release|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.AppStore|ARM.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.AppStore|iPhone.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.AppStore|x64.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.AppStore|x64.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.AppStore|x86.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.AppStore|x86.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Debug|ARM.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Debug|ARM.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Debug|iPhone.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Debug|x64.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Debug|x64.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Debug|x86.ActiveCfg = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Debug|x86.Build.0 = Debug|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Release|Any CPU.Build.0 = Release|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Release|ARM.ActiveCfg = Release|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Release|ARM.Build.0 = Release|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Release|iPhone.ActiveCfg = Release|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Release|iPhone.Build.0 = Release|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Release|x64.ActiveCfg = Release|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Release|x64.Build.0 = Release|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Release|x86.ActiveCfg = Release|Any CPU
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6}.Release|x86.Build.0 = Release|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.AppStore|ARM.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.AppStore|iPhone.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.AppStore|x64.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.AppStore|x64.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.AppStore|x86.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.AppStore|x86.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Debug|ARM.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Debug|ARM.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Debug|iPhone.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Debug|x64.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Debug|x64.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Debug|x86.ActiveCfg = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Debug|x86.Build.0 = Debug|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|Any CPU.Build.0 = Release|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|ARM.ActiveCfg = Release|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|ARM.Build.0 = Release|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|iPhone.ActiveCfg = Release|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|iPhone.Build.0 = Release|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|x64.ActiveCfg = Release|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|x64.Build.0 = Release|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|x86.ActiveCfg = Release|Any CPU
{E6284535-0B6E-42AA-9113-5230AB09E8E6}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{17CAF778-0FC0-46DE-9BF0-B36049715EAA} = {34A7ABF0-30C6-48EA-94F0-8B116E995464}
{D8CB7D4A-1F0C-46F3-AF3F-48EFC598F75B} = {34A7ABF0-30C6-48EA-94F0-8B116E995464}
{A7FF8004-2723-4035-BE4A-DBB4D268656A} = {34A7ABF0-30C6-48EA-94F0-8B116E995464}
{FBAA0426-7519-4B97-98C1-4C0A4D9D4154} = {34A7ABF0-30C6-48EA-94F0-8B116E995464}
{B49BB0FA-A58E-43DD-BD4C-D84748CA18A6} = {34A7ABF0-30C6-48EA-94F0-8B116E995464}
{E6284535-0B6E-42AA-9113-5230AB09E8E6} = {34A7ABF0-30C6-48EA-94F0-8B116E995464}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {EDE6B0FD-3EF7-49C4-AF1D-E7485C1FEFAF}
EndGlobalSection

Просмотреть файл

@ -1,12 +1,14 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27604.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.31515.178
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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.Shared", "IntegrationTests.Shared\IntegrationTests.Shared.csproj", "{92988CE1-EA84-4A3A-8921-D3474CC0C87B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI", "..\src\ReactiveUI\ReactiveUI.csproj", "{F9808728-E148-438B-96EA-5F18C832CF4A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -23,6 +25,10 @@ Global
{92988CE1-EA84-4A3A-8921-D3474CC0C87B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92988CE1-EA84-4A3A-8921-D3474CC0C87B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{92988CE1-EA84-4A3A-8921-D3474CC0C87B}.Release|Any CPU.Build.0 = Release|Any CPU
{F9808728-E148-438B-96EA-5F18C832CF4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9808728-E148-438B-96EA-5F18C832CF4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9808728-E148-438B-96EA-5F18C832CF4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9808728-E148-438B-96EA-5F18C832CF4A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

Просмотреть файл

@ -102,17 +102,14 @@
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ReactiveUI\ReactiveUI.csproj">
<Project>{f9808728-e148-438b-96ea-5f18c832cf4a}</Project>
<Name>ReactiveUI</Name>
</ProjectReference>
<ProjectReference Include="..\IntegrationTests.Shared\IntegrationTests.Shared.csproj">
<Project>{92988ce1-ea84-4a3a-8921-d3474cc0c87b}</Project>
<Name>IntegrationTests.Shared</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

Просмотреть файл

@ -1,23 +1,48 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio Version 16
VisualStudioVersion = 16.0.31515.178
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.Mac", "IntegrationTests.Mac\IntegrationTests.Mac.csproj", "{84D75BEA-CDE7-4DF9-B51C-468F650BE924}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.Shared", "IntegrationTests.Shared\IntegrationTests.Shared.csproj", "{3A9F323C-EB97-4251-89AB-F705B1718FB7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.Shared", "IntegrationTests.Shared\IntegrationTests.Shared.csproj", "{3A9F323C-EB97-4251-89AB-F705B1718FB7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI", "..\src\ReactiveUI\ReactiveUI.csproj", "{800269D0-DF79-418E-844D-787421E8470A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{84D75BEA-CDE7-4DF9-B51C-468F650BE924}.Debug|Any CPU.ActiveCfg = Debug|x86
{84D75BEA-CDE7-4DF9-B51C-468F650BE924}.Debug|x86.ActiveCfg = Debug|x86
{84D75BEA-CDE7-4DF9-B51C-468F650BE924}.Debug|x86.Build.0 = Debug|x86
{84D75BEA-CDE7-4DF9-B51C-468F650BE924}.Release|Any CPU.ActiveCfg = Release|x86
{84D75BEA-CDE7-4DF9-B51C-468F650BE924}.Release|x86.ActiveCfg = Release|x86
{84D75BEA-CDE7-4DF9-B51C-468F650BE924}.Release|x86.Build.0 = Release|x86
{3A9F323C-EB97-4251-89AB-F705B1718FB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3A9F323C-EB97-4251-89AB-F705B1718FB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3A9F323C-EB97-4251-89AB-F705B1718FB7}.Debug|x86.ActiveCfg = Debug|Any CPU
{3A9F323C-EB97-4251-89AB-F705B1718FB7}.Debug|x86.Build.0 = Debug|Any CPU
{3A9F323C-EB97-4251-89AB-F705B1718FB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3A9F323C-EB97-4251-89AB-F705B1718FB7}.Release|Any CPU.Build.0 = Release|Any CPU
{3A9F323C-EB97-4251-89AB-F705B1718FB7}.Release|x86.ActiveCfg = Release|Any CPU
{3A9F323C-EB97-4251-89AB-F705B1718FB7}.Release|x86.Build.0 = Release|Any CPU
{800269D0-DF79-418E-844D-787421E8470A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{800269D0-DF79-418E-844D-787421E8470A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{800269D0-DF79-418E-844D-787421E8470A}.Debug|x86.ActiveCfg = Debug|Any CPU
{800269D0-DF79-418E-844D-787421E8470A}.Debug|x86.Build.0 = Debug|Any CPU
{800269D0-DF79-418E-844D-787421E8470A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{800269D0-DF79-418E-844D-787421E8470A}.Release|Any CPU.Build.0 = Release|Any CPU
{800269D0-DF79-418E-844D-787421E8470A}.Release|x86.ActiveCfg = Release|Any CPU
{800269D0-DF79-418E-844D-787421E8470A}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {00E23804-94ED-4B2F-9A7B-F7AE84FAAF52}
EndGlobalSection
EndGlobal

Просмотреть файл

@ -86,6 +86,10 @@
<InterfaceDefinition Include="Main.storyboard" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ReactiveUI\ReactiveUI.csproj">
<Project>{17caf778-0fc0-46de-9bf0-b36049715eaa}</Project>
<Name>ReactiveUI</Name>
</ProjectReference>
<ProjectReference Include="..\IntegrationTests.Shared\IntegrationTests.Shared.csproj">
<Project>{3A9F323C-EB97-4251-89AB-F705B1718FB7}</Project>
<Name>IntegrationTests.Shared</Name>

Просмотреть файл

@ -1,12 +1,14 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27604.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.31515.178
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.Shared.Tests", "IntegrationTests.Shared.Tests\IntegrationTests.Shared.Tests.csproj", "{6DF6F047-A892-43FA-8C51-F4BE5C7664A0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.Shared.Tests", "IntegrationTests.Shared.Tests\IntegrationTests.Shared.Tests.csproj", "{6DF6F047-A892-43FA-8C51-F4BE5C7664A0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.Shared", "IntegrationTests.Shared\IntegrationTests.Shared.csproj", "{47523D7F-60A4-4DDE-A645-68BD83096708}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI", "..\src\ReactiveUI\ReactiveUI.csproj", "{B250FC04-5CE5-4A0F-93EB-6064F164AB04}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -21,6 +23,10 @@ Global
{47523D7F-60A4-4DDE-A645-68BD83096708}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47523D7F-60A4-4DDE-A645-68BD83096708}.Release|Any CPU.ActiveCfg = Release|Any CPU
{47523D7F-60A4-4DDE-A645-68BD83096708}.Release|Any CPU.Build.0 = Release|Any CPU
{B250FC04-5CE5-4A0F-93EB-6064F164AB04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B250FC04-5CE5-4A0F-93EB-6064F164AB04}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B250FC04-5CE5-4A0F-93EB-6064F164AB04}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B250FC04-5CE5-4A0F-93EB-6064F164AB04}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0-windows</TargetFrameworks>
@ -20,23 +20,13 @@
</PackageReference>
<PackageReference Include="Xunit.StaFact" Version="1.0.37" />
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="ReactiveUI.Testing" Version="*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ReactiveUI.Testing\ReactiveUI.Testing.csproj" />
<ProjectReference Include="..\IntegrationTests.Shared\IntegrationTests.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="UIAutomationTypes" />
</ItemGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>

Просмотреть файл

@ -5,6 +5,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="genesis.ensure" Version="2.0.0" />
<PackageReference Include="ReactiveUI" Version="*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ReactiveUI\ReactiveUI.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,12 +1,14 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27604.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.31515.178
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.UWP", "IntegrationTests.UWP\IntegrationTests.UWP.csproj", "{01B889B1-5492-403B-BB2C-947FDE4130F7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.Shared", "IntegrationTests.Shared\IntegrationTests.Shared.csproj", "{B77110E5-D591-4163-9E77-74682345FDF8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI", "..\src\ReactiveUI\ReactiveUI.csproj", "{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -57,6 +59,22 @@ Global
{B77110E5-D591-4163-9E77-74682345FDF8}.Release|x64.Build.0 = Release|Any CPU
{B77110E5-D591-4163-9E77-74682345FDF8}.Release|x86.ActiveCfg = Release|Any CPU
{B77110E5-D591-4163-9E77-74682345FDF8}.Release|x86.Build.0 = Release|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Debug|ARM.ActiveCfg = Debug|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Debug|ARM.Build.0 = Debug|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Debug|x64.ActiveCfg = Debug|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Debug|x64.Build.0 = Debug|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Debug|x86.ActiveCfg = Debug|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Debug|x86.Build.0 = Debug|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Release|Any CPU.Build.0 = Release|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Release|ARM.ActiveCfg = Release|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Release|ARM.Build.0 = Release|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Release|x64.ActiveCfg = Release|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Release|x64.Build.0 = Release|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Release|x86.ActiveCfg = Release|Any CPU
{31B50B33-5E0D-4290-9A34-F4FDBEE0339B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

Просмотреть файл

@ -140,6 +140,10 @@
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ReactiveUI\ReactiveUI.csproj">
<Project>{31b50b33-5e0d-4290-9a34-f4fdbee0339b}</Project>
<Name>ReactiveUI</Name>
</ProjectReference>
<ProjectReference Include="..\IntegrationTests.Shared\IntegrationTests.Shared.csproj">
<Project>{B77110E5-D591-4163-9E77-74682345FDF8}</Project>
<Name>IntegrationTests.Shared</Name>

Просмотреть файл

@ -19,7 +19,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.0.0.0")]
// Version information for an assembly consists of the following four values:
//
// Major Version

Просмотреть файл

@ -1,12 +1,16 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27604.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.31515.178
MinimumVisualStudioVersion = 10.0.40219.1
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.Shared", "IntegrationTests.Shared\IntegrationTests.Shared.csproj", "{C6ED18F6-26D2-46B0-A086-F43BBF72FA78}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI", "..\src\ReactiveUI\ReactiveUI.csproj", "{456E20D3-1AC1-4A70-BC6A-550C2AE6E902}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Wpf", "..\src\ReactiveUI.Wpf\ReactiveUI.Wpf.csproj", "{7AA14D4F-DFC5-4BAE-B673-50632536C6B5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -21,6 +25,14 @@ Global
{C6ED18F6-26D2-46B0-A086-F43BBF72FA78}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C6ED18F6-26D2-46B0-A086-F43BBF72FA78}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C6ED18F6-26D2-46B0-A086-F43BBF72FA78}.Release|Any CPU.Build.0 = Release|Any CPU
{456E20D3-1AC1-4A70-BC6A-550C2AE6E902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{456E20D3-1AC1-4A70-BC6A-550C2AE6E902}.Debug|Any CPU.Build.0 = Debug|Any CPU
{456E20D3-1AC1-4A70-BC6A-550C2AE6E902}.Release|Any CPU.ActiveCfg = Release|Any CPU
{456E20D3-1AC1-4A70-BC6A-550C2AE6E902}.Release|Any CPU.Build.0 = Release|Any CPU
{7AA14D4F-DFC5-4BAE-B673-50632536C6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7AA14D4F-DFC5-4BAE-B673-50632536C6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7AA14D4F-DFC5-4BAE-B673-50632536C6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7AA14D4F-DFC5-4BAE-B673-50632536C6B5}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
<Description>WPF specific example of IntegrationTests</Description>
@ -8,30 +8,17 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MahApps.Metro" Version="2.*" />
<PackageReference Include="ReactiveUI.Events.WPF" Version="*" />
<PackageReference Include="ReactiveUI.WPF" Version="*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ReactiveUI.Wpf\ReactiveUI.Wpf.csproj" />
<ProjectReference Include="..\IntegrationTests.Shared\IntegrationTests.Shared.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27604.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.31515.178
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.Shared", "IntegrationTests.Shared\IntegrationTests.Shared.csproj", "{E22DE136-2503-4BBE-93BF-23FB352497EA}"
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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI", "..\src\ReactiveUI\ReactiveUI.csproj", "{5D9F51CF-3B82-43B6-B870-8919489F663E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Winforms", "..\src\ReactiveUI.Winforms\ReactiveUI.Winforms.csproj", "{9A5B87E8-7D35-4989-AF7F-31FE626E436E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -21,6 +25,14 @@ Global
{DF25062C-CD9E-4F64-B3A9-AF0DC656CB52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DF25062C-CD9E-4F64-B3A9-AF0DC656CB52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DF25062C-CD9E-4F64-B3A9-AF0DC656CB52}.Release|Any CPU.Build.0 = Release|Any CPU
{5D9F51CF-3B82-43B6-B870-8919489F663E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D9F51CF-3B82-43B6-B870-8919489F663E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D9F51CF-3B82-43B6-B870-8919489F663E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D9F51CF-3B82-43B6-B870-8919489F663E}.Release|Any CPU.Build.0 = Release|Any CPU
{9A5B87E8-7D35-4989-AF7F-31FE626E436E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9A5B87E8-7D35-4989-AF7F-31FE626E436E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9A5B87E8-7D35-4989-AF7F-31FE626E436E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9A5B87E8-7D35-4989-AF7F-31FE626E436E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
<Description>Winforms specific example of IntegrationTests</Description>
@ -6,21 +6,13 @@
<UseWindowsForms>true</UseWindowsForms>
<OutputType>WinExe</OutputType>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ReactiveUI.Events.Winforms" Version="*" />
<PackageReference Include="ReactiveUI.Winforms" Version="*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ReactiveUI.Winforms\ReactiveUI.Winforms.csproj" />
<ProjectReference Include="..\..\src\ReactiveUI\ReactiveUI.csproj" />
<ProjectReference Include="..\IntegrationTests.Shared\IntegrationTests.Shared.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

@ -51,20 +51,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.514" />
<PackageReference Include="ReactiveUI.AndroidSupport" Version="*" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.*" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.*" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.*" />
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.*" />
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.*" />
<PackageReference Include="Xamarin.Android.Support.v7.Preference" Version="28.0.*" />
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.0.*" />
<PackageReference Include="Xamarin.Android.Support.Compat" Version="28.0.*" />
<PackageReference Include="Xamarin.Android.Support.Collections" Version="28.0.*" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.*" />
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.2.4" />
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.1.1.8" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.7" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@ -102,6 +88,10 @@
<Folder Include="Resources\drawable\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ReactiveUI.AndroidSupport\ReactiveUI.AndroidSupport.csproj">
<Project>{e6284535-0b6e-42aa-9113-5230ab09e8e6}</Project>
<Name>ReactiveUI.AndroidSupport</Name>
</ProjectReference>
<ProjectReference Include="..\IntegrationTests.XamarinForms\IntegrationTests.XamarinForms.csproj">
<Project>{3bf35d8c-f119-4113-8f75-4ddbb2ba0caf}</Project>
<Name>IntegrationTests.XamarinForms</Name>

Просмотреть файл

@ -150,6 +150,10 @@
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ReactiveUI.XamForms\ReactiveUI.XamForms.csproj">
<Project>{b49bb0fa-a58e-43dd-bd4c-d84748ca18a6}</Project>
<Name>ReactiveUI.XamForms</Name>
</ProjectReference>
<ProjectReference Include="..\IntegrationTests.XamarinForms\IntegrationTests.XamarinForms.csproj">
<Project>{3bf35d8c-f119-4113-8f75-4ddbb2ba0caf}</Project>
<Name>IntegrationTests.XamarinForms</Name>
@ -159,4 +163,4 @@
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
</Project>
</Project>

Просмотреть файл

@ -1,15 +1,13 @@
<forms:WindowsPage
x:Class="IntegrationTests.XamarinForms.UWP.MainPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:forms="using:Xamarin.Forms.Platform.UWP"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:IntegrationTests.XamarinForms.UWP"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:forms="using:Xamarin.Forms.Platform.UWP"
xmlns:local="using:IntegrationTests.XamarinForms.UWP"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
mc:Ignorable="d">
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
</Grid>
</forms:WindowsPage>
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" />
</forms:WindowsPage>

Просмотреть файл

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27604.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.31515.178
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.Shared", "IntegrationTests.Shared\IntegrationTests.Shared.csproj", "{770BDFB8-961F-4306-AD23-103F9A8822DC}"
EndProject
@ -13,6 +13,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.XamarinFor
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.XamarinForms.UWP", "IntegrationTests.XamarinForms.UWP\IntegrationTests.XamarinForms.UWP.csproj", "{E9EBDB50-A696-4157-86FC-200E325CCE33}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI", "..\src\ReactiveUI\ReactiveUI.csproj", "{0E845982-9695-4CE4-A64B-95521E8C3B9D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.XamForms", "..\src\ReactiveUI.XamForms\ReactiveUI.XamForms.csproj", "{E5088FCA-D576-4C8D-B73D-232609846F8F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.AndroidSupport", "..\src\ReactiveUI.AndroidSupport\ReactiveUI.AndroidSupport.csproj", "{4FC38949-D2A9-4364-B08C-E6C9606E4D68}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@ -301,6 +307,150 @@ Global
{E9EBDB50-A696-4157-86FC-200E325CCE33}.Release|x86.ActiveCfg = Release|x86
{E9EBDB50-A696-4157-86FC-200E325CCE33}.Release|x86.Build.0 = Release|x86
{E9EBDB50-A696-4157-86FC-200E325CCE33}.Release|x86.Deploy.0 = Release|x86
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.AppStore|ARM.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.AppStore|iPhone.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.AppStore|x64.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.AppStore|x64.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.AppStore|x86.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.AppStore|x86.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Debug|ARM.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Debug|iPhone.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Debug|x64.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Debug|x64.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Debug|x86.ActiveCfg = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Debug|x86.Build.0 = Debug|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Release|Any CPU.Build.0 = Release|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Release|ARM.ActiveCfg = Release|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Release|ARM.Build.0 = Release|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Release|iPhone.ActiveCfg = Release|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Release|iPhone.Build.0 = Release|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Release|x64.ActiveCfg = Release|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Release|x64.Build.0 = Release|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Release|x86.ActiveCfg = Release|Any CPU
{0E845982-9695-4CE4-A64B-95521E8C3B9D}.Release|x86.Build.0 = Release|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.AppStore|ARM.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.AppStore|iPhone.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.AppStore|x64.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.AppStore|x64.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.AppStore|x86.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.AppStore|x86.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Debug|ARM.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Debug|ARM.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Debug|iPhone.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Debug|x64.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Debug|x64.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Debug|x86.ActiveCfg = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Debug|x86.Build.0 = Debug|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Release|Any CPU.Build.0 = Release|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Release|ARM.ActiveCfg = Release|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Release|ARM.Build.0 = Release|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Release|iPhone.ActiveCfg = Release|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Release|iPhone.Build.0 = Release|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Release|x64.ActiveCfg = Release|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Release|x64.Build.0 = Release|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Release|x86.ActiveCfg = Release|Any CPU
{E5088FCA-D576-4C8D-B73D-232609846F8F}.Release|x86.Build.0 = Release|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.AppStore|ARM.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.AppStore|iPhone.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.AppStore|x64.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.AppStore|x64.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.AppStore|x86.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.AppStore|x86.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Debug|ARM.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Debug|ARM.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Debug|iPhone.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Debug|x64.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Debug|x64.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Debug|x86.ActiveCfg = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Debug|x86.Build.0 = Debug|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Release|Any CPU.Build.0 = Release|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Release|ARM.ActiveCfg = Release|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Release|ARM.Build.0 = Release|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Release|iPhone.ActiveCfg = Release|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Release|iPhone.Build.0 = Release|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Release|x64.ActiveCfg = Release|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Release|x64.Build.0 = Release|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Release|x86.ActiveCfg = Release|Any CPU
{4FC38949-D2A9-4364-B08C-E6C9606E4D68}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
@ -6,11 +6,10 @@
<ItemGroup>
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.514" />
<PackageReference Include="ReactiveUI.XamForms" Version="*" />
<PackageReference Include="Xamarin.Forms" Version="5.0.*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ReactiveUI.XamForms\ReactiveUI.XamForms.csproj" />
<ProjectReference Include="..\IntegrationTests.Shared\IntegrationTests.Shared.csproj" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,11 +1,13 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27604.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.31515.178
MinimumVisualStudioVersion = 10.0.40219.1
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.Shared", "IntegrationTests.Shared\IntegrationTests.Shared.csproj", "{91A5C7A7-DB65-40BE-95DE-9757DD9A3ED0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.Shared", "IntegrationTests.Shared\IntegrationTests.Shared.csproj", "{91A5C7A7-DB65-40BE-95DE-9757DD9A3ED0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI", "..\src\ReactiveUI\ReactiveUI.csproj", "{09B2F9AC-0A25-4AEB-A654-477BFA3E8538}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -17,7 +19,8 @@ Global
Release|iPhoneSimulator = Release|iPhoneSimulator
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|Any CPU.ActiveCfg = Debug|iPhone
{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|iPhone.ActiveCfg = Debug|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhone.Build.0 = Debug|iPhone
{101E3060-8799-4119-8A7A-4F86A01C0C84}.Debug|iPhone.Deploy.0 = Debug|iPhone
@ -43,6 +46,18 @@ Global
{91A5C7A7-DB65-40BE-95DE-9757DD9A3ED0}.Release|iPhone.Build.0 = Release|Any CPU
{91A5C7A7-DB65-40BE-95DE-9757DD9A3ED0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{91A5C7A7-DB65-40BE-95DE-9757DD9A3ED0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{09B2F9AC-0A25-4AEB-A654-477BFA3E8538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{09B2F9AC-0A25-4AEB-A654-477BFA3E8538}.Debug|Any CPU.Build.0 = Debug|Any CPU
{09B2F9AC-0A25-4AEB-A654-477BFA3E8538}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{09B2F9AC-0A25-4AEB-A654-477BFA3E8538}.Debug|iPhone.Build.0 = Debug|Any CPU
{09B2F9AC-0A25-4AEB-A654-477BFA3E8538}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{09B2F9AC-0A25-4AEB-A654-477BFA3E8538}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{09B2F9AC-0A25-4AEB-A654-477BFA3E8538}.Release|Any CPU.ActiveCfg = Release|Any CPU
{09B2F9AC-0A25-4AEB-A654-477BFA3E8538}.Release|Any CPU.Build.0 = Release|Any CPU
{09B2F9AC-0A25-4AEB-A654-477BFA3E8538}.Release|iPhone.ActiveCfg = Release|Any CPU
{09B2F9AC-0A25-4AEB-A654-477BFA3E8538}.Release|iPhone.Build.0 = Release|Any CPU
{09B2F9AC-0A25-4AEB-A654-477BFA3E8538}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{09B2F9AC-0A25-4AEB-A654-477BFA3E8538}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

Просмотреть файл

@ -22,7 +22,7 @@ namespace ReactiveUI.Benchmarks
[MarkdownExporterAttribute.GitHub]
public class AutoPersistBenchmark
{
private ObservableCollection<MockViewModel> _collection;
private ObservableCollection<MockViewModel>? _collection;
/// <summary>
/// Setup the benchmark with all the needed objects. This is run once per set of benchmarks in this object.
@ -46,22 +46,23 @@ namespace ReactiveUI.Benchmarks
[Benchmark]
public void AutoPersistCollection()
{
var disposable = _collection.AutoPersistCollection(
x => Observable.Create<Unit>(
var disposable = _collection?.AutoPersistCollection(
_ => Observable.Create<Unit>(
_ =>
{
Console.WriteLine("Done stuff");
return Disposable.Empty;
}).Select(_ => Unit.Default), TimeSpan.FromMilliseconds(200));
}).Select(_ => Unit.Default),
TimeSpan.FromMilliseconds(200));
for (int i = 0; i < 5; ++i)
{
_collection.Add(new MockViewModel());
_collection?.Add(new MockViewModel());
}
_collection.Clear();
_collection?.Clear();
disposable.Dispose();
disposable?.Dispose();
}
}
}

Просмотреть файл

@ -21,10 +21,10 @@ namespace ReactiveUI.Benchmarks
[MarkdownExporterAttribute.GitHub]
public class INPCObservableForPropertyBenchmarks
{
private readonly Expression<Func<TestClassChanged, string>> _expr = x => x.Property1;
private readonly Expression<Func<TestClassChanged, string?>> _expr = x => x.Property1;
private readonly INPCObservableForProperty _instance = new INPCObservableForProperty();
private Expression _exp;
private string _propertyName;
private Expression? _exp;
private string? _propertyName;
/// <summary>
/// Setup the benchmarks. This will be run once per set of benchmarks.
@ -33,7 +33,7 @@ namespace ReactiveUI.Benchmarks
public void Setup()
{
_exp = Reflection.Rewrite(_expr.Body);
_propertyName = _exp.GetMemberInfo().Name;
_propertyName = _exp!.GetMemberInfo()?.Name;
}
/// <summary>
@ -44,20 +44,20 @@ namespace ReactiveUI.Benchmarks
{
var testClass = new TestClassChanged();
var changes = new List<IObservedChange<object, object>>();
var dispose = _instance.GetNotificationForProperty(testClass, _exp, _propertyName, false).Subscribe(c => changes.Add(c));
var changes = new List<IObservedChange<object?, object?>>();
var dispose = _instance.GetNotificationForProperty(testClass, _exp!, _propertyName!, false).Subscribe(c => changes.Add(c));
dispose.Dispose();
}
private class TestClassChanged : INotifyPropertyChanged
{
private string _property;
private string? _property;
private string _property2;
private string? _property2;
public event PropertyChangedEventHandler PropertyChanged;
public event PropertyChangedEventHandler? PropertyChanged;
public string Property1
public string? Property1
{
get => _property;
set
@ -67,7 +67,7 @@ namespace ReactiveUI.Benchmarks
}
}
public string Property2
public string? Property2
{
get => _property2;
set
@ -77,7 +77,7 @@ namespace ReactiveUI.Benchmarks
}
}
public void OnPropertyChanged([CallerMemberName] string propertyName = null)
public void OnPropertyChanged([CallerMemberName] string? propertyName = null)
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}

Просмотреть файл

@ -26,6 +26,6 @@ namespace ReactiveUI.Benchmarks
/// <summary>
/// Gets the url path. This is not being used in this version.
/// </summary>
public string UrlPathSegment { get; }
public string? UrlPathSegment { get; }
}
}

Просмотреть файл

@ -22,7 +22,7 @@ namespace ReactiveUI.Benchmarks
public class NavigationStackBenchmark
{
private static readonly Func<MockViewModel> _mockViewModel;
private RoutingState _router;
private RoutingState? _router;
/// <summary>
/// Initializes static members of the <see cref="NavigationStackBenchmark"/> class.
@ -47,7 +47,7 @@ namespace ReactiveUI.Benchmarks
[GlobalCleanup]
public void Cleanup()
{
_router.NavigationStack.Clear();
_router!.NavigationStack.Clear();
_router = null;
}
@ -57,7 +57,7 @@ namespace ReactiveUI.Benchmarks
[IterationSetup]
public void IterationSetup()
{
_router.NavigationStack.Clear();
_router!.NavigationStack.Clear();
}
/// <summary>
@ -66,7 +66,7 @@ namespace ReactiveUI.Benchmarks
[Benchmark]
public void Navigate()
{
using (_router.Navigate.Execute(_mockViewModel()).Subscribe())
using (_router!.Navigate.Execute(_mockViewModel()).Subscribe())
{
_router.NavigationStack.ToList();
}
@ -78,7 +78,7 @@ namespace ReactiveUI.Benchmarks
[Benchmark]
public void NavigateAndReset()
{
using (_router.NavigateAndReset.Execute(_mockViewModel()).Subscribe())
using (_router!.NavigateAndReset.Execute(_mockViewModel()).Subscribe())
{
_router.NavigationStack.ToList();
}
@ -90,7 +90,7 @@ namespace ReactiveUI.Benchmarks
[Benchmark]
public void NavigateBack()
{
using (_router.NavigateAndReset.Execute(_mockViewModel()).Subscribe())
using (_router!.NavigateAndReset.Execute(_mockViewModel()).Subscribe())
using (_router.Navigate.Execute(_mockViewModel()).Subscribe())
using (_router.NavigateBack.Execute().Subscribe())
{
@ -103,7 +103,7 @@ namespace ReactiveUI.Benchmarks
[Benchmark]
public void NavigationStack()
{
using (_router.NavigateAndReset.Execute(_mockViewModel()).Subscribe())
using (_router!.NavigateAndReset.Execute(_mockViewModel()).Subscribe())
{
_router.NavigationStack.ToList();
}

Просмотреть файл

@ -25,12 +25,12 @@ namespace ReactiveUI.Benchmarks
/// <summary>
/// Gets or sets from observable.
/// </summary>
public Subject<MockViewModel> FromObservable { get; set; }
public Subject<MockViewModel>? FromObservable { get; set; }
/// <summary>
/// Gets or sets from task.
/// </summary>
public Task FromTask { get; set; }
public Task? FromTask { get; set; }
/// <summary>
/// Setup for all benchmark instances being run.
@ -55,14 +55,14 @@ namespace ReactiveUI.Benchmarks
/// </summary>
/// <returns>The command.</returns>
[Benchmark]
public object CreateReactiveCommandFromObservable() => ReactiveCommand.CreateFromObservable(() => FromObservable.AsObservable());
public object CreateReactiveCommandFromObservable() => ReactiveCommand.CreateFromObservable(() => FromObservable!.AsObservable());
/// <summary>
/// Benchmark for creating a ReactiveCommand a task.
/// </summary>
/// <returns>The command.</returns>
[Benchmark]
public object CreateReactiveCommandFromTask() => ReactiveCommand.CreateFromTask(async () => await FromTask);
public object CreateReactiveCommandFromTask() => ReactiveCommand.CreateFromTask(async () => await FromTask!.ConfigureAwait(false));
/// <summary>
/// Benchmark for creating a ReactiveCommand with a can execute observable.
@ -76,14 +76,14 @@ namespace ReactiveUI.Benchmarks
/// </summary>
/// <returns>The command.</returns>
[Benchmark]
public object CreateFromObservableWithCanExecute() => ReactiveCommand.CreateFromObservable(() => FromObservable.AsObservable(), _canExecute);
public object CreateFromObservableWithCanExecute() => ReactiveCommand.CreateFromObservable(() => FromObservable!.AsObservable(), _canExecute);
/// <summary>
/// Benchmark for creating a ReactiveCommand from a task with a can execute observable.
/// </summary>
/// <returns>The command.</returns>
[Benchmark]
public object CreateFromTaskWithCanExecute() => ReactiveCommand.CreateFromTask(async () => await FromTask, _canExecute);
public object CreateFromTaskWithCanExecute() => ReactiveCommand.CreateFromTask(async () => await FromTask!.ConfigureAwait(false), _canExecute);
/// <summary>
/// Benchmark for creating a ReactiveCommand with a can execute observable.
@ -97,13 +97,13 @@ namespace ReactiveUI.Benchmarks
/// </summary>
/// <returns>The command.</returns>
[Benchmark]
public object CreateFromObservableWithCanExecuteAndScheduler() => ReactiveCommand.CreateFromObservable(() => FromObservable.AsObservable(), _canExecute, RxApp.MainThreadScheduler);
public object CreateFromObservableWithCanExecuteAndScheduler() => ReactiveCommand.CreateFromObservable(() => FromObservable!.AsObservable(), _canExecute, RxApp.MainThreadScheduler);
/// <summary>
/// Benchmark for creating a ReactiveCommand from a task with a can execute observable.
/// </summary>
/// <returns>The command.</returns>
[Benchmark]
public object CreateFromTaskWithCanExecuteAndScheduler() => ReactiveCommand.CreateFromTask(async () => await FromTask, _canExecute, RxApp.MainThreadScheduler);
public object CreateFromTaskWithCanExecuteAndScheduler() => ReactiveCommand.CreateFromTask(async () => await FromTask!.ConfigureAwait(false), _canExecute, RxApp.MainThreadScheduler);
}
}

Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<IsPackable>false</IsPackable>
@ -9,8 +9,14 @@
<DebugSymbols>true</DebugSymbols>
<OutputType>Exe</OutputType>
<NoWarn>;1591;1701;1702;1705;CA1822</NoWarn>
<PackageDescription>A MVVM framework that integrates with the Reactive Extensions for .NET to create elegant, testable User Interfaces that run on any mobile or desktop platform. This is the base package with the base platform implementations</PackageDescription>
</PropertyGroup>
<ItemGroup>
<Compile Remove="CreateReactiveListBenchmark.cs" />
<Compile Remove="ReactiveListOperationBenchmark.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DynamicData" Version="*" />
<PackageReference Include="BenchmarkDotNet" Version="*" />

Просмотреть файл

@ -21,8 +21,8 @@ namespace ReactiveUI.Benchmarks
[MarkdownExporterAttribute.GitHub]
public class RoutableViewModelMixinsBenchmarks
{
private Func<MockViewModel> _mockViewModel;
private RoutingState _router;
private Func<MockViewModel>? _mockViewModel;
private RoutingState? _router;
/// <summary>
/// Setup before all benchmarks are run.
@ -50,7 +50,7 @@ namespace ReactiveUI.Benchmarks
[IterationSetup]
public void IterationSetup()
{
_router.NavigationStack.Clear();
_router!.NavigationStack.Clear();
}
/// <summary>
@ -59,8 +59,8 @@ namespace ReactiveUI.Benchmarks
[Benchmark]
public void WhenNavigatedToObservable()
{
using (_mockViewModel().WhenNavigatedToObservable().Subscribe(x => Console.WriteLine("Observed")))
using (_router.Navigate.Execute(_mockViewModel()).Subscribe())
using (_mockViewModel!().WhenNavigatedToObservable().Subscribe(x => Console.WriteLine("Observed")))
using (_router!.Navigate.Execute(_mockViewModel()).Subscribe())
{
}
}
@ -71,11 +71,11 @@ namespace ReactiveUI.Benchmarks
[Benchmark]
public void WhenNavigatingFromObservable()
{
using (_router.Navigate.Execute(_mockViewModel()).Subscribe())
using (_mockViewModel().WhenNavigatingFromObservable().Subscribe())
using (_router.NavigateBack.Execute().Subscribe())
{
}
using (_router!.Navigate.Execute(_mockViewModel!()).Subscribe())
using (_mockViewModel().WhenNavigatingFromObservable().Subscribe())
using (_router.NavigateBack.Execute().Subscribe())
{
}
}
}
}

Просмотреть файл

@ -63,7 +63,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.333" PrivateAssets="all" />
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="all" />
<PackageReference Include="Roslynator.Analyzers" Version="3.2.0" PrivateAssets="All" />
</ItemGroup>

Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>net472;uap10.0.16299;net5.0-windows10.0.19041;netcoreapp3.1</TargetFrameworks>
@ -19,10 +19,6 @@
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
<Compile Include="Platforms\net4\**\*.cs" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="PresentationFramework.Aero" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
</ItemGroup>

Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net5.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid10.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net472;uap10.0.16299</TargetFrameworks>
@ -19,7 +19,6 @@
<ItemGroup>
<PackageReference Include="Fody" Version="6.5.2" PrivateAssets="None" />
<PackageReference Include="FodyPackaging" Version="6.5.2" PrivateAssets="All" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))">

Просмотреть файл

@ -1,6 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.15

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31515.178
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BD9762CF-E104-481C-96A6-26E624B86283}"
ProjectSection(SolutionItems) = preProject
@ -28,11 +29,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Fody.Helpers", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Fody.Tests", "ReactiveUI.Fody.Tests\ReactiveUI.Fody.Tests.csproj", "{404B0F3F-7343-4E54-A863-F27B99FE788B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Testing.Tests", "ReactiveUI.Testing.Tests\ReactiveUI.Testing.Tests.csproj", "{6591097A-342A-4EA0-AFF6-D2B3207F3E09}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Testing.Tests", "ReactiveUI.Testing.Tests\ReactiveUI.Testing.Tests.csproj", "{6591097A-342A-4EA0-AFF6-D2B3207F3E09}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.AndroidX", "ReactiveUI.AndroidX\ReactiveUI.AndroidX.csproj", "{294D8C67-0181-41B4-AB28-0114CE3D6390}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.AndroidX", "ReactiveUI.AndroidX\ReactiveUI.AndroidX.csproj", "{294D8C67-0181-41B4-AB28-0114CE3D6390}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Blazor", "ReactiveUI.Blazor\ReactiveUI.Blazor.csproj", "{8D4DDE4A-56E2-4FB2-802C-92C8992E5CB1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Blazor", "ReactiveUI.Blazor\ReactiveUI.Blazor.csproj", "{8D4DDE4A-56E2-4FB2-802C-92C8992E5CB1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{895D583E-9CC2-41D9-8EA1-BB6EC710C5FC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -646,6 +649,11 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{2ADE0A50-5012-4341-8F4F-97597C2D6920} = {895D583E-9CC2-41D9-8EA1-BB6EC710C5FC}
{404B0F3F-7343-4E54-A863-F27B99FE788B} = {895D583E-9CC2-41D9-8EA1-BB6EC710C5FC}
{6591097A-342A-4EA0-AFF6-D2B3207F3E09} = {895D583E-9CC2-41D9-8EA1-BB6EC710C5FC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9326B58C-0AD3-4527-B3F4-86B54673C62E}
EndGlobalSection

Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net5.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid10.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net472;uap10.0.16299;netcoreapp3.1</TargetFrameworks>

Просмотреть файл

@ -10,12 +10,10 @@
<ItemGroup>
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReactiveUI.Testing\ReactiveUI.Testing.csproj" />
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
<ProjectReference Include="..\ReactiveUI.Drawing\ReactiveUI.Drawing.csproj" />
</ItemGroup>

Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0-windows;net461;net472;net48;net5.0-windows10.0.19041</TargetFrameworks>
@ -16,13 +16,6 @@
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Reactive" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Compile Update="RoutedViewHost.Designer.cs">
<SubType>UserControl</SubType>

Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0-windows;net461;net472;net48;net5.0-windows10.0.19041</TargetFrameworks>
<PackageDescription>Contains the ReactiveUI platform specific extensions for Windows Presentation Foundation (WPF)</PackageDescription>
@ -14,14 +14,9 @@
<Compile Include="..\ReactiveUI\Platforms\windows-common\**\*.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Reactive" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
<Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Remove="..\ReactiveUI\Platforms\windows-common\BindingTypeConverters.cs" />

Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net5.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid10.0;tizen40</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461;net472;uap10.0.16299;netcoreapp3.1;net5.0-windows;net5.0-windows10.0.19041</TargetFrameworks>
@ -24,7 +24,6 @@
<None Include="Platforms\**\*.cs" />
<PackageReference Include="Splat" Version="11.*" />
<PackageReference Include="DynamicData" Version="7.*" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">