feature: Swap the xam essentials to latest version. (reactiveui#2066)

Change processing over to using Pharmacist msbuild plugin
InitialForce · Jun 10, 2019 · ee5d742 · ee5d742
1 parent 5aa4264
commit ee5d742
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
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/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')) ">