Merge branch 'master' into master

glennawatson · web-flow · commit 08a8c047ee93 · 2019-06-12T20:54:03.000+10:00
diff --git a/build.cake b/build.cake
@@ -57,10 +57,7 @@ var eventGenerators = new List<(string targetName, DirectoryPath destination)>
     ("android", MakeAbsolute(Directory("src/ReactiveUI.Events/"))),
     ("ios", MakeAbsolute(Directory("src/ReactiveUI.Events/"))),
     ("mac", MakeAbsolute(Directory("src/ReactiveUI.Events/"))),
-    ("tizen4", MakeAbsolute(Directory("src/ReactiveUI.Events/"))),
-    ("essentials", MakeAbsolute(Directory("src/ReactiveUI.Events.XamEssentials/"))),
     ("tvos", MakeAbsolute(Directory("src/ReactiveUI.Events/"))),
-    ("xamforms", MakeAbsolute(Directory("src/ReactiveUI.Events.XamForms/"))),
 };
 
 if (IsRunningOnWindows())
diff --git a/src/EventBuilder/EventBuilder.csproj b/src/EventBuilder/EventBuilder.csproj
@@ -25,7 +25,7 @@
     <PackageReference Include="Serilog.Settings.AppSettings" Version="2.2.2" />
     <PackageReference Include="serilog.sinks.coloredconsole" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
-    <PackageReference Include="Stubble.Core" Version="1.2.7" />
+    <PackageReference Include="Stubble.Core" Version="1.3.4" />
     <PackageReference Include="NuGet.Protocol" Version="4.9.3" />
     <PackageReference Include="NuGet.Packaging" Version="4.9.3" />
     <PackageReference Include="NuGet.PackageManagement.NetStandard" Version="4.9.2" />
diff --git a/src/ReactiveUI.AndroidSupport/ReactiveRecyclerViewAdapter.cs b/src/ReactiveUI.AndroidSupport/ReactiveRecyclerViewAdapter.cs
@@ -65,7 +65,7 @@ public override int GetItemViewType(int position)
         /// <param name="position">The position of the current view in the list.</param>
         /// <param name="viewModel">The ViewModel associated with the current View.</param>
         /// <returns>An ID to be used in OnCreateViewHolder.</returns>
-        public int GetItemViewType(int position, TViewModel viewModel)
+        public virtual int GetItemViewType(int position, TViewModel viewModel)
         {
             return base.GetItemViewType(position);
         }
diff --git a/src/ReactiveUI.Events.XamEssentials/ReactiveUI.Events.XamEssentials.csproj b/src/ReactiveUI.Events.XamEssentials/ReactiveUI.Events.XamEssentials.csproj
@@ -9,14 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="*.cs" />
-    <None Include="*.cs" />
-    <Compile Include="../ReactiveUI.Events/SingleAwaitSubject.cs" />
-    <PackageReference Include="System.Reactive" Version="4.1.5" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Xamarin.Essentials" Version="1.0.*" />
-    <Compile Include="Events_ESSENTIALS.cs" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.*" />
+    <PackageReference Include="Pharmacist.MsBuild" Version="1.*" />
   </ItemGroup>
 </Project>
diff --git a/src/ReactiveUI.Events.XamForms/ReactiveUI.Events.XamForms.csproj b/src/ReactiveUI.Events.XamForms/ReactiveUI.Events.XamForms.csproj
@@ -8,15 +8,8 @@
     <NoWarn>$(NoWarn);CS1570;CA1812</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="*.cs" />
-    <None Include="*.cs" />
-    <Compile Include="../ReactiveUI.Events/SingleAwaitSubject.cs" />
-    <PackageReference Include="System.Reactive" Version="4.1.5" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms" Version="3.6.*" />
-    <Compile Include="Events_XAMFORMS.cs" />
+    <PackageReference Include="Pharmacist.MsBuild" Version="1.*" />
   </ItemGroup>
 </Project>
diff --git a/src/ReactiveUI.Events/ReactiveUI.Events.csproj b/src/ReactiveUI.Events/ReactiveUI.Events.csproj
@@ -39,7 +39,8 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('tizen')) ">
-    <Compile Include="Events_TIZEN.cs" Condition="Exists('Events_TIZEN.cs')" />
+    <PackageReference Include="Tizen.NET.API4" Version="4.*" />
+    <PackageReference Include="Pharmacist.MsBuild" Version="1.*" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac')) ">

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public override int GetItemViewType(int position)`
`65`	`65`	`/// <param name="position">The position of the current view in the list.</param>`
`66`	`66`	`/// <param name="viewModel">The ViewModel associated with the current View.</param>`
`67`	`67`	`/// <returns>An ID to be used in OnCreateViewHolder.</returns>`
`68`		`- public int GetItemViewType(int position, TViewModel viewModel)`
	`68`	`+ public virtual int GetItemViewType(int position, TViewModel viewModel)`
`69`	`69`	`{`
`70`	`70`	`return base.GetItemViewType(position);`
`71`	`71`	`}`