Merge pull request #4658 from worldbeater/patch-1

Correct ReactiveUI.Events Package Id

.gitignore

@@ -117,6 +117,7 @@ ClientBin/
 *.[Pp]ublish.xml
 *.pfx
 *.publishsettings
+Events_Avalonia.cs
 
 # RIA/Silverlight projects
 Generated_Code/

nukebuild/Build.cs

@@ -241,7 +241,6 @@ partial class Build : NukeBuild
             RunCoreTest("Avalonia.Visuals.UnitTests");
             RunCoreTest("Avalonia.Skia.UnitTests");
             RunCoreTest("Avalonia.ReactiveUI.UnitTests");
-            RunCoreTest("Avalonia.ReactiveUI.Events.UnitTests");
         });
 
     Target RunRenderTests => _ => _

src/Avalonia.ReactiveUI.Events/Avalonia.ReactiveUI.Events.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>Avalonia.ReactiveUI</PackageId>
+    <PackageId>Avalonia.ReactiveUI.Events</PackageId>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />

tests/Avalonia.ReactiveUI.Events.UnitTests/Avalonia.ReactiveUI.Events.UnitTests.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-  <Import Project="..\..\build\UnitTests.NetCore.targets" />
-  <Import Project="..\..\build\Moq.props" />
-  <Import Project="..\..\build\XUnit.props" />
-  <Import Project="..\..\build\Rx.props" />
-  <Import Project="..\..\build\Microsoft.Reactive.Testing.props" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml.Loader\Avalonia.Markup.Xaml.Loader.csproj" />
-    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.ReactiveUI.Events\Avalonia.ReactiveUI.Events.csproj" />
-  </ItemGroup>
-</Project>

tests/Avalonia.ReactiveUI.Events.UnitTests/BasicControlEventsTest.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Reactive.Linq;
-using Avalonia.Controls;
-using Avalonia.UnitTests;
-using Xunit;
-
-namespace Avalonia.ReactiveUI.Events.UnitTests
-{
-    public class BasicControlEventsTest
-    {
-        public class EventsControl : UserControl
-        {
-            public bool IsAttached { get; private set; }
-
-            public EventsControl()
-            {
-                var attached = this
-                    .Events()
-                    .AttachedToVisualTree
-                    .Select(args => true);
-
-                this.Events()
-                    .DetachedFromVisualTree
-                    .Select(args => false)
-                    .Merge(attached)
-                    .Subscribe(marker => IsAttached = marker);
-            }
-        }
-
-        [Fact]
-        public void Should_Generate_Events_Wrappers()
-        {
-            var root = new TestRoot();
-            var control = new EventsControl();
-            Assert.False(control.IsAttached);
-
-            root.Child = control;
-            Assert.True(control.IsAttached);
-
-            root.Child = null;
-            Assert.False(control.IsAttached);
-        }
-    }
-}