From 7766d7f14bd17f3ae28750e1fe6ff2763caba9e1 Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Thu, 19 Dec 2019 18:34:16 +1100 Subject: [PATCH] fix: stop generating VisualTreeDiagnostic on Xamarin. It causes runtime issues (#92) --- .../Resolvers/PublicEventNamespaceResolver.cs | 3 +++ .../PublicStaticEventNamespaceResolver.cs | 16 +++++++++++++- ...ms.4.3.0.991250.monoandroid81.approved.txt | 22 +------------------ ...ms.4.3.0.991250.monoandroid90.approved.txt | 22 +------------------ ...s.4.3.0.991250.netstandard2.0.approved.txt | 20 ----------------- ...in.Forms.4.3.0.991250.tizen40.approved.txt | 22 +------------------ ...ms.4.3.0.991250.uap10.0.17763.approved.txt | 22 +------------------ ...rms.4.3.0.991250.xamarinios10.approved.txt | 22 +------------------ ...rms.4.3.0.991250.xamarinmac20.approved.txt | 22 +------------------ ...ms.4.4.0.991265.monoandroid81.approved.txt | 22 +------------------ ...ms.4.4.0.991265.monoandroid90.approved.txt | 22 +------------------ ...s.4.4.0.991265.netstandard2.0.approved.txt | 22 +------------------ ...in.Forms.4.4.0.991265.tizen40.approved.txt | 22 +------------------ ...ms.4.4.0.991265.uap10.0.17763.approved.txt | 22 +------------------ ...rms.4.4.0.991265.xamarinios10.approved.txt | 22 +------------------ ...rms.4.4.0.991265.xamarinmac20.approved.txt | 22 +------------------ 16 files changed, 31 insertions(+), 294 deletions(-) diff --git a/src/Pharmacist.Core/Generation/Resolvers/PublicEventNamespaceResolver.cs b/src/Pharmacist.Core/Generation/Resolvers/PublicEventNamespaceResolver.cs index e5457ea..9b87c35 100644 --- a/src/Pharmacist.Core/Generation/Resolvers/PublicEventNamespaceResolver.cs +++ b/src/Pharmacist.Core/Generation/Resolvers/PublicEventNamespaceResolver.cs @@ -29,6 +29,9 @@ internal class PublicEventNamespaceResolver : EventNamespaceResolverBase // Winforms "System.CodeDom", + + // Xamarin + "Xamarin.Forms.Xaml.Diagnostics" }, StringComparer.InvariantCulture); diff --git a/src/Pharmacist.Core/Generation/Resolvers/PublicStaticEventNamespaceResolver.cs b/src/Pharmacist.Core/Generation/Resolvers/PublicStaticEventNamespaceResolver.cs index 58c9399..e2da7bb 100644 --- a/src/Pharmacist.Core/Generation/Resolvers/PublicStaticEventNamespaceResolver.cs +++ b/src/Pharmacist.Core/Generation/Resolvers/PublicStaticEventNamespaceResolver.cs @@ -3,6 +3,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. +using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; @@ -16,6 +17,19 @@ namespace Pharmacist.Core.Generation.Resolvers { internal class PublicStaticEventNamespaceResolver : EventNamespaceResolverBase { + private static readonly ISet SkipNamespaceList = new HashSet( + new[] + { + "ReactiveUI.Events", + + // Winforms + "System.CodeDom", + + // Xamarin + "Xamarin.Forms.Xaml.Diagnostics" + }, + StringComparer.InvariantCulture); + protected override IEventGenerator GetEventGenerator() { return new StaticEventGenerator(); @@ -27,7 +41,7 @@ protected override IEventGenerator GetEventGenerator() var output = new ConcurrentBag<(ITypeDefinition typeHostingEvent, ITypeDefinition? baseTypeDefinition, IEnumerable events)>(); Parallel.ForEach( - GetPublicTypesWithEvents(compilation), + GetPublicTypesWithEvents(compilation).Where(x => !SkipNamespaceList.Contains(x.Namespace)), typeDefinition => { var validEvents = new HashSet(EventNameComparer.Default); diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.monoandroid81.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.monoandroid81.approved.txt index 320d517..7476dec 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.monoandroid81.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.monoandroid81.approved.txt @@ -4040,24 +4040,4 @@ namespace Xamarin.Forms , x => global::Xamarin.Forms.Forms.ViewInitialized += x, x => global::Xamarin.Forms.Forms.ViewInitialized -= x); } -} - -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } -} +} \ No newline at end of file diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.monoandroid90.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.monoandroid90.approved.txt index d6118f3..542640e 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.monoandroid90.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.monoandroid90.approved.txt @@ -4050,24 +4050,4 @@ namespace Xamarin.Forms , x => global::Xamarin.Forms.Forms.ViewInitialized += x, x => global::Xamarin.Forms.Forms.ViewInitialized -= x); } -} - -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } -} +} \ No newline at end of file diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.netstandard2.0.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.netstandard2.0.approved.txt index 554c16c..972e0a9 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.netstandard2.0.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.netstandard2.0.approved.txt @@ -2710,24 +2710,4 @@ namespace Xamarin.Forms.Internals , x => _data.CollectionChanged += x, x => _data.CollectionChanged -= x); } -} - -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } } \ No newline at end of file diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.tizen40.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.tizen40.approved.txt index f374936..0d8435d 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.tizen40.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.tizen40.approved.txt @@ -3756,24 +3756,4 @@ namespace Xamarin.Forms , x => global::Xamarin.Forms.Forms.ViewInitialized += x, x => global::Xamarin.Forms.Forms.ViewInitialized -= x); } -} - -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } -} +} \ No newline at end of file diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.uap10.0.17763.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.uap10.0.17763.approved.txt index 5274f87..b21ed89 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.uap10.0.17763.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.uap10.0.17763.approved.txt @@ -3060,24 +3060,4 @@ namespace Xamarin.Forms.Platform.WinRT , x => _data.ValueChanged += x, x => _data.ValueChanged -= x); } -} - -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } -} +} \ No newline at end of file diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.xamarinios10.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.xamarinios10.approved.txt index 6b7e181..424462e 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.xamarinios10.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.xamarinios10.approved.txt @@ -3765,24 +3765,4 @@ namespace Xamarin.Forms , x => global::Xamarin.Forms.Forms.ViewInitialized += x, x => global::Xamarin.Forms.Forms.ViewInitialized -= x); } -} - -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } -} +} \ No newline at end of file diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.xamarinmac20.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.xamarinmac20.approved.txt index 741f8c6..30bd335 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.xamarinmac20.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.3.0.991250.xamarinmac20.approved.txt @@ -3112,26 +3112,6 @@ namespace Xamarin.Forms } } -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } -} - namespace Xamarin.Forms.Platform.MacOS { /// @@ -3147,4 +3127,4 @@ namespace Xamarin.Forms.Platform.MacOS /// public override void SetupMainAppMenu(global::AppKit.NSMenu nativeMenu) => _setupMainAppMenu.OnNext(nativeMenu); } -} +} \ No newline at end of file diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.monoandroid81.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.monoandroid81.approved.txt index 2724d1e..46a6938 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.monoandroid81.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.monoandroid81.approved.txt @@ -4349,24 +4349,4 @@ namespace Xamarin.Forms , x => global::Xamarin.Forms.Forms.ViewInitialized += x, x => global::Xamarin.Forms.Forms.ViewInitialized -= x); } -} - -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } -} +} \ No newline at end of file diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.monoandroid90.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.monoandroid90.approved.txt index 8ec8717..11e1f66 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.monoandroid90.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.monoandroid90.approved.txt @@ -4359,24 +4359,4 @@ namespace Xamarin.Forms , x => global::Xamarin.Forms.Forms.ViewInitialized += x, x => global::Xamarin.Forms.Forms.ViewInitialized -= x); } -} - -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } -} +} \ No newline at end of file diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.netstandard2.0.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.netstandard2.0.approved.txt index 24d8580..363bc73 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.netstandard2.0.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.netstandard2.0.approved.txt @@ -2896,24 +2896,4 @@ namespace Xamarin.Forms.Internals , x => _data.CollectionChanged += x, x => _data.CollectionChanged -= x); } -} - -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } -} +} \ No newline at end of file diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.tizen40.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.tizen40.approved.txt index 93fb42b..3e3fb67 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.tizen40.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.tizen40.approved.txt @@ -3962,24 +3962,4 @@ namespace Xamarin.Forms , x => global::Xamarin.Forms.Forms.ViewInitialized += x, x => global::Xamarin.Forms.Forms.ViewInitialized -= x); } -} - -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } -} +} \ No newline at end of file diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.uap10.0.17763.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.uap10.0.17763.approved.txt index 8d9e813..91897fc 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.uap10.0.17763.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.uap10.0.17763.approved.txt @@ -3246,24 +3246,4 @@ namespace Xamarin.Forms.Platform.WinRT , x => _data.ValueChanged += x, x => _data.ValueChanged -= x); } -} - -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } -} +} \ No newline at end of file diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.xamarinios10.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.xamarinios10.approved.txt index 7ebc38f..dbd2146 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.xamarinios10.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.xamarinios10.approved.txt @@ -3984,24 +3984,4 @@ namespace Xamarin.Forms , x => global::Xamarin.Forms.Forms.ViewInitialized += x, x => global::Xamarin.Forms.Forms.ViewInitialized -= x); } -} - -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } -} +} \ No newline at end of file diff --git a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.xamarinmac20.approved.txt b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.xamarinmac20.approved.txt index eb00d17..28db8e3 100644 --- a/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.xamarinmac20.approved.txt +++ b/src/Pharmacist.Tests/IntegrationTests/Approved/Xamarin.Forms.4.4.0.991265.xamarinmac20.approved.txt @@ -3298,26 +3298,6 @@ namespace Xamarin.Forms } } -namespace Xamarin.Forms.Xaml.Diagnostics -{ - /// - /// A class that contains extension methods to wrap events contained within static classes within the namespace. - /// - public static class Events - { - /// - /// Gets an observable which signals when the event triggers. - /// - public static global::System.IObservable VisualDiagnosticsVisualTreeChanged => global::System.Reactive.Linq.Observable.FromEvent, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs>(eventHandler => - { - void Handler(object sender, global::Xamarin.Forms.Xaml.Diagnostics.VisualTreeChangeEventArgs e) => eventHandler(e); - return Handler; - } - - , x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged += x, x => global::Xamarin.Forms.Xaml.Diagnostics.VisualDiagnostics.VisualTreeChanged -= x); - } -} - namespace Xamarin.Forms.Platform.MacOS { /// @@ -3333,4 +3313,4 @@ namespace Xamarin.Forms.Platform.MacOS /// public override void SetupMainAppMenu(global::AppKit.NSMenu nativeMenu) => _setupMainAppMenu.OnNext(nativeMenu); } -} +} \ No newline at end of file