From 658e05f590dd9d7468ba163f1987e0f5406f936b Mon Sep 17 00:00:00 2001 From: Mads Dabros Date: Sun, 21 Jan 2024 18:43:34 +0100 Subject: [PATCH] Add .props and .targets to reduce duplication in project files (#149) --- .github/workflows/dotnet.yml | 10 ++-- SharpLearning.sln | 28 +++++++++-- all.ps1 | 4 -- build.cmd | 2 - clean.ps1 | 9 ---- restore.ps1 | 22 --------- src/Directory.Build.props | 49 ++++++++++++++++--- src/Directory.Build.targets | 3 ++ src/OutputBuildProject.props | 11 +++++ src/OutputBuildProps.props | 20 ++++++++ src/OutputBuildTargets.props | 2 + .../SharpLearning.AdaBoost.Test.csproj | 16 +----- .../SharpLearning.AdaBoost.csproj | 18 +------ .../SharpLearning.Common.Interfaces.csproj | 18 +------ .../SharpLearning.Containers.Test.csproj | 21 +------- .../SharpLearning.Containers.csproj | 20 +------- .../SharpLearning.CrossValidation.Test.csproj | 16 +----- .../SharpLearning.CrossValidation.csproj | 20 ++------ .../SharpLearning.DecisionTrees.Test.csproj | 16 +----- .../SharpLearning.DecisionTrees.csproj | 23 ++------- .../SharpLearning.Ensemble.Test.csproj | 16 +----- .../SharpLearning.Ensemble.csproj | 20 ++------ ...earning.FeatureTransformations.Test.csproj | 16 +----- ...harpLearning.FeatureTransformations.csproj | 20 ++------ .../SharpLearning.GradientBoost.Test.csproj | 16 +----- .../SharpLearning.GradientBoost.csproj | 20 ++------ .../SharpLearning.InputOutput.Test.csproj | 28 +++-------- .../SharpLearning.InputOutput.csproj | 16 +----- .../SharpLearning.Metrics.Test.csproj | 16 +----- .../SharpLearning.Metrics.csproj | 18 +------ .../SharpLearning.Neural.Test.csproj | 16 +----- .../SharpLearning.Neural.csproj | 14 +----- .../SharpLearning.Optimization.Test.csproj | 16 +----- .../SharpLearning.Optimization.csproj | 18 +------ .../SharpLearning.RandomForest.Test.csproj | 16 +----- .../SharpLearning.RandomForest.csproj | 18 +------ .../SharpLearning.XGBoost.Test.csproj | 18 ++----- .../SharpLearning.XGBoost.csproj | 20 ++------ src/SourceLink.GitHub.props | 12 +++++ test.ps1 | 7 --- 40 files changed, 171 insertions(+), 498 deletions(-) delete mode 100644 all.ps1 delete mode 100644 build.cmd delete mode 100644 clean.ps1 delete mode 100644 restore.ps1 create mode 100644 src/Directory.Build.targets create mode 100644 src/OutputBuildProject.props create mode 100644 src/OutputBuildProps.props create mode 100644 src/OutputBuildTargets.props create mode 100644 src/SourceLink.GitHub.props delete mode 100644 test.ps1 diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 08fc4413..3ebe4653 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -7,11 +7,11 @@ on: branches: [ "master" ] pull_request: branches: [ "master" ] - workflow_dispatch: - inputs: - version: - description: 'Release version to tag and create' - required: false + # workflow_dispatch: + # inputs: + # version: + # description: 'Release version to tag and create' + # required: false env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 diff --git a/SharpLearning.sln b/SharpLearning.sln index 7aaf6ae0..49eec32d 100644 --- a/SharpLearning.sln +++ b/SharpLearning.sln @@ -53,16 +53,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpLearning.Neural.Test", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpLearning.InputOutput", "src\SharpLearning.InputOutput\SharpLearning.InputOutput.csproj", "{D283D41E-AA14-44C5-AFB0-EBE6B34F3B7D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{55C8F585-6918-4373-A349-EDF167D77FBB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpLearning.XGBoost", "src\SharpLearning.XGBoost\SharpLearning.XGBoost.csproj", "{6637B36B-35E2-4FDB-8166-6472307D45BA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpLearning.XGBoost.Test", "src\SharpLearning.XGBoost.Test\SharpLearning.XGBoost.Test.csproj", "{FFD79827-ED40-47EB-9CB8-2E683DEA3606}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ci", "ci", "{45CBAF1D-3116-41E9-A374-231B544B3A9E}" + ProjectSection(SolutionItems) = preProject + .github\workflows\dotnet.yml = .github\workflows\dotnet.yml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{D83436F7-2EE6-4D59-ACC3-355C973BCDAF}" ProjectSection(SolutionItems) = preProject + .gitattributes = .gitattributes + .gitignore = .gitignore CONTRIBUTING.md = CONTRIBUTING.md - src\Directory.Build.props = src\Directory.Build.props + global.json = global.json + LICENSE = LICENSE README.md = README.md EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpLearning.XGBoost", "src\SharpLearning.XGBoost\SharpLearning.XGBoost.csproj", "{6637B36B-35E2-4FDB-8166-6472307D45BA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpLearning.XGBoost.Test", "src\SharpLearning.XGBoost.Test\SharpLearning.XGBoost.Test.csproj", "{FFD79827-ED40-47EB-9CB8-2E683DEA3606}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2204FA16-973A-48CF-A9FD-94FA72424BA4}" + ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + OutputBuildProject.props = OutputBuildProject.props + OutputBuildProps.props = OutputBuildProps.props + OutputBuildTargets.props = OutputBuildTargets.props + SourceLink.GitHub.props = SourceLink.GitHub.props + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/all.ps1 b/all.ps1 deleted file mode 100644 index a286d9eb..00000000 --- a/all.ps1 +++ /dev/null @@ -1,4 +0,0 @@ -.\restore.ps1 -.\build.cmd -.\test.ps1 -Write-Host "Check output for errors, since scripts do not stop if errors occur." -foregroundcolor "yellow" \ No newline at end of file diff --git a/build.cmd b/build.cmd deleted file mode 100644 index 549e53a4..00000000 --- a/build.cmd +++ /dev/null @@ -1,2 +0,0 @@ -dotnet build /p:Configuration=Debug /m /verbosity:minimal /nologo -dotnet build /p:Configuration=Release /m /verbosity:minimal /nologo \ No newline at end of file diff --git a/clean.ps1 b/clean.ps1 deleted file mode 100644 index ec014fc8..00000000 --- a/clean.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -$buildPath = "./Build" -$buildTestPath = "./BuildTest" -$testResultsPath = "./TestResults" -If (Test-Path $buildPath) -{ Remove-Item -Confirm -Recurse -Path $buildPath } -If (Test-Path $buildTestPath) -{ Remove-Item -Confirm -Recurse -Path $buildTestPath } -If (Test-Path $testResultsPath) -{ Remove-Item -Confirm -Recurse -Path $testResultsPath } \ No newline at end of file diff --git a/restore.ps1 b/restore.ps1 deleted file mode 100644 index daf48725..00000000 --- a/restore.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -$slnPath = "SharpLearning.sln" -$sourceNugetExe = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -# We download into packages so it is not checked-in since this is ignored in git -$packagesPath = ".\packages\" -$targetNugetExe = $packagesPath + "nuget.exe" -# Download if it does not exist -If (!(Test-Path $targetNugetExe)) -{ - If (!(Test-Path $packagesPath)) - { - mkdir $packagesPath - } - "Downloading nuget to: " + $targetNugetExe - Invoke-WebRequest $sourceNugetExe -OutFile $targetNugetExe -} - -# Install VSTS nuget bootstrapper https://github.com/Microsoft/vsts-nuget-bootstrapper -#iex ($targetNugetExe + " install -OutputDirectory " + $packagesPath + " Microsoft.VisualStudio.Services.NuGet.Bootstrap") -#iex ($packagesPath + "Microsoft.VisualStudio.Services.NuGet.Bootstrap.*\tools\Bootstrap.ps1") - -# Restore -iex ($targetNugetExe + " restore " + $slnPath) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index fd7f9a1f..4fdc86f6 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,13 +1,46 @@ - - 0.31.8.0 - 0.31.8.0 - 0.31.8.0 - en - Mads Dabros - Copyright © Mads Dabros 2014 - https://github.com/mdabros/SharpLearning/blob/master/LICENSE.md + + 0.31.0 + 0.31.9 + $(FileVersion) + $(InformationalVersion) + + false + + MIT https://github.com/mdabros/SharpLearning https://github.com/mdabros/SharpLearning + false + + en + mdabros + Copyright © mdabros 2024 + en + + netstandard2.0 + net8 + + 12.0 + true + portable + + true + true + + true + + + + CS1591 + + + + + + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets new file mode 100644 index 00000000..659687c5 --- /dev/null +++ b/src/Directory.Build.targets @@ -0,0 +1,3 @@ + + + diff --git a/src/OutputBuildProject.props b/src/OutputBuildProject.props new file mode 100644 index 00000000..111d1159 --- /dev/null +++ b/src/OutputBuildProject.props @@ -0,0 +1,11 @@ + + + $(BaseOutDir)_$(TargetFramework) + $(OutDirSpecified)_$(RuntimeIdentifier) + $(OutDirSpecified)\ + $(OutDir) + $(BasePublishDir)$(ProjectBuildDirectoryName) + $(PublishDir)_$(TargetFramework) + $(PublishDir)_$(RuntimeIdentifier) + + \ No newline at end of file diff --git a/src/OutputBuildProps.props b/src/OutputBuildProps.props new file mode 100644 index 00000000..a35f31c7 --- /dev/null +++ b/src/OutputBuildProps.props @@ -0,0 +1,20 @@ + + + AnyCPU + Debug + + + $(MSBuildThisFileDirectory)..\build\ + $(MSBuildProjectName)_$(Platform)_$(Configuration) + $(BuildDir)$(ProjectBuildDirectoryName) + $(OutputPathWithoutEndSlash) + $(MSBuildThisFileDirectory)..\publish\ + + + $(BuildDir)obj\$(MSBuildProjectName)\ + $(BuildDir)bin\$(MSBuildProjectName)\ + $(BaseOutDir) + + $(MSBuildThisFileDirectory)OutputBuildProject.props + + \ No newline at end of file diff --git a/src/OutputBuildTargets.props b/src/OutputBuildTargets.props new file mode 100644 index 00000000..f75adf7e --- /dev/null +++ b/src/OutputBuildTargets.props @@ -0,0 +1,2 @@ + + diff --git a/src/SharpLearning.AdaBoost.Test/SharpLearning.AdaBoost.Test.csproj b/src/SharpLearning.AdaBoost.Test/SharpLearning.AdaBoost.Test.csproj index ff4ded0c..df9b730b 100644 --- a/src/SharpLearning.AdaBoost.Test/SharpLearning.AdaBoost.Test.csproj +++ b/src/SharpLearning.AdaBoost.Test/SharpLearning.AdaBoost.Test.csproj @@ -1,21 +1,7 @@  - true - - - - net8 - - false - - - - ..\..\BuildTest\Release\ - - - - ..\..\BuildTest\Debug\ + $(TestTargetFramework) diff --git a/src/SharpLearning.AdaBoost/SharpLearning.AdaBoost.csproj b/src/SharpLearning.AdaBoost/SharpLearning.AdaBoost.csproj index 4c8d89bd..be58d2fd 100644 --- a/src/SharpLearning.AdaBoost/SharpLearning.AdaBoost.csproj +++ b/src/SharpLearning.AdaBoost/SharpLearning.AdaBoost.csproj @@ -1,24 +1,10 @@ - true - - - - netstandard2.0 - false + $(LibraryTargetFramework) SharpLearning.AdaBoost Provides learning algorithms and models for AdaBoost regression and classification. - adaboost machinelearning classification regression machine learning - - - - ..\..\Build\Release\netstandard2.0\SharpLearning.AdaBoost.xml - ..\..\Build\Release\ - - - - ..\..\Build\Debug\ + ada-boost machine-learning classification regression machine learning diff --git a/src/SharpLearning.Common.Interfaces/SharpLearning.Common.Interfaces.csproj b/src/SharpLearning.Common.Interfaces/SharpLearning.Common.Interfaces.csproj index 7d8c3491..bf9b4a20 100644 --- a/src/SharpLearning.Common.Interfaces/SharpLearning.Common.Interfaces.csproj +++ b/src/SharpLearning.Common.Interfaces/SharpLearning.Common.Interfaces.csproj @@ -1,25 +1,9 @@ - true - - - - netstandard2.0 - false + $(LibraryTargetFramework) SharpLearning.Common.Interfaces Provides common interfaces for SharpLearning. - Copyright © Mads Dabros 2014 - - - - ..\..\Build\Release\netstandard2.0\SharpLearning.Common.Interfaces.xml - ..\..\Build\Release\ - - - - ..\..\Build\Debug\ - diff --git a/src/SharpLearning.Containers.Test/SharpLearning.Containers.Test.csproj b/src/SharpLearning.Containers.Test/SharpLearning.Containers.Test.csproj index 0a1dc7da..700ebfee 100644 --- a/src/SharpLearning.Containers.Test/SharpLearning.Containers.Test.csproj +++ b/src/SharpLearning.Containers.Test/SharpLearning.Containers.Test.csproj @@ -1,22 +1,7 @@  - true - - - - net8 - - false - - - - ..\..\BuildTest\Release\ - true - - - - ..\..\BuildTest\Debug\ + $(TestTargetFramework) true @@ -30,8 +15,4 @@ - - - - diff --git a/src/SharpLearning.Containers/SharpLearning.Containers.csproj b/src/SharpLearning.Containers/SharpLearning.Containers.csproj index 8a588e7e..32cafeab 100644 --- a/src/SharpLearning.Containers/SharpLearning.Containers.csproj +++ b/src/SharpLearning.Containers/SharpLearning.Containers.csproj @@ -1,28 +1,10 @@ - true - - - - netstandard2.0 - false + $(LibraryTargetFramework) SharpLearning.Containers Provides containers and base extension methods for SharpLearning. - Copyright © Mads Dabros 2014 - - - - ..\..\Build\Release\netstandard2.0\SharpLearning.Containers.xml - ..\..\Build\Release\ - true - 1701;1702;1705 - - - - ..\..\Build\Debug\ true - 1701;1702;1705 diff --git a/src/SharpLearning.CrossValidation.Test/SharpLearning.CrossValidation.Test.csproj b/src/SharpLearning.CrossValidation.Test/SharpLearning.CrossValidation.Test.csproj index 9f55ab0c..67d1f53e 100644 --- a/src/SharpLearning.CrossValidation.Test/SharpLearning.CrossValidation.Test.csproj +++ b/src/SharpLearning.CrossValidation.Test/SharpLearning.CrossValidation.Test.csproj @@ -1,21 +1,7 @@  - true - - - - net8 - - false - - - - ..\..\BuildTest\Release\ - - - - ..\..\BuildTest\Debug\ + $(TestTargetFramework) diff --git a/src/SharpLearning.CrossValidation/SharpLearning.CrossValidation.csproj b/src/SharpLearning.CrossValidation/SharpLearning.CrossValidation.csproj index e02e6766..f6276eed 100644 --- a/src/SharpLearning.CrossValidation/SharpLearning.CrossValidation.csproj +++ b/src/SharpLearning.CrossValidation/SharpLearning.CrossValidation.csproj @@ -1,24 +1,10 @@ - + - true - - - - netstandard2.0 - false + $(LibraryTargetFramework) SharpLearning.CrossValidation Provides cross-validation, training/test set samplers and learning curves for SharpLearning. - crossvalidation cross validation sampling learningcurves machine learning - - - - ..\..\Build\Release\netstandard2.0\SharpLearning.CrossValidation.xml - ..\..\Build\Release\ - - - - ..\..\Build\Debug\ + cross-validation sampling learning-curves machine learning diff --git a/src/SharpLearning.DecisionTrees.Test/SharpLearning.DecisionTrees.Test.csproj b/src/SharpLearning.DecisionTrees.Test/SharpLearning.DecisionTrees.Test.csproj index 39f0f469..9bb1f105 100644 --- a/src/SharpLearning.DecisionTrees.Test/SharpLearning.DecisionTrees.Test.csproj +++ b/src/SharpLearning.DecisionTrees.Test/SharpLearning.DecisionTrees.Test.csproj @@ -1,21 +1,7 @@  - true - - - - net8 - - false - - - - ..\..\BuildTest\Release\ - - - - ..\..\BuildTest\Debug\ + $(TestTargetFramework) diff --git a/src/SharpLearning.DecisionTrees/SharpLearning.DecisionTrees.csproj b/src/SharpLearning.DecisionTrees/SharpLearning.DecisionTrees.csproj index 0e259117..54d64411 100644 --- a/src/SharpLearning.DecisionTrees/SharpLearning.DecisionTrees.csproj +++ b/src/SharpLearning.DecisionTrees/SharpLearning.DecisionTrees.csproj @@ -1,26 +1,11 @@ - + - true - - - - netstandard2.0 - false + $(LibraryTargetFramework) + true SharpLearning.DecisionTrees Provides learning algorithms and models for DecisionTree regression and classification. - decisiontrees machinelearning classification regression machine learning - - - - ..\..\Build\Release\netstandard2.0\SharpLearning.DecisionTrees.xml - ..\..\Build\Release\ - true - - - - ..\..\Build\Debug\ - true + decision-trees machine-learning classification regression diff --git a/src/SharpLearning.Ensemble.Test/SharpLearning.Ensemble.Test.csproj b/src/SharpLearning.Ensemble.Test/SharpLearning.Ensemble.Test.csproj index 81e5f05b..aab536a7 100644 --- a/src/SharpLearning.Ensemble.Test/SharpLearning.Ensemble.Test.csproj +++ b/src/SharpLearning.Ensemble.Test/SharpLearning.Ensemble.Test.csproj @@ -1,21 +1,7 @@  - true - - - - net8 - - false - - - - ..\..\BuildTest\Release\ - - - - ..\..\BuildTest\Debug\ + $(TestTargetFramework) diff --git a/src/SharpLearning.Ensemble/SharpLearning.Ensemble.csproj b/src/SharpLearning.Ensemble/SharpLearning.Ensemble.csproj index 7de1ade1..eee99815 100644 --- a/src/SharpLearning.Ensemble/SharpLearning.Ensemble.csproj +++ b/src/SharpLearning.Ensemble/SharpLearning.Ensemble.csproj @@ -1,24 +1,10 @@ - + - true - - - - netstandard2.0 - false + $(LibraryTargetFramework) SharpLearning.Ensemble Provides ensemble learning for regression and classification. - ensemblelearning machinelearning classification regression machine learning - - - - ..\..\Build\Release\netstandard2.0\SharpLearning.Ensemble.xml - ..\..\Build\Release\ - - - - ..\..\Build\Debug\ + ensemble learning classification regression machine-learning diff --git a/src/SharpLearning.FeatureTransformations.Test/SharpLearning.FeatureTransformations.Test.csproj b/src/SharpLearning.FeatureTransformations.Test/SharpLearning.FeatureTransformations.Test.csproj index 8488113d..de92eb9a 100644 --- a/src/SharpLearning.FeatureTransformations.Test/SharpLearning.FeatureTransformations.Test.csproj +++ b/src/SharpLearning.FeatureTransformations.Test/SharpLearning.FeatureTransformations.Test.csproj @@ -1,21 +1,7 @@  - true - - - - net8 - - false - - - - ..\..\BuildTest\Release\ - - - - ..\..\BuildTest\Debug\ + $(TestTargetFramework) diff --git a/src/SharpLearning.FeatureTransformations/SharpLearning.FeatureTransformations.csproj b/src/SharpLearning.FeatureTransformations/SharpLearning.FeatureTransformations.csproj index 4a1a9292..314a7c97 100644 --- a/src/SharpLearning.FeatureTransformations/SharpLearning.FeatureTransformations.csproj +++ b/src/SharpLearning.FeatureTransformations/SharpLearning.FeatureTransformations.csproj @@ -1,24 +1,10 @@ - + - true - - - - netstandard2.0 - false + $(LibraryTargetFramework) SharpLearning.FeatureTransformations Provides matrix and CsvRow transforms. - normalization minmax onehot missingvalues - - - - ..\..\Build\Release\netstandard2.0\SharpLearning.FeatureTransformations.xml - ..\..\Build\Release\ - - - - ..\..\Build\Debug\ + normalization min-max one-hot missing-values diff --git a/src/SharpLearning.GradientBoost.Test/SharpLearning.GradientBoost.Test.csproj b/src/SharpLearning.GradientBoost.Test/SharpLearning.GradientBoost.Test.csproj index 0e959d97..be743e20 100644 --- a/src/SharpLearning.GradientBoost.Test/SharpLearning.GradientBoost.Test.csproj +++ b/src/SharpLearning.GradientBoost.Test/SharpLearning.GradientBoost.Test.csproj @@ -1,21 +1,7 @@  - true - - - - net8 - - false - - - - ..\..\BuildTest\Release\ - - - - ..\..\BuildTest\Debug\ + $(TestTargetFramework) diff --git a/src/SharpLearning.GradientBoost/SharpLearning.GradientBoost.csproj b/src/SharpLearning.GradientBoost/SharpLearning.GradientBoost.csproj index 43804b5a..f1d69a71 100644 --- a/src/SharpLearning.GradientBoost/SharpLearning.GradientBoost.csproj +++ b/src/SharpLearning.GradientBoost/SharpLearning.GradientBoost.csproj @@ -1,24 +1,10 @@ - + - true - - - - netstandard2.0 - false + $(LibraryTargetFramework) SharpLearning.GradientBoost Provides learning algorithms and models for GradientBoost regression and classification. - gradientboost machinelearning classification regression machine learning - - - - ..\..\Build\Release\netstandard2.0\SharpLearning.GradientBoost.xml - ..\..\Build\Release\ - - - - ..\..\Build\Debug\ + gradient-boost classification regression machine-learning diff --git a/src/SharpLearning.InputOutput.Test/SharpLearning.InputOutput.Test.csproj b/src/SharpLearning.InputOutput.Test/SharpLearning.InputOutput.Test.csproj index d803c525..6e7e696e 100644 --- a/src/SharpLearning.InputOutput.Test/SharpLearning.InputOutput.Test.csproj +++ b/src/SharpLearning.InputOutput.Test/SharpLearning.InputOutput.Test.csproj @@ -1,27 +1,7 @@  - true - - - - - true - - - - net8 - - false - - - - ..\..\BuildTest\Release\ - - - - ..\..\BuildTest\Debug\ + $(TestTargetFramework) @@ -34,4 +14,10 @@ + + + true + + diff --git a/src/SharpLearning.InputOutput/SharpLearning.InputOutput.csproj b/src/SharpLearning.InputOutput/SharpLearning.InputOutput.csproj index fe6e1dbb..dd96a0c9 100644 --- a/src/SharpLearning.InputOutput/SharpLearning.InputOutput.csproj +++ b/src/SharpLearning.InputOutput/SharpLearning.InputOutput.csproj @@ -1,26 +1,12 @@  - true - - - - netstandard2.0 - false + $(LibraryTargetFramework) SharpLearning.InputOutput Provides CsvParser and serialization for SharpLearning. serialization csv parsing - - ..\..\Build\Release\netstandard2.0\SharpLearning.InputOutput.xml - ..\..\Build\Release\ - - - - ..\..\Build\Debug\ - - diff --git a/src/SharpLearning.Metrics.Test/SharpLearning.Metrics.Test.csproj b/src/SharpLearning.Metrics.Test/SharpLearning.Metrics.Test.csproj index 348eee26..944e3e43 100644 --- a/src/SharpLearning.Metrics.Test/SharpLearning.Metrics.Test.csproj +++ b/src/SharpLearning.Metrics.Test/SharpLearning.Metrics.Test.csproj @@ -1,21 +1,7 @@  - true - - - - net8 - - false - - - - ..\..\BuildTest\Release\ - - - - ..\..\BuildTest\Debug\ + $(TestTargetFramework) diff --git a/src/SharpLearning.Metrics/SharpLearning.Metrics.csproj b/src/SharpLearning.Metrics/SharpLearning.Metrics.csproj index eb5e025a..90ce8d87 100644 --- a/src/SharpLearning.Metrics/SharpLearning.Metrics.csproj +++ b/src/SharpLearning.Metrics/SharpLearning.Metrics.csproj @@ -1,24 +1,10 @@ - true - - - - netstandard2.0 - false + $(LibraryTargetFramework) SharpLearning.Metrics Provides classification, regression, impurity and ranking metrics. - metrics machinelearning classification regression machine learning - - - - ..\..\Build\Release\netstandard2.0\SharpLearning.Metrics.xml - ..\..\Build\Release\ - - - - ..\..\Build\Debug\ + metrics machine-learning classification regression diff --git a/src/SharpLearning.Neural.Test/SharpLearning.Neural.Test.csproj b/src/SharpLearning.Neural.Test/SharpLearning.Neural.Test.csproj index 467ff291..aaf5e92f 100644 --- a/src/SharpLearning.Neural.Test/SharpLearning.Neural.Test.csproj +++ b/src/SharpLearning.Neural.Test/SharpLearning.Neural.Test.csproj @@ -1,21 +1,7 @@  - true - - - - net8 - - false - - - - ..\..\BuildTest\Release\ - - - - ..\..\BuildTest\Debug\ + $(TestTargetFramework) diff --git a/src/SharpLearning.Neural/SharpLearning.Neural.csproj b/src/SharpLearning.Neural/SharpLearning.Neural.csproj index 185f068a..3e97e6e4 100644 --- a/src/SharpLearning.Neural/SharpLearning.Neural.csproj +++ b/src/SharpLearning.Neural/SharpLearning.Neural.csproj @@ -5,20 +5,10 @@ - netstandard2.0 - false + $(LibraryTargetFramework) SharpLearning.Neural Provides learning algorithms and models for neural net regression and classification. - neural network convolutional deep learning machinelearning classification regression machine - - - - ..\..\Build\Release\netstandard2.0\SharpLearning.Neural.xml - ..\..\Build\Release\ - - - - ..\..\Build\Debug\ + neural network convolutional deep learning machine-learning classification regression diff --git a/src/SharpLearning.Optimization.Test/SharpLearning.Optimization.Test.csproj b/src/SharpLearning.Optimization.Test/SharpLearning.Optimization.Test.csproj index 7a65cdb4..8a7605a8 100644 --- a/src/SharpLearning.Optimization.Test/SharpLearning.Optimization.Test.csproj +++ b/src/SharpLearning.Optimization.Test/SharpLearning.Optimization.Test.csproj @@ -1,21 +1,7 @@  - true - - - - net8 - - false - - - - ..\..\BuildTest\Release\ - - - - ..\..\BuildTest\Debug\ + $(TestTargetFramework) diff --git a/src/SharpLearning.Optimization/SharpLearning.Optimization.csproj b/src/SharpLearning.Optimization/SharpLearning.Optimization.csproj index 942af76c..f724de17 100644 --- a/src/SharpLearning.Optimization/SharpLearning.Optimization.csproj +++ b/src/SharpLearning.Optimization/SharpLearning.Optimization.csproj @@ -1,24 +1,10 @@ - true - - - - netstandard2.0 - false + $(LibraryTargetFramework) SharpLearning.Optimization Provides optimization algorithms. - optimization grid search random particle swarm neldermead nelder mead bayesian bayesianoptimization machine learning machinelearning - - - - ..\..\Build\Release\netstandard2.0\SharpLearning.Optimization.xml - ..\..\Build\Release\ - - - - ..\..\Build\Debug\ + optimization grid search random particle swarm nelder-mead bayesian-optimization machine-learning diff --git a/src/SharpLearning.RandomForest.Test/SharpLearning.RandomForest.Test.csproj b/src/SharpLearning.RandomForest.Test/SharpLearning.RandomForest.Test.csproj index 5b5d6fde..2e60799a 100644 --- a/src/SharpLearning.RandomForest.Test/SharpLearning.RandomForest.Test.csproj +++ b/src/SharpLearning.RandomForest.Test/SharpLearning.RandomForest.Test.csproj @@ -1,21 +1,7 @@  - true - - - - net8 - - false - - - - ..\..\BuildTest\Release\ - - - - ..\..\BuildTest\Debug\ + $(TestTargetFramework) diff --git a/src/SharpLearning.RandomForest/SharpLearning.RandomForest.csproj b/src/SharpLearning.RandomForest/SharpLearning.RandomForest.csproj index 589f7a56..afe493c2 100644 --- a/src/SharpLearning.RandomForest/SharpLearning.RandomForest.csproj +++ b/src/SharpLearning.RandomForest/SharpLearning.RandomForest.csproj @@ -1,24 +1,10 @@ - true - - - - netstandard2.0 - false + $(LibraryTargetFramework) SharpLearning.RandomForest Provides learning algorithms and models for RandomForest and ExtraTrees regression and classification. - randomforest extratrees machinelearning classification regression machine learning - - - - ..\..\Build\Release\netstandard2.0\SharpLearning.RandomForest.xml - ..\..\Build\Release\ - - - - ..\..\Build\Debug\ + random-forest extra-trees machine-learning classification regression diff --git a/src/SharpLearning.XGBoost.Test/SharpLearning.XGBoost.Test.csproj b/src/SharpLearning.XGBoost.Test/SharpLearning.XGBoost.Test.csproj index c724e9d5..3c1ee907 100644 --- a/src/SharpLearning.XGBoost.Test/SharpLearning.XGBoost.Test.csproj +++ b/src/SharpLearning.XGBoost.Test/SharpLearning.XGBoost.Test.csproj @@ -1,21 +1,9 @@  - true - - - - net8 - - false - - - - ..\..\BuildTest\Release\ - - - - ..\..\BuildTest\Debug\ + $(TestTargetFramework) + + $(NoWarn);NU1701;MSB3270 diff --git a/src/SharpLearning.XGBoost/SharpLearning.XGBoost.csproj b/src/SharpLearning.XGBoost/SharpLearning.XGBoost.csproj index 9b37fbb7..c02a7980 100644 --- a/src/SharpLearning.XGBoost/SharpLearning.XGBoost.csproj +++ b/src/SharpLearning.XGBoost/SharpLearning.XGBoost.csproj @@ -1,24 +1,12 @@  - true - - - - netstandard2.0 - true + $(LibraryTargetFramework) SharpLearning.XGBoost Provides learning algorithms and models for XGBoost regression and classification. - XGBoost machinelearning classification regression machine learning - - - - ..\..\Build\Release\netstandard2.0\SharpLearning.XGBoost.xml - ..\..\Build\Release\ - - - - ..\..\Build\Debug\ + XGBoost machine-learning classification regression machine learning + + $(NoWarn);NU1701;MSB3270 diff --git a/src/SourceLink.GitHub.props b/src/SourceLink.GitHub.props new file mode 100644 index 00000000..cc8534b8 --- /dev/null +++ b/src/SourceLink.GitHub.props @@ -0,0 +1,12 @@ + + + true + true + true + snupkg + + + + + + diff --git a/test.ps1 b/test.ps1 deleted file mode 100644 index 60f5e5c1..00000000 --- a/test.ps1 +++ /dev/null @@ -1,7 +0,0 @@ -$vstestconsolepath = $env:VS140COMNTOOLS + "..\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" -$testRoot = "BuildTest\" - -$testDlls = Get-ChildItem -Path $testRoot -File -Recurse -Include *Test.dll - -& $vstestconsolepath $testDlls '/Platform:x86' # '/Parallel' -& $vstestconsolepath $testDlls '/Platform:x64' # '/Parallel' \ No newline at end of file