From 272c371bc537f3cd61290e3254606e1fea174048 Mon Sep 17 00:00:00 2001
From: Dominic Jonas <djonas@haprotec.de>
Date: Mon, 3 Feb 2020 09:55:58 +0100
Subject: [PATCH] added netcoreapp 3.1; added info to testapp for which
 framework you are testing

---
 src/NLogViewer.TestApp/MainWindow.xaml           | 3 +--
 src/NLogViewer.TestApp/MainWindow.xaml.cs        | 1 +
 src/NLogViewer.TestApp/NLogViewer.TestApp.csproj | 2 +-
 src/NLogViewer/NLogViewer.csproj                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/NLogViewer.TestApp/MainWindow.xaml b/src/NLogViewer.TestApp/MainWindow.xaml
index 4e9c31e..97763a4 100644
--- a/src/NLogViewer.TestApp/MainWindow.xaml
+++ b/src/NLogViewer.TestApp/MainWindow.xaml
@@ -4,8 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:dj="clr-namespace:DJ;assembly=NLogViewer"
-        mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800">
+        mc:Ignorable="d" Height="450" Width="800">
     <Grid>
         <dj:NLogViewer MaxCount="1000"/>
     </Grid>
diff --git a/src/NLogViewer.TestApp/MainWindow.xaml.cs b/src/NLogViewer.TestApp/MainWindow.xaml.cs
index dc19a80..a3eb4e0 100644
--- a/src/NLogViewer.TestApp/MainWindow.xaml.cs
+++ b/src/NLogViewer.TestApp/MainWindow.xaml.cs
@@ -13,6 +13,7 @@ public partial class MainWindow : Window
         private readonly Logger _Logger = LogManager.GetCurrentClassLogger();
         public MainWindow()
         {
+            Title = $"Testing v{AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName}";
             InitializeComponent();
             Random random = new Random();
             Observable.Interval(TimeSpan.FromMilliseconds(250)).ObserveOnDispatcher().Subscribe(l =>
diff --git a/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj b/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj
index f36cbb0..e35e1af 100644
--- a/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj
+++ b/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net461</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <StartupObject>TestApplication.App</StartupObject>
     <RootNamespace>TestApplication</RootNamespace>
diff --git a/src/NLogViewer/NLogViewer.csproj b/src/NLogViewer/NLogViewer.csproj
index 5b73814..31aa8e3 100644
--- a/src/NLogViewer/NLogViewer.csproj
+++ b/src/NLogViewer/NLogViewer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net461</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <RootNamespace>DJ</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>