diff --git a/Directory.Build.props b/Directory.Build.props index 1fe944cfee..8e67d0905c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -35,8 +35,17 @@ + $(ArtifactsDir)models/ $(ArtifactsDir)pkgassets/ $(RepoRoot)pkg/ + + Microsoft + MIT + https://dot.net/ml + mlnetlogo.png + https://aka.ms/mlnetreleasenotes + + ML.NET ML Machine Learning @@ -60,4 +69,5 @@ true + diff --git a/Directory.Build.targets b/Directory.Build.targets index 0b93f9177a..f310d751cd 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,6 +1,8 @@ + + diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln index 2137c9eb15..5763a903b4 100644 --- a/Microsoft.ML.sln +++ b/Microsoft.ML.sln @@ -96,6 +96,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Samples.OneDal EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Recommender", "src\Microsoft.ML.Recommender\Microsoft.ML.Recommender.csproj", "{C8E1772B-DFD9-4A4D-830D-6AAB1C668BB3}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.DnnImageFeaturizer.ModelRedist", "src\Microsoft.ML.DnnImageFeaturizer.ModelRedist\Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj", "{39E89702-1A46-4D5B-BA50-530D11309B5E}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.DnnImageFeaturizer.ResNet18", "src\Microsoft.ML.DnnImageFeaturizer.ResNet18\Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj", "{9222FC9D-599A-49A5-B685-08CC9A5C81D7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.DnnImageFeaturizer.AlexNet", "src\Microsoft.ML.DnnImageFeaturizer.AlexNet\Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj", "{6C29AA9B-054B-4762-BEA5-D305B932AA80}" @@ -818,6 +820,14 @@ Global {763FF013-8309-4680-A769-B54E7BB99612}.Release|Any CPU.Build.0 = Release|Any CPU {763FF013-8309-4680-A769-B54E7BB99612}.Release|x64.ActiveCfg = Release|Any CPU {763FF013-8309-4680-A769-B54E7BB99612}.Release|x64.Build.0 = Release|Any CPU + {39E89702-1A46-4D5B-BA50-530D11309B5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {39E89702-1A46-4D5B-BA50-530D11309B5E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {39E89702-1A46-4D5B-BA50-530D11309B5E}.Debug|x64.ActiveCfg = Debug|Any CPU + {39E89702-1A46-4D5B-BA50-530D11309B5E}.Debug|x64.Build.0 = Debug|Any CPU + {39E89702-1A46-4D5B-BA50-530D11309B5E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {39E89702-1A46-4D5B-BA50-530D11309B5E}.Release|Any CPU.Build.0 = Release|Any CPU + {39E89702-1A46-4D5B-BA50-530D11309B5E}.Release|x64.ActiveCfg = Release|Any CPU + {39E89702-1A46-4D5B-BA50-530D11309B5E}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -903,6 +913,7 @@ Global {FB8A8823-CC6C-4C2F-8539-05FBFB7C91CD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} {AB8D68F1-6C3E-41FD-B0EC-A093E009341D} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} {763FF013-8309-4680-A769-B54E7BB99612} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} + {39E89702-1A46-4D5B-BA50-530D11309B5E} = {09EADF06-BE25-4228-AB53-95AE3E15B530} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D} diff --git a/build/publish.proj b/build/publish.proj deleted file mode 100644 index 9391afb0ad..0000000000 --- a/build/publish.proj +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - Microsoft.SymbolUploader.Build.Task - true - 600 - - - - - - - - - - - - - - - 3650 - false - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj b/docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj index e753ee59f6..628cbe5293 100644 --- a/docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj +++ b/docs/samples/Microsoft.ML.AutoML.Samples/Microsoft.ML.AutoML.Samples.csproj @@ -23,4 +23,5 @@ + diff --git a/docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj b/docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj index 8b40f06dae..4c1cb229e4 100644 --- a/docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj +++ b/docs/samples/Microsoft.ML.Samples.GPU/Microsoft.ML.Samples.GPU.csproj @@ -23,6 +23,7 @@ + @@ -54,14 +55,14 @@ - + DnnImageModels\ResNet18Onnx\ResNet18.onnx PreserveNewest - + DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx PreserveNewest diff --git a/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj b/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj index 3fba560fd5..8e168ad456 100644 --- a/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj +++ b/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj @@ -981,14 +981,14 @@ - + DnnImageModels\ResNet18Onnx\ResNet18.onnx PreserveNewest - + DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx PreserveNewest diff --git a/eng/Build.props b/eng/Build.props index de6a651461..ca19b06276 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -9,7 +9,6 @@ - diff --git a/eng/Packaging.targets b/eng/Packaging.targets new file mode 100644 index 0000000000..52ac5a667d --- /dev/null +++ b/eng/Packaging.targets @@ -0,0 +1,47 @@ + + + + + + + + + + + + + $(TargetsForTfmSpecificContentInPackage);IncludeAdditionalFilesInPackage; + + + + + + + <_projectReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('Pack', 'true'))" /> + + + + + + + + <_runtimeFiles Include="$(PackageAssetsPath)$(PackageId)\runtimes\**\*%(NativeAssemblyReference.Identity)*" /> + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Signing.props b/eng/Signing.props index 91b6ee12dd..976ae1ba79 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -1,9 +1,4 @@ - - - - - true diff --git a/eng/pkg/Pack.props b/eng/pkg/Pack.props deleted file mode 100644 index 888000e570..0000000000 --- a/eng/pkg/Pack.props +++ /dev/null @@ -1,85 +0,0 @@ - - - - $(ArtifactsDir)pkgassets/ - true - true - $(MSBuildProjectName.Replace('.symbols', '')) - true - true - - - - - Microsoft - MIT - https://dot.net/ml - mlnetlogo.png - https://aka.ms/mlnetreleasenotes - - ML.NET ML Machine Learning - - .dll - .so - .dylib - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - false - %(Filename)%(Extension) - - - - PreserveNewest - false - %(Filename)%(Extension) - - - - PreserveNewest - false - %(Filename)%(Extension) - - - - - - - - None - - - - \ No newline at end of file diff --git a/global.json b/global.json index b34f134587..103a6fec76 100644 --- a/global.json +++ b/global.json @@ -15,6 +15,7 @@ "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24102.4", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24102.4", + "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.2.0", "Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02", "Microsoft.SourceLink.Common": "1.1.0-beta-20206-02" diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 90b94346bc..3afbdbedea 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -3,7 +3,7 @@ - true + true diff --git a/src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj b/src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj index 4b4fda6652..1badcdef5c 100644 --- a/src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj +++ b/src/Microsoft.Data.Analysis/Microsoft.Data.Analysis.csproj @@ -1,9 +1,10 @@  - + netstandard2.0 true false + true This package contains easy-to-use and high-performance libraries for data analysis and transformation. Initial preview of robust and extensible types and algorithms for manipulating structured data that supports aggregations, statistical funtions, sorting, grouping, joins, merges, handling missing values and more. ML.NET ML Machine Learning Data Science DataFrame Preparation DataView Analytics Exploration @@ -16,7 +17,9 @@ $(TargetsForTfmSpecificContentInPackage);AddMDAIToInteractiveExtensionsFolder - + @@ -237,4 +240,5 @@ Microsoft.Data + diff --git a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj index 2970566af3..037c7adce1 100644 --- a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj +++ b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj @@ -1,9 +1,8 @@  - netstandard2.0 - Microsoft.Extensions.ML + true An integration package for ML.NET models on scalable web apps and services. @@ -13,14 +12,8 @@ - - all - - - - all - - + + diff --git a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj index b7a2d92c3d..909139b33b 100644 --- a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj +++ b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj @@ -1,12 +1,9 @@  - netstandard2.0 - Microsoft.ML.AutoML + true ML.NET AutoML: Optimizes an ML pipeline for your dataset, by automatically locating the best feature engineering, model, and hyperparameters - $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage - - - - - - - - - - - - diff --git a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj index 58b6f74f1b..a468b72fde 100644 --- a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj +++ b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj @@ -1,9 +1,8 @@  - netstandard2.0 - Microsoft.ML.CodeGenerator + true ML.NET Code Generator $(NoWarn) @@ -24,13 +23,9 @@ - - all - + - - all - + @@ -145,4 +140,5 @@ PredictProject.tt + diff --git a/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj b/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj index cc342e96e1..807fa85088 100644 --- a/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj +++ b/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj @@ -2,7 +2,6 @@ netstandard2.0 - Microsoft.ML true CORECLR Microsoft.ML diff --git a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj index 699bc4e2f6..f6f7abb7da 100644 --- a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj +++ b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj @@ -1,12 +1,11 @@  - + netstandard2.0;net6.0 - Microsoft.ML.CpuMath + true Microsoft.ML.CpuMath contains optimized math routines for ML.NET. true $(DefineConstants);CPUMATH_INFRASTRUCTURE - $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage @@ -33,12 +32,5 @@ - - - - - - - - + \ No newline at end of file diff --git a/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj b/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj index 0ea1f6e1f9..d212f5e4ee 100644 --- a/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj +++ b/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj @@ -2,7 +2,6 @@ netstandard2.0 - Microsoft.ML true CORECLR diff --git a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj index a81ffdaf17..59ac30649e 100644 --- a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj +++ b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj @@ -1,9 +1,8 @@  - netstandard2.0 - Microsoft.ML.DataView + true Contains the IDataView system which is a set of interfaces and components that provide efficient, compositional processing of schematized data for machine learning and advanced analytics applications. diff --git a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj index ec75b23693..66ded5a388 100644 --- a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj +++ b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj @@ -1,24 +1,22 @@ - netstandard2.0 - Microsoft.ML.DnnImageFeaturizer.AlexNet + true ML.NET component for pretrained AlexNet image featurization - - all - - - all - + + + + + diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj new file mode 100644 index 0000000000..f899b4fe13 --- /dev/null +++ b/src/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj @@ -0,0 +1,51 @@ + + + + netstandard2.0 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj index 70dfa08966..77edab125f 100644 --- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj +++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj @@ -1,24 +1,23 @@ - netstandard2.0 - Microsoft.ML.DnnImageFeaturizer.ResNet101 + true ML.NET component for pretrained ResNet101 image featurization - - all - - - all - + + + + + + \ No newline at end of file diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj index db02568be9..7fd5310d08 100644 --- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj +++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj @@ -1,24 +1,22 @@ - netstandard2.0 - Microsoft.ML.DnnImageFeaturizer.ResNet18 + true ML.NET component for pretrained ResNet18 image featurization - - all - - - all - + + + + + diff --git a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj index 5c6e91aefd..a19e37f96b 100644 --- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj +++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj @@ -1,24 +1,22 @@ - netstandard2.0 - Microsoft.ML.DnnImageFeaturizer.ResNet50 + true ML.NET component for pretrained ResNet50 image featurization - - all - - - all - + + + + + diff --git a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj index 766107cd6b..4f83132434 100644 --- a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj +++ b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj @@ -1,24 +1,17 @@  - netstandard2.0 - Microsoft.ML.Ensemble + true ML.NET component for Ensembles CORECLR - - all - - - all - - - all - + + + diff --git a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj index a2b946550c..c84a5d5c96 100644 --- a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj +++ b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj @@ -1,27 +1,18 @@  - netstandard2.0 - Microsoft.ML.EntryPoints + true Microsoft.ML.EntryPoints contains the ML.NET entry point API catalog. - - all - - - all - - - all - - - all - + + + + diff --git a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj index 1996182a09..6a47692468 100644 --- a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj +++ b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj @@ -1,18 +1,15 @@  - netstandard2.0 - Microsoft.ML.Experimental + true Microsoft.ML.Experimental contains experimental work such extension methods to access internal methods. - - all - + diff --git a/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj b/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj index 72b2ad0edb..a1b8d3fec4 100644 --- a/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj +++ b/src/Microsoft.ML.Fairlearn/Microsoft.ML.Fairlearn.csproj @@ -1,27 +1,21 @@  - netstandard2.0 - Microsoft.ML.Fairlearn + true None - - all - - - all - true - + + + + + - - all - diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj index acbef6b851..80d0aab011 100644 --- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj +++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj @@ -1,37 +1,21 @@  - + netstandard2.0 - Microsoft.ML.FastTree + true ML.NET component for FastTree $(DefineConstants);NO_STORE;CORECLR true - $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage - - all - - - all - - - all - - - all - + + + + - - - - - - - - + \ No newline at end of file diff --git a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj index 5edf8ebb14..ad687a0ad0 100644 --- a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj +++ b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj @@ -1,9 +1,8 @@  - netstandard2.0 - Microsoft.ML.ImageAnalytics + true ML.NET component for Image support true @@ -20,12 +19,8 @@ - - all - - - all - + + diff --git a/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj b/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj index f7e24f9457..41a772450c 100644 --- a/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj +++ b/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj @@ -2,7 +2,6 @@ netstandard2.0 - Microsoft.ML diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj index 4d4c405e01..7b63f306d5 100644 --- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj +++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj @@ -1,10 +1,9 @@  - netstandard2.0 - Microsoft.ML.LightGbm true + true ML.NET component for LightGBM @@ -12,19 +11,14 @@ - - all - - - all - - - all - + + + - + + diff --git a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj index 56566d43df..ae356239ac 100644 --- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj +++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj @@ -1,27 +1,18 @@  - + netstandard2.0 - Microsoft.ML.Mkl.Components true + true ML.NET additional learners making use of Intel Mkl. - $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage - - all - - - all - - - all - - - all - + + + + @@ -30,16 +21,7 @@ - - all - + - - - - - - - - + \ No newline at end of file diff --git a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj index 440caa98d1..31fbd674d0 100644 --- a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj +++ b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj @@ -1,8 +1,10 @@ - - + + - netstandard2.0 - false + netstandard2.0 + true + true + false LICENSE.txt $(MSBuildProjectName) contains the MKL library redistributed as a NuGet package. @@ -10,8 +12,7 @@ false - $(NoWarn);NU5127;NU5128 - $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage + $(NoWarn);NU5127;NU5128;NU5109 @@ -26,13 +27,4 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj b/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj index ab1cc7a4cb..b38ffb379a 100644 --- a/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj +++ b/src/Microsoft.ML.OneDal/Microsoft.ML.OneDal.csproj @@ -1,26 +1,17 @@ - + netstandard2.0 - Microsoft.ML.OneDal true + true ML.NET additional learners making use of Intel® oneAPI Data Analytics Library (oneDAL). - $(TargetsForTfmSpecificBuildOutput) - - all - - - all - - - all - - - all - + + + + win @@ -30,4 +21,5 @@ + diff --git a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj index 56fefc841f..6182288560 100644 --- a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj +++ b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj @@ -1,10 +1,9 @@ - netstandard2.0 - Microsoft.ML.OnnxConverter Microsoft.ML.Model.Onnx + true ML.NET component for exporting ONNX Models @@ -15,9 +14,7 @@ - - all - + diff --git a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj index 54517aebaa..2b0aefc490 100644 --- a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj +++ b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj @@ -1,23 +1,19 @@  - netstandard2.0 - Microsoft.ML.OnnxTransformer true + true ML.NET component for Microsoft.ML.OnnxRuntime.Managed library - - all - - - all - - + + + + @@ -26,4 +22,5 @@ OnnxMl.cs + diff --git a/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj b/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj index f7e24f9457..41a772450c 100644 --- a/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj +++ b/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj @@ -2,7 +2,6 @@ netstandard2.0 - Microsoft.ML diff --git a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj index f41344c124..df7c11bb8b 100644 --- a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj +++ b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj @@ -1,9 +1,8 @@  - netstandard2.0 - Microsoft.ML.Parquet + true ML.NET components for Apache Parquet support. @@ -14,12 +13,8 @@ - - all - - - all - + + diff --git a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj index 980e5719da..080bda9500 100644 --- a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj +++ b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj @@ -1,32 +1,19 @@ - + netstandard2.0 - Microsoft.ML.Recommender true + true LIBMF, the core computation library for matrix factorization in ML.NET - $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage - - all - - - all - + + - - - - - - - - - + \ No newline at end of file diff --git a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj index db62720cdd..1698d12a23 100644 --- a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj +++ b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj @@ -1,9 +1,8 @@  - netstandard2.0 - Microsoft.ML.SampleUtils + true Sample utils for Microsoft.ML.Samples + + + + CP0004 + Microsoft.ML, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 + lib/netstandard2.0/Microsoft.ML.dll + right + true + + \ No newline at end of file diff --git a/src/Microsoft.ML/Microsoft.ML.csproj b/src/Microsoft.ML/Microsoft.ML.csproj index 9b8fdf7538..e32176d1ad 100644 --- a/src/Microsoft.ML/Microsoft.ML.csproj +++ b/src/Microsoft.ML/Microsoft.ML.csproj @@ -1,44 +1,30 @@ - - + + + netstandard2.0 - - + + false + + <_FindDependencies>false + + false + + true $(NoWarn);NU5127;NU5128 + true ML.NET is a cross-platform open-source machine learning framework which makes machine learning accessible to .NET developers. README.md - $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage - - true - all - - - true - all - - - true - all - - - true - all - - - true - all - - - true - all - + + + + + + @@ -52,21 +38,6 @@ - - - $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj b/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj deleted file mode 100644 index e003f2a5d2..0000000000 --- a/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj +++ /dev/null @@ -1,131 +0,0 @@ - - - netstandard2.0 - - - - - - $(ArtifactsObjDir)DnnImageModels - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 196b98eacb..51d5e2eb15 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -44,7 +44,7 @@ false Analyzer diff --git a/test/Microsoft.Data.Analysis.Interactive.Tests/Microsoft.Data.Analysis.Interactive.Tests.csproj b/test/Microsoft.Data.Analysis.Interactive.Tests/Microsoft.Data.Analysis.Interactive.Tests.csproj index bf2bf806e4..c49ffd82d1 100644 --- a/test/Microsoft.Data.Analysis.Interactive.Tests/Microsoft.Data.Analysis.Interactive.Tests.csproj +++ b/test/Microsoft.Data.Analysis.Interactive.Tests/Microsoft.Data.Analysis.Interactive.Tests.csproj @@ -1,4 +1,5 @@  + net6.0 $(NoWarn);MSML_ExtendBaseTestClass @@ -12,4 +13,5 @@ + diff --git a/test/Microsoft.Data.Analysis.Tests/Microsoft.Data.Analysis.Tests.csproj b/test/Microsoft.Data.Analysis.Tests/Microsoft.Data.Analysis.Tests.csproj index 6827d6120a..39fd3edc47 100644 --- a/test/Microsoft.Data.Analysis.Tests/Microsoft.Data.Analysis.Tests.csproj +++ b/test/Microsoft.Data.Analysis.Tests/Microsoft.Data.Analysis.Tests.csproj @@ -1,4 +1,5 @@  + $(NoWarn);MSML_ParameterLocalVarName;MSML_PrivateFieldName;MSML_ExtendBaseTestClass;MSML_GeneralName preview diff --git a/test/Microsoft.Extensions.ML.Tests/Microsoft.Extensions.ML.Tests.csproj b/test/Microsoft.Extensions.ML.Tests/Microsoft.Extensions.ML.Tests.csproj index 6d9ada6a47..d63b42a637 100644 --- a/test/Microsoft.Extensions.ML.Tests/Microsoft.Extensions.ML.Tests.csproj +++ b/test/Microsoft.Extensions.ML.Tests/Microsoft.Extensions.ML.Tests.csproj @@ -1,4 +1,5 @@  + diff --git a/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj b/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj index 1f5aecb7b0..d70cd0a133 100644 --- a/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj +++ b/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj @@ -1,4 +1,5 @@  + None @@ -8,6 +9,7 @@ + @@ -44,11 +46,11 @@ - + DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx PreserveNewest - + DnnImageModels\ResNet18Onnx\ResNet18.onnx PreserveNewest diff --git a/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj b/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj index 20c173c8d7..71e10d7501 100644 --- a/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj +++ b/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj @@ -1,4 +1,5 @@  + CORECLR Test diff --git a/test/Microsoft.ML.CpuMath.PerformanceTests/Microsoft.ML.CpuMath.PerformanceTests.csproj b/test/Microsoft.ML.CpuMath.PerformanceTests/Microsoft.ML.CpuMath.PerformanceTests.csproj index 4a21f79e0c..525256afff 100644 --- a/test/Microsoft.ML.CpuMath.PerformanceTests/Microsoft.ML.CpuMath.PerformanceTests.csproj +++ b/test/Microsoft.ML.CpuMath.PerformanceTests/Microsoft.ML.CpuMath.PerformanceTests.csproj @@ -1,4 +1,5 @@  + Exe false diff --git a/test/Microsoft.ML.Fairlearn.Tests/Microsoft.ML.Fairlearn.Tests.csproj b/test/Microsoft.ML.Fairlearn.Tests/Microsoft.ML.Fairlearn.Tests.csproj index b950086278..bb1a2c0c45 100644 --- a/test/Microsoft.ML.Fairlearn.Tests/Microsoft.ML.Fairlearn.Tests.csproj +++ b/test/Microsoft.ML.Fairlearn.Tests/Microsoft.ML.Fairlearn.Tests.csproj @@ -1,4 +1,5 @@  + None $(NoWarn);MSML_ParameterLocalVarName;MSML_PrivateFieldName;MSML_ExtendBaseTestClass;MSML_GeneralName diff --git a/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj b/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj index a941888134..2f566613c8 100644 --- a/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj +++ b/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj @@ -1,4 +1,5 @@  + true true @@ -19,14 +20,14 @@ - + DnnImageModels\ResNetPrepOnnx\ResNetPreprocess.onnx PreserveNewest - + DnnImageModels\ResNet18Onnx\ResNet18.onnx PreserveNewest diff --git a/test/Microsoft.ML.PerformanceTests/Microsoft.ML.PerformanceTests.csproj b/test/Microsoft.ML.PerformanceTests/Microsoft.ML.PerformanceTests.csproj index a0afea5164..55b9b7c6d4 100644 --- a/test/Microsoft.ML.PerformanceTests/Microsoft.ML.PerformanceTests.csproj +++ b/test/Microsoft.ML.PerformanceTests/Microsoft.ML.PerformanceTests.csproj @@ -1,4 +1,5 @@  + Exe false @@ -32,4 +33,5 @@ + diff --git a/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj b/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj index 603a87f629..d5a1586073 100644 --- a/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj +++ b/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj @@ -1,4 +1,5 @@  + CORECLR diff --git a/test/Microsoft.ML.SearchSpace.Tests/Microsoft.ML.SearchSpace.Tests.csproj b/test/Microsoft.ML.SearchSpace.Tests/Microsoft.ML.SearchSpace.Tests.csproj index 0d8b3f5424..a27583f1dc 100644 --- a/test/Microsoft.ML.SearchSpace.Tests/Microsoft.ML.SearchSpace.Tests.csproj +++ b/test/Microsoft.ML.SearchSpace.Tests/Microsoft.ML.SearchSpace.Tests.csproj @@ -1,4 +1,5 @@  + $(NoWarn);MSML_ParameterLocalVarName;MSML_PrivateFieldName;MSML_ExtendBaseTestClass;MSML_GeneralName diff --git a/test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj b/test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj index 54a35dfa4e..47437a5fcd 100644 --- a/test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj +++ b/test/Microsoft.ML.Sweeper.Tests/Microsoft.ML.Sweeper.Tests.csproj @@ -12,4 +12,5 @@ + diff --git a/test/Microsoft.ML.TensorFlow.Tests/Microsoft.ML.TensorFlow.Tests.csproj b/test/Microsoft.ML.TensorFlow.Tests/Microsoft.ML.TensorFlow.Tests.csproj index 30b85c955e..78085851c2 100644 --- a/test/Microsoft.ML.TensorFlow.Tests/Microsoft.ML.TensorFlow.Tests.csproj +++ b/test/Microsoft.ML.TensorFlow.Tests/Microsoft.ML.TensorFlow.Tests.csproj @@ -1,4 +1,5 @@ + Microsoft.ML.TensorFlow.Tests Test diff --git a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj index 7abfb1b17c..6eb00d4fcb 100644 --- a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj +++ b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj @@ -1,4 +1,5 @@  + true true diff --git a/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj b/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj index dc43089688..046327bb79 100644 --- a/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj +++ b/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj @@ -63,4 +63,5 @@ + diff --git a/test/Microsoft.ML.TimeSeries.Tests/Microsoft.ML.TimeSeries.Tests.csproj b/test/Microsoft.ML.TimeSeries.Tests/Microsoft.ML.TimeSeries.Tests.csproj index 4ced31bcb9..6a4cd3ec9b 100644 --- a/test/Microsoft.ML.TimeSeries.Tests/Microsoft.ML.TimeSeries.Tests.csproj +++ b/test/Microsoft.ML.TimeSeries.Tests/Microsoft.ML.TimeSeries.Tests.csproj @@ -1,4 +1,5 @@  + CORECLR @@ -14,4 +15,5 @@ + diff --git a/test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj b/test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj index 34497f8e20..a1edf64eb7 100644 --- a/test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj +++ b/test/Microsoft.ML.Tokenizers.Tests/Microsoft.ML.Tokenizers.Tests.csproj @@ -1,4 +1,5 @@  + Microsoft.ML.Tokenizers.Tests Test diff --git a/test/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj b/test/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj index 4aee4bc458..580d921f67 100644 --- a/test/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj +++ b/test/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj @@ -4,4 +4,5 @@ Exe false + diff --git a/test/TestFrameworkDependency.props b/test/TestFrameworkDependency.props index c815dd3166..eec1c9c73b 100644 --- a/test/TestFrameworkDependency.props +++ b/test/TestFrameworkDependency.props @@ -1,8 +1,6 @@ - - All - +