From 5e0c6f74c0305e1814ff829c5254984e45f13064 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Wed, 21 Oct 2020 18:56:11 +0200
Subject: [PATCH] (GH-78) Add target framework for .Net Core 3.1

---
 Test/UnitTests/BehaviorUtilities.cs                         | 4 ++--
 Test/UnitTests/ChangePropertyActionTests.cs                 | 4 ++--
 Test/UnitTests/UnitTests.csproj                             | 4 ++--
 .../Microsoft.Xaml.Behaviors.csproj                         | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Test/UnitTests/BehaviorUtilities.cs b/Test/UnitTests/BehaviorUtilities.cs
index 8043811..2bb00d8 100644
--- a/Test/UnitTests/BehaviorUtilities.cs
+++ b/Test/UnitTests/BehaviorUtilities.cs
@@ -183,7 +183,7 @@ public static DebugOutputListener Listen()
 
         private DebugOutputListener()
         {
-#if !NETCOREAPP3_0
+#if !NETCOREAPP
             this.storedListeners = new TraceListener[Debug.Listeners.Count];
             Debug.Listeners.CopyTo(this.storedListeners, 0);
             Debug.Listeners.Clear();
@@ -197,7 +197,7 @@ private DebugOutputListener()
 
         public void Dispose()
         {
-#if !NETCOREAPP3_0
+#if !NETCOREAPP
             Debug.Listeners.Clear();
             Debug.Listeners.AddRange(this.storedListeners);
 #endif
diff --git a/Test/UnitTests/ChangePropertyActionTests.cs b/Test/UnitTests/ChangePropertyActionTests.cs
index 8f0a894..aea2c0e 100644
--- a/Test/UnitTests/ChangePropertyActionTests.cs
+++ b/Test/UnitTests/ChangePropertyActionTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft. All rights reserved. 
+// Copyright (c) Microsoft. All rights reserved. 
 // Licensed under the MIT license. See LICENSE file in the project root for full license information. 
 namespace Microsoft.Xaml.Interactions.UnitTests
 {
@@ -228,7 +228,7 @@ public void Invoke_IncompatiblePropertyWithValueType_ThrowsArgumentException()
         }
 
         [TestMethod]
-#if NETCOREAPP3_0
+#if NETCOREAPP
         [ExpectedException(typeof(ArgumentException))]
 #else
         [ExpectedException(typeof(Exception))]
diff --git a/Test/UnitTests/UnitTests.csproj b/Test/UnitTests/UnitTests.csproj
index 9f78ac2..d47aa7b 100644
--- a/Test/UnitTests/UnitTests.csproj
+++ b/Test/UnitTests/UnitTests.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/2.0.43">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.43">
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <UseWPF>true</UseWPF>
     <OutputType>Library</OutputType>
diff --git a/src/Microsoft.Xaml.Behaviors/Microsoft.Xaml.Behaviors.csproj b/src/Microsoft.Xaml.Behaviors/Microsoft.Xaml.Behaviors.csproj
index 32207d4..8ef8a9a 100644
--- a/src/Microsoft.Xaml.Behaviors/Microsoft.Xaml.Behaviors.csproj
+++ b/src/Microsoft.Xaml.Behaviors/Microsoft.Xaml.Behaviors.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/2.0.43">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.43">
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeProjectToProjectAssets</TargetsForTfmSpecificBuildOutput>
     <OutputType>Library</OutputType>
     <PackageId>Microsoft.Xaml.Behaviors.Wpf</PackageId>
@@ -103,7 +103,7 @@
   <Target Name="IncludeProjectToProjectAssets">
     <ItemGroup>
       <BuildOutputInPackage Include="$(ProjectDir)bin\$(Configuration)\net45\Design\Microsoft.Xaml.Behaviors.DesignTools.dll"
-                            Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+                            Condition="'$(TargetFramework.StartsWith('netcoreapp'))">
         <TargetPath>Design</TargetPath>
       </BuildOutputInPackage>
       <BuildOutputInPackage Include="$(ProjectDir)bin\$(Configuration)\net45\Design\Microsoft.Xaml.Behaviors.Design.dll"