Merge pull request #83 from dojo90/develop

Develop
djonasdev · Jun 27, 2022 · 800c749 · 800c749
2 parents 9211780 + a39c406
commit 800c749
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ NlogViewer
 
 NlogViewer is a ui control library to visualize NLog logs in your personal application. It is mainly based on [Sentinel][1] and its controls.
 
-supported Frameworks: `.NETCoreApp v3.0`, `.NETCoreApp v3.1`, `.NET Framework 4.6.1`
+supported Framework: `.NET6`
 
 ![NLogViewer][p2]
 

diff --git a/src/NLogViewer.TestApp/MainWindow.xaml.cs b/src/NLogViewer.TestApp/MainWindow.xaml.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Reactive.Linq;
 using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -37,7 +38,7 @@ public MainWindow()
             NLogViewer1.TimeStampResolver = new FooTimeStampResolver();
             Stopwatch stopwatch = Stopwatch.StartNew();
             Random random = new Random();
-            Observable.Interval(TimeSpan.FromMilliseconds(200)).ObserveOnDispatcher().Subscribe(l =>
+            Observable.Interval(TimeSpan.FromMilliseconds(200)).ObserveOn(SynchronizationContext.Current).Subscribe(l =>
             {
                 //if((_CntMessage == 10 || _CntError == 20) && TabControl1.Items.Count > 0)
                 //    TabControl1.Items.RemoveAt(0);

diff --git a/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj b/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
+    <TargetFramework>net6-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <StartupObject>TestApplication.App</StartupObject>
     <RootNamespace>TestApplication</RootNamespace>

diff --git a/src/NLogViewer/Helper/AutoSizedGridView.cs b/src/NLogViewer/Helper/AutoSizedGridView.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reactive.Linq;
+using System.Threading;
 using System.Windows.Controls;
 using NLog;
 
@@ -20,7 +21,7 @@ protected override void PrepareItem(ListViewItem item)
                 if (info.LoggerName.Length > _MaxLoggerNameLength)
                 {
                     _MaxLoggerNameLength = info.LoggerName.Length;
-                    Observable.Timer(TimeSpan.FromMilliseconds(1)).ObserveOnDispatcher().Subscribe(l =>
+                    Observable.Timer(TimeSpan.FromMilliseconds(1)).ObserveOn(SynchronizationContext.Current).Subscribe(l =>
                     {
                         foreach (GridViewColumn column in Columns)
                         {

diff --git a/src/NLogViewer/NLogViewer.csproj b/src/NLogViewer/NLogViewer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
+    <TargetFramework>net6-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <RootNamespace>DJ</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

diff --git a/src/NLogViewer/NLogViewer.xaml.cs b/src/NLogViewer/NLogViewer.xaml.cs
@@ -4,6 +4,8 @@
 using System.Linq;
 using System.Reactive.Concurrency;
 using System.Reactive.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -511,7 +513,7 @@ private void _OnLoaded(object sender, RoutedEventArgs e)
             ListView.ScrollToEnd();
             var target = CacheTarget.GetInstance(targetName: TargetName);
 
-            _Subscription = target.Cache.SubscribeOn(Scheduler.Default).Buffer(TimeSpan.FromMilliseconds(100)).Where (x => x.Any()).ObserveOnDispatcher(DispatcherPriority.Background).Subscribe(infos =>
+            _Subscription = target.Cache.SubscribeOn(Scheduler.Default).Buffer(TimeSpan.FromMilliseconds(100)).Where (x => x.Any()).ObserveOn(new DispatcherSynchronizationContext(_ParentWindow.Dispatcher)).Subscribe(infos =>
             {
                 if (Pause) return;
                 using (LogEvents.DeferRefresh())