.NET 5 instead of .NET Core 3.1 (#273)

* Rename netcoreapp3.1 to net5.0 in all files * Remove references to Microsoft.NET.Sdk.WindowsDesktop * WinForms/WPF examples use net5.0-windows
2022-01-26 19:22:26 +06:00 · 2022-01-26 19:22:26 +06:00 · 1b4c479339
--- a/BUILDING.md
+++ b/BUILDING.md
@ -76,7 +76,7 @@ There are three test assemblies in the solution:
 - **TestPublic.dll** in the folder `test/TestPublic`.
 - **Microsoft.ML.Probabilistic.Learners.Tests.dll** in the folder `test/Learners/LearnersTests`. 

-Depending on the build configuration and targeted framework, the assemblies will be located in the `bin/Debug<Core|Full>/<netcoreapp3.1|net461>` or `bin/Release<Core|Full>/<netcoreapp3.1|net461>` subdirectories
+Depending on the build configuration and targeted framework, the assemblies will be located in the `bin/Debug<Core|Full>/<net5.0|net461>` or `bin/Release<Core|Full>/<net5.0|net461>` subdirectories
 of the test project.

 Runner executes tests in parallel by default. However, some test category must be run
--- a/build/evaluator-netcore.yml
+++ b/build/evaluator-netcore.yml
@ -14,6 +14,6 @@ steps:
  inputs:
    targetType: 'inline'
    script: dotnet Evaluator.dll InferNetRunsOnly.xml
-    workingDirectory: ${{ format('src/Learners/Runners/Evaluator/bin/{0}/netcoreapp3.1', parameters.Configuration) }}
+    workingDirectory: ${{ format('src/Learners/Runners/Evaluator/bin/{0}/net5.0', parameters.Configuration) }}
    displayName: Running Evaluator
    continueOnError: true
--- a/build/nightly-netcore.yml
+++ b/build/nightly-netcore.yml
@ -19,7 +19,7 @@ steps:
 - task: UseDotNet@2
  inputs:
    packageType: 'sdk' 
-    version: '3.x' 
+    version: '5.x'

 - script: |
    dotnet build /p:DisableImplicitNuGetFallbackFolder=true  --configuration $(BuildConfiguration)Core Infer.sln
--- a/build/pr-factordocs.yml
+++ b/build/pr-factordocs.yml
@ -14,7 +14,7 @@ steps:
 - task: UseDotNet@2
  inputs:
    packageType: 'sdk' 
-    version: '3.x' 
+    version: '5.x'

 - script: |
    echo Checking $(Build.Repository.LocalPath)\src\Runtime\Factors\FactorDocs.xml...
--- a/build/pr-netcore.yml
+++ b/build/pr-netcore.yml
@ -11,7 +11,7 @@ steps:
 - task: UseDotNet@2
  inputs:
    packageType: 'sdk' 
-    version: '3.x' 
+    version: '5.x'

 - script: |
    dotnet build /p:DisableImplicitNuGetFallbackFolder=true --configuration $(buildConfiguration)Core Infer.sln
--- a/build/release.yml
+++ b/build/release.yml
@ -22,7 +22,7 @@ jobs:
  - task: UseDotNet@2
    inputs:
      packageType: 'sdk' 
-      version: '3.x' 
+      version: '5.x'

  - script: |
      dotnet build --configuration $(BuildConfiguration)Core Infer.sln
@ -37,7 +37,7 @@ jobs:
  - task: UseDotNet@2
    inputs:
      packageType: 'sdk' 
-      version: '3.x' 
+      version: '5.x'

  - script: |
      dotnet build --configuration $(BuildConfiguration)Core Infer.sln
@ -150,10 +150,10 @@ jobs:
    condition: in(variables.SignType, 'real', 'test')

  - task: UseDotNet@2
-    displayName: Get dotnet 3.x
+    displayName: Get dotnet 5.x
    inputs:
      packageType: 'sdk'
-      version: '3.x'
+      version: '5.x'

  - task: DotNetCoreCLI@2
    displayName: Restore Infer.sln to enable packaging.
--- a/docs/_build/makeApiDocs.ps1
+++ b/docs/_build/makeApiDocs.ps1
@ -41,7 +41,7 @@ if (!(Test-Path $projPath)) {
 & "$dotnetExe" build "$projPath" /p:Configuration=Release

 Write-Host "Run PrepareSource for InferNet_Copy_Temp folder"
-$prepareSourcePath = [IO.Path]::GetFullPath((join-path $sourceDirectory 'src/Tools/PrepareSource/bin/Release/netcoreapp3.1/Microsoft.ML.Probabilistic.Tools.PrepareSource.dll'))
+$prepareSourcePath = [IO.Path]::GetFullPath((join-path $sourceDirectory 'src/Tools/PrepareSource/bin/Release/net5.0/Microsoft.ML.Probabilistic.Tools.PrepareSource.dll'))
 & "$dotnetExe" "$prepareSourcePath" "$destinationDirectory"

 Write-Host "Install nuget package docfx.console"
--- a/src/Examples/ClickThroughModel/ClickThroughModel.csproj
+++ b/src/Examples/ClickThroughModel/ClickThroughModel.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\common.props" />

  <PropertyGroup>
@ -17,12 +17,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0-windows</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0-windows;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/src/Examples/ClinicalTrial/ClinicalTrial.csproj
+++ b/src/Examples/ClinicalTrial/ClinicalTrial.csproj
@ -1,15 +1,33 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\common.props" />

  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
    <Configurations>Debug;DebugFull;DebugCore;Release;ReleaseFull;ReleaseCore</Configurations>
    <Prefer32Bit>false</Prefer32Bit>
    <ErrorReport>prompt</ErrorReport>
    <OutputType>WinExe</OutputType>
+    <UseWindowsForms>true</UseWindowsForms>
    <UseWpf>true</UseWpf>
  </PropertyGroup>

+  <Choose>
+    <When Condition="'$(Configuration)'=='DebugFull' OR '$(Configuration)'=='ReleaseFull'">
+      <PropertyGroup>
+        <TargetFramework>net461</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
+      <PropertyGroup>
+        <TargetFramework>net5.0-windows</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFrameworks>net5.0-windows;net461</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
    <DebugType>full</DebugType>
    <DebugSymbols>true</DebugSymbols>
--- a/src/Examples/ClinicalTrial/ClinicalTrialModel.cs
+++ b/src/Examples/ClinicalTrial/ClinicalTrialModel.cs
@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
-using System;
 using Microsoft.ML.Probabilistic.Models;
 using Microsoft.ML.Probabilistic.Distributions;

--- a/src/Examples/Crowdsourcing/Crowdsourcing.csproj
+++ b/src/Examples/Crowdsourcing/Crowdsourcing.csproj
@ -17,12 +17,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/src/Examples/CrowdsourcingWithWords/CrowdsourcingWithWords.csproj
+++ b/src/Examples/CrowdsourcingWithWords/CrowdsourcingWithWords.csproj
@ -16,12 +16,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/src/Examples/ImageClassifier/Image_Classifier.csproj
+++ b/src/Examples/ImageClassifier/Image_Classifier.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\common.props" />

  <PropertyGroup>
--- a/src/Examples/InferNET101/InferNET101.csproj
+++ b/src/Examples/InferNET101/InferNET101.csproj
@ -16,12 +16,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/src/Examples/LDA/LDA.csproj
+++ b/src/Examples/LDA/LDA.csproj
@ -18,12 +18,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/src/Examples/MontyHall/MontyHall.csproj
+++ b/src/Examples/MontyHall/MontyHall.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\common.props" />

  <PropertyGroup>
--- a/src/Examples/MotifFinder/MotifFinder.csproj
+++ b/src/Examples/MotifFinder/MotifFinder.csproj
@ -18,12 +18,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/src/Examples/ReviewerCalibration/ReviewerCalibration.csproj
+++ b/src/Examples/ReviewerCalibration/ReviewerCalibration.csproj
@ -17,12 +17,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/src/Examples/RobustGaussianProcess/RobustGaussianProcess.csproj
+++ b/src/Examples/RobustGaussianProcess/RobustGaussianProcess.csproj
@ -19,15 +19,21 @@
      </PropertyGroup>
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
-      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+      <PropertyGroup Condition="'$(IsWindows)'=='true'">
+			  <TargetFramework>net5.0-windows</TargetFramework>
+		  </PropertyGroup>
+		  <PropertyGroup Condition="'$(IsWindows)'!='true'">
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
-      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+    	<PropertyGroup Condition="'$(IsWindows)'=='true'">
+        <TargetFrameworks>net5.0-windows;net461</TargetFrameworks>
      </PropertyGroup>
-    </Otherwise>
+		  <PropertyGroup Condition="'$(IsWindows)'!='true'">
+			  <TargetFramework>net5.0;net461</TargetFramework>
+		  </PropertyGroup>
+	  </Otherwise>
  </Choose>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU' OR '$(Configuration)|$(Platform)'=='DebugFull|AnyCPU' OR '$(Configuration)|$(Platform)'=='DebugCore|AnyCPU'">
--- a/src/Learners/ClassifierModels/ClassifierModels.csproj
+++ b/src/Learners/ClassifierModels/ClassifierModels.csproj
@ -19,19 +19,19 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
        <!-- No need to generate code twice -->
        <IgnorePostBuildNetCore>true</IgnorePostBuildNetCore>
      </PropertyGroup>
    </Otherwise>
  </Choose>

-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
    <RunPostBuildNetCore Condition="$(IgnorePostBuildNetCore) != 'true'">true</RunPostBuildNetCore>
  </PropertyGroup>

--- a/src/Learners/RecommenderModels/RecommenderModels.csproj
+++ b/src/Learners/RecommenderModels/RecommenderModels.csproj
@ -19,19 +19,19 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
        <!-- No need to generate code twice -->
        <IgnorePostBuildNetCore>true</IgnorePostBuildNetCore>
      </PropertyGroup>
    </Otherwise>
  </Choose>

-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0'">
    <RunPostBuildNetCore Condition="$(IgnorePostBuildNetCore) != 'true'">true</RunPostBuildNetCore>
  </PropertyGroup>

--- a/src/Learners/Runners/CommandLine/CommandLine.csproj
+++ b/src/Learners/Runners/CommandLine/CommandLine.csproj
@ -18,12 +18,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/src/Learners/Runners/Evaluator/Evaluator.csproj
+++ b/src/Learners/Runners/Evaluator/Evaluator.csproj
@ -18,12 +18,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/src/Tools/BuildFactorDoc/Tools.BuildFactorDoc.csproj
+++ b/src/Tools/BuildFactorDoc/Tools.BuildFactorDoc.csproj
@ -3,7 +3,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
    <RootNamespace>Microsoft.ML.Probabilistic.Tools.BuildFactorDoc</RootNamespace>
    <AssemblyName>Microsoft.ML.Probabilistic.Tools.BuildFactorDoc</AssemblyName>
  </PropertyGroup>
--- a/src/Tools/PrepareSource/Tools.PrepareSource.csproj
+++ b/src/Tools/PrepareSource/Tools.PrepareSource.csproj
@ -3,7 +3,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
    <AssemblyName>Microsoft.ML.Probabilistic.Tools.PrepareSource</AssemblyName>
    <RootNamespace>Microsoft.ML.Probabilistic.Tools.PrepareSource</RootNamespace>
  </PropertyGroup>
--- a/src/Tutorials/Tutorials.csproj
+++ b/src/Tutorials/Tutorials.csproj
@ -20,12 +20,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
        <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
      </PropertyGroup>
    </Otherwise>
--- a/src/Visualizers/Windows/Visualizers.Windows.csproj
+++ b/src/Visualizers/Windows/Visualizers.Windows.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\nuget-properties.props" />

  <PropertyGroup>
--- a/test/Learners/LearnersTests/LearnersTests.csproj
+++ b/test/Learners/LearnersTests/LearnersTests.csproj
@ -15,12 +15,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/test/Learners/TestApp/TestApp.csproj
+++ b/test/Learners/TestApp/TestApp.csproj
@ -18,12 +18,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/test/TestApp/TestApp.csproj
+++ b/test/TestApp/TestApp.csproj
@ -20,12 +20,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/test/TestFSharp/TestFSharp.fsproj
+++ b/test/TestFSharp/TestFSharp.fsproj
@ -19,12 +19,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
+        <TargetFrameworks>net50;net472</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/test/TestPublic/TestPublic.csproj
+++ b/test/TestPublic/TestPublic.csproj
@ -17,12 +17,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/test/Tests/Tests.csproj
+++ b/test/Tests/Tests.csproj
@ -18,12 +18,12 @@
    </When>
    <When Condition="'$(Configuration)'=='DebugCore' OR '$(Configuration)'=='ReleaseCore'">
      <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
      </PropertyGroup>
    </When>
    <Otherwise>
      <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+        <TargetFrameworks>net5.0;net461</TargetFrameworks>
      </PropertyGroup>
    </Otherwise>
  </Choose>
--- a/test/netcoretest.sh
+++ b/test/netcoretest.sh
@ -15,7 +15,7 @@ then
    configuration=Release
 fi

-compath=/bin/${configuration}/netcoreapp3.1/
+compath=/bin/${configuration}/net5.0/

 # filter for parallel test run
 #parallel_filter='-notrait Platform=x86 -notrait Category=OpenBug -notrait Category=BadTest -notrait Category=CompilerOptionsTest -notrait Category=CsoftModel -notrait Category=ModifiesGlobals -notrait Category=DistributedTest -notrait Category=Performance'