Retarget tests against 5.0 and 3.1 as needed

diff --git a/global.json b/global.json
index 81c8b1b878e28b80ad5f0be31898d628ec7c81c1..8f03f3079595dc71cb6127fe3be0c4af760c083c 100644 (file)
--- a/global.json
+++ b/global.json
@@ -3,10 +3,10 @@
     "dotnet": "5.0.100-preview.6.20310.4",
     "runtimes": {
       "dotnet/x64": [
-        "3.1.5"
+        "$(MicrosoftNETCoreApp31Version)", "$(MicrosoftNETCoreAppVersion)"
       ],
       "dotnet/x86": [
-        "3.1.5"
+        "$(MicrosoftNETCoreApp31Version)", "$(MicrosoftNETCoreAppVersion)"
       ]
     }
   },

diff --git a/src/tests/EventPipeTracee/EventPipeTracee.csproj b/src/tests/EventPipeTracee/EventPipeTracee.csproj
index 10124c0f25092b5487461efc9c9c402d16e1062e..1b898c05dcc5a09872da5adb6866a45e3b555f92 100644 (file)
--- a/src/tests/EventPipeTracee/EventPipeTracee.csproj
+++ b/src/tests/EventPipeTracee/EventPipeTracee.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp3.1;</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp3.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj
index 7fe7909ec6ed83764b49883cd385698437348d8a..4d449f7131424cff617e1950b170a92f6a444d4a 100644 (file)
--- a/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj
+++ b/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/tests/Tracee/Tracee.csproj b/src/tests/Tracee/Tracee.csproj
index 849734286d0db04badcac89bc48cbf908cc6f3c3..cd0510ad228810dfb199b28cc9903aa8ab15f43d 100644 (file)
--- a/src/tests/Tracee/Tracee.csproj
+++ b/src/tests/Tracee/Tracee.csproj
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp3.1;</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp3.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 </Project>

diff --git a/src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj b/src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj
index 9c8a4fc97e3863c71f860cbafb66a6b8192e21c1..822d483b362444d88c32119d86041044cc6721a1 100644 (file)
--- a/src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj
+++ b/src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/tests/dotnet-monitor/DotnetMonitor.UnitTests.csproj b/src/tests/dotnet-monitor/DotnetMonitor.UnitTests.csproj
index 5e4d91a6e5888fb963faa86acf630ed7d6260e43..48de76a08e7bbbbfe3f15d9c2632fa56f3b7d7cc 100644 (file)
--- a/src/tests/dotnet-monitor/DotnetMonitor.UnitTests.csproj
+++ b/src/tests/dotnet-monitor/DotnetMonitor.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj b/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj
index 4ff7882a4992f699ffaf634985a09f9e3901b520..2cc2d8618b6d3a0a35129852d814313a062cefdb 100644 (file)
--- a/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj
+++ b/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/tests/eventpipe/EventPipe.UnitTests.csproj b/src/tests/eventpipe/EventPipe.UnitTests.csproj
index 45ce53bb0231e7e599220a1934c89bd66e834c2f..4f0e3ad63da3cf04db022c5c0587a9ff834406ff 100644 (file)
--- a/src/tests/eventpipe/EventPipe.UnitTests.csproj
+++ b/src/tests/eventpipe/EventPipe.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>