From 1b4c47933946abc4ef813a0ff6280950edee55ef Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Wed, 26 Jan 2022 19:22:26 +0600 Subject: [PATCH] .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 --- BUILDING.md | 2 +- build/evaluator-netcore.yml | 2 +- build/nightly-netcore.yml | 2 +- build/pr-factordocs.yml | 2 +- build/pr-netcore.yml | 2 +- build/release.yml | 8 +++---- docs/_build/makeApiDocs.ps1 | 2 +- .../ClickThroughModel.csproj | 6 ++--- .../ClinicalTrial/ClinicalTrial.csproj | 22 +++++++++++++++++-- .../ClinicalTrial/ClinicalTrialModel.cs | 1 - .../Crowdsourcing/Crowdsourcing.csproj | 4 ++-- .../CrowdsourcingWithWords.csproj | 4 ++-- .../ImageClassifier/Image_Classifier.csproj | 2 +- src/Examples/InferNET101/InferNET101.csproj | 4 ++-- src/Examples/LDA/LDA.csproj | 4 ++-- src/Examples/MontyHall/MontyHall.csproj | 2 +- src/Examples/MotifFinder/MotifFinder.csproj | 4 ++-- .../ReviewerCalibration.csproj | 4 ++-- .../RobustGaussianProcess.csproj | 16 +++++++++----- .../ClassifierModels/ClassifierModels.csproj | 6 ++--- .../RecommenderModels.csproj | 6 ++--- .../Runners/CommandLine/CommandLine.csproj | 4 ++-- .../Runners/Evaluator/Evaluator.csproj | 4 ++-- .../Tools.BuildFactorDoc.csproj | 2 +- .../PrepareSource/Tools.PrepareSource.csproj | 2 +- src/Tutorials/Tutorials.csproj | 4 ++-- .../Windows/Visualizers.Windows.csproj | 2 +- .../LearnersTests/LearnersTests.csproj | 4 ++-- test/Learners/TestApp/TestApp.csproj | 4 ++-- test/TestApp/TestApp.csproj | 4 ++-- test/TestFSharp/TestFSharp.fsproj | 4 ++-- test/TestPublic/TestPublic.csproj | 4 ++-- test/Tests/Tests.csproj | 4 ++-- test/netcoretest.sh | 2 +- 34 files changed, 86 insertions(+), 63 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index de174afc..2d5f3f6e 100644 --- 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/` or `bin/Release/` subdirectories +Depending on the build configuration and targeted framework, the assemblies will be located in the `bin/Debug/` or `bin/Release/` subdirectories of the test project. Runner executes tests in parallel by default. However, some test category must be run diff --git a/build/evaluator-netcore.yml b/build/evaluator-netcore.yml index 57297880..7990a74c 100644 --- 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 \ No newline at end of file diff --git a/build/nightly-netcore.yml b/build/nightly-netcore.yml index c2085ae2..0780ced0 100644 --- 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 diff --git a/build/pr-factordocs.yml b/build/pr-factordocs.yml index 1bd27018..38dd67d9 100644 --- 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... diff --git a/build/pr-netcore.yml b/build/pr-netcore.yml index eecafa78..b0cab4c6 100644 --- 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 diff --git a/build/release.yml b/build/release.yml index b410ed2e..2b51aef1 100644 --- 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. diff --git a/docs/_build/makeApiDocs.ps1 b/docs/_build/makeApiDocs.ps1 index 5cbe243b..574b58b0 100644 --- 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" diff --git a/src/Examples/ClickThroughModel/ClickThroughModel.csproj b/src/Examples/ClickThroughModel/ClickThroughModel.csproj index cf3808a5..3cb9ddc9 100644 --- a/src/Examples/ClickThroughModel/ClickThroughModel.csproj +++ b/src/Examples/ClickThroughModel/ClickThroughModel.csproj @@ -1,4 +1,4 @@ - + @@ -17,12 +17,12 @@ - netcoreapp3.1 + net5.0-windows - netcoreapp3.1;net461 + net5.0-windows;net461 diff --git a/src/Examples/ClinicalTrial/ClinicalTrial.csproj b/src/Examples/ClinicalTrial/ClinicalTrial.csproj index bd24c070..56ff4275 100644 --- a/src/Examples/ClinicalTrial/ClinicalTrial.csproj +++ b/src/Examples/ClinicalTrial/ClinicalTrial.csproj @@ -1,15 +1,33 @@ - + - net461 Debug;DebugFull;DebugCore;Release;ReleaseFull;ReleaseCore false prompt WinExe + true true + + + + net461 + + + + + net5.0-windows + + + + + net5.0-windows;net461 + + + + full true diff --git a/src/Examples/ClinicalTrial/ClinicalTrialModel.cs b/src/Examples/ClinicalTrial/ClinicalTrialModel.cs index d5bbc44a..42da8c5b 100644 --- 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; diff --git a/src/Examples/Crowdsourcing/Crowdsourcing.csproj b/src/Examples/Crowdsourcing/Crowdsourcing.csproj index 9c544010..1dc26326 100644 --- a/src/Examples/Crowdsourcing/Crowdsourcing.csproj +++ b/src/Examples/Crowdsourcing/Crowdsourcing.csproj @@ -17,12 +17,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 diff --git a/src/Examples/CrowdsourcingWithWords/CrowdsourcingWithWords.csproj b/src/Examples/CrowdsourcingWithWords/CrowdsourcingWithWords.csproj index f662f55f..7cccd2a7 100644 --- a/src/Examples/CrowdsourcingWithWords/CrowdsourcingWithWords.csproj +++ b/src/Examples/CrowdsourcingWithWords/CrowdsourcingWithWords.csproj @@ -16,12 +16,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 diff --git a/src/Examples/ImageClassifier/Image_Classifier.csproj b/src/Examples/ImageClassifier/Image_Classifier.csproj index ebada90c..a148e04a 100644 --- a/src/Examples/ImageClassifier/Image_Classifier.csproj +++ b/src/Examples/ImageClassifier/Image_Classifier.csproj @@ -1,4 +1,4 @@ - + diff --git a/src/Examples/InferNET101/InferNET101.csproj b/src/Examples/InferNET101/InferNET101.csproj index 3f4ababc..1cc9fc3c 100644 --- a/src/Examples/InferNET101/InferNET101.csproj +++ b/src/Examples/InferNET101/InferNET101.csproj @@ -16,12 +16,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 diff --git a/src/Examples/LDA/LDA.csproj b/src/Examples/LDA/LDA.csproj index 4d346566..7d1a02f9 100644 --- a/src/Examples/LDA/LDA.csproj +++ b/src/Examples/LDA/LDA.csproj @@ -18,12 +18,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 diff --git a/src/Examples/MontyHall/MontyHall.csproj b/src/Examples/MontyHall/MontyHall.csproj index 81594229..5283797b 100644 --- a/src/Examples/MontyHall/MontyHall.csproj +++ b/src/Examples/MontyHall/MontyHall.csproj @@ -1,4 +1,4 @@ - + diff --git a/src/Examples/MotifFinder/MotifFinder.csproj b/src/Examples/MotifFinder/MotifFinder.csproj index 4153f05c..98d0dd41 100644 --- a/src/Examples/MotifFinder/MotifFinder.csproj +++ b/src/Examples/MotifFinder/MotifFinder.csproj @@ -18,12 +18,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 diff --git a/src/Examples/ReviewerCalibration/ReviewerCalibration.csproj b/src/Examples/ReviewerCalibration/ReviewerCalibration.csproj index 07b75e9d..17963558 100644 --- a/src/Examples/ReviewerCalibration/ReviewerCalibration.csproj +++ b/src/Examples/ReviewerCalibration/ReviewerCalibration.csproj @@ -17,12 +17,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 diff --git a/src/Examples/RobustGaussianProcess/RobustGaussianProcess.csproj b/src/Examples/RobustGaussianProcess/RobustGaussianProcess.csproj index d8d62022..d5d4fcd0 100644 --- a/src/Examples/RobustGaussianProcess/RobustGaussianProcess.csproj +++ b/src/Examples/RobustGaussianProcess/RobustGaussianProcess.csproj @@ -19,15 +19,21 @@ - - netcoreapp3.1 + + net5.0-windows + + + net5.0 - - netcoreapp3.1;net461 + + net5.0-windows;net461 - + + net5.0;net461 + + diff --git a/src/Learners/ClassifierModels/ClassifierModels.csproj b/src/Learners/ClassifierModels/ClassifierModels.csproj index b9313070..2213451d 100644 --- a/src/Learners/ClassifierModels/ClassifierModels.csproj +++ b/src/Learners/ClassifierModels/ClassifierModels.csproj @@ -19,19 +19,19 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 true - + true diff --git a/src/Learners/RecommenderModels/RecommenderModels.csproj b/src/Learners/RecommenderModels/RecommenderModels.csproj index eca865b1..4ae6098c 100644 --- a/src/Learners/RecommenderModels/RecommenderModels.csproj +++ b/src/Learners/RecommenderModels/RecommenderModels.csproj @@ -19,19 +19,19 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 true - + true diff --git a/src/Learners/Runners/CommandLine/CommandLine.csproj b/src/Learners/Runners/CommandLine/CommandLine.csproj index 3e96eb79..d22efe3d 100644 --- a/src/Learners/Runners/CommandLine/CommandLine.csproj +++ b/src/Learners/Runners/CommandLine/CommandLine.csproj @@ -18,12 +18,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 diff --git a/src/Learners/Runners/Evaluator/Evaluator.csproj b/src/Learners/Runners/Evaluator/Evaluator.csproj index e2979f5e..69bd0bc7 100644 --- a/src/Learners/Runners/Evaluator/Evaluator.csproj +++ b/src/Learners/Runners/Evaluator/Evaluator.csproj @@ -18,12 +18,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 diff --git a/src/Tools/BuildFactorDoc/Tools.BuildFactorDoc.csproj b/src/Tools/BuildFactorDoc/Tools.BuildFactorDoc.csproj index d22191fa..b823b063 100644 --- a/src/Tools/BuildFactorDoc/Tools.BuildFactorDoc.csproj +++ b/src/Tools/BuildFactorDoc/Tools.BuildFactorDoc.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp3.1 + net5.0 Microsoft.ML.Probabilistic.Tools.BuildFactorDoc Microsoft.ML.Probabilistic.Tools.BuildFactorDoc diff --git a/src/Tools/PrepareSource/Tools.PrepareSource.csproj b/src/Tools/PrepareSource/Tools.PrepareSource.csproj index f27ab55a..be851146 100644 --- a/src/Tools/PrepareSource/Tools.PrepareSource.csproj +++ b/src/Tools/PrepareSource/Tools.PrepareSource.csproj @@ -3,7 +3,7 @@ Exe - netcoreapp3.1 + net5.0 Microsoft.ML.Probabilistic.Tools.PrepareSource Microsoft.ML.Probabilistic.Tools.PrepareSource diff --git a/src/Tutorials/Tutorials.csproj b/src/Tutorials/Tutorials.csproj index 34a346a4..b822ef11 100644 --- a/src/Tutorials/Tutorials.csproj +++ b/src/Tutorials/Tutorials.csproj @@ -20,12 +20,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 false diff --git a/src/Visualizers/Windows/Visualizers.Windows.csproj b/src/Visualizers/Windows/Visualizers.Windows.csproj index 80f0e6a1..11ffb6ce 100644 --- a/src/Visualizers/Windows/Visualizers.Windows.csproj +++ b/src/Visualizers/Windows/Visualizers.Windows.csproj @@ -1,4 +1,4 @@ - + diff --git a/test/Learners/LearnersTests/LearnersTests.csproj b/test/Learners/LearnersTests/LearnersTests.csproj index 9a6869cf..f439bdd1 100644 --- a/test/Learners/LearnersTests/LearnersTests.csproj +++ b/test/Learners/LearnersTests/LearnersTests.csproj @@ -15,12 +15,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 diff --git a/test/Learners/TestApp/TestApp.csproj b/test/Learners/TestApp/TestApp.csproj index 11c46997..e01ea3c4 100644 --- a/test/Learners/TestApp/TestApp.csproj +++ b/test/Learners/TestApp/TestApp.csproj @@ -18,12 +18,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 diff --git a/test/TestApp/TestApp.csproj b/test/TestApp/TestApp.csproj index 4ce6a035..29c21bee 100644 --- a/test/TestApp/TestApp.csproj +++ b/test/TestApp/TestApp.csproj @@ -20,12 +20,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 diff --git a/test/TestFSharp/TestFSharp.fsproj b/test/TestFSharp/TestFSharp.fsproj index 0732d3b2..22a66907 100644 --- a/test/TestFSharp/TestFSharp.fsproj +++ b/test/TestFSharp/TestFSharp.fsproj @@ -19,12 +19,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net472 + net50;net472 diff --git a/test/TestPublic/TestPublic.csproj b/test/TestPublic/TestPublic.csproj index 167f4600..438d7e05 100644 --- a/test/TestPublic/TestPublic.csproj +++ b/test/TestPublic/TestPublic.csproj @@ -17,12 +17,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 diff --git a/test/Tests/Tests.csproj b/test/Tests/Tests.csproj index 50407337..0ef9a5a4 100644 --- a/test/Tests/Tests.csproj +++ b/test/Tests/Tests.csproj @@ -18,12 +18,12 @@ - netcoreapp3.1 + net5.0 - netcoreapp3.1;net461 + net5.0;net461 diff --git a/test/netcoretest.sh b/test/netcoretest.sh index a7ed752a..9f6365d2 100644 --- 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'