diff --git a/Directory.Build.props b/Directory.Build.props index cc3f1b1c4ce..dbe88444555 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -13,9 +13,8 @@ $(CopyrightNetFoundation) - MIT True - embedded + portable true latest @@ -31,7 +30,7 @@ - $(ArtifactsDir)/pkgassets/ + $(ArtifactsDir)pkgassets/ $(RepoRoot)pkg/ @@ -49,17 +48,17 @@ true - + true - + true snupkg - + - - true + false 1.5.3 - + dev 10.0.3 @@ -37,7 +37,7 @@ 4.3.6 1.0.0-beta.19225.5 1.1.0-beta-20206-02 - + 0.12.0 1.0.1-beta1.20080.1 @@ -77,6 +77,7 @@ 2.1.0 2.0.0 2.1.0 + 3.1.0 3.8.0-3.20460.2 4.8.3 5.3.0.1 @@ -103,9 +104,9 @@ 4.5.2 4.4.0 8.5.0 - 2.4.1 + 2.4.0 2.0.3 - 2.4.1 + 2.4.0 5.0.0-beta.20461.7 5.0.0-beta.20461.7 1.22.0 diff --git a/pkg/common/CommonPackage.props b/eng/pkg/CommonPackage.props similarity index 100% rename from pkg/common/CommonPackage.props rename to eng/pkg/CommonPackage.props diff --git a/pkg/common/DnnImageFeaturizer.props b/eng/pkg/DnnImageFeaturizer.props similarity index 100% rename from pkg/common/DnnImageFeaturizer.props rename to eng/pkg/DnnImageFeaturizer.props diff --git a/eng/pkg/Pack.props b/eng/pkg/Pack.props new file mode 100644 index 00000000000..496cb2d50e0 --- /dev/null +++ b/eng/pkg/Pack.props @@ -0,0 +1,78 @@ + + + + $(ArtifactsDir)pkgassets/ + true + snupkg + true + $(MSBuildProjectName.Replace('.symbols', '')) + true + true + + + + + + Microsoft + LICENSE + 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) + + + + + + + None + + + + \ No newline at end of file diff --git a/pkg/_._ b/eng/pkg/_._ similarity index 100% rename from pkg/_._ rename to eng/pkg/_._ diff --git a/pkg/mlnetlogo.png b/eng/pkg/mlnetlogo.png similarity index 100% rename from pkg/mlnetlogo.png rename to eng/pkg/mlnetlogo.png diff --git a/global.json b/global.json index cd6a8c0ea60..e301a744d5d 100644 --- a/global.json +++ b/global.json @@ -1,12 +1,15 @@ { - "tools": { - "dotnet": "5.0.100-rc.1.20452.10" - }, - "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20461.7", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20461.7", - "Microsoft.Build.Traversal": "2.1.1", - "Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02", - "Microsoft.SourceLink.Common": "1.1.0-beta-20206-02" + "tools": { + "dotnet": "5.0.100-rc.1.20452.10", + "runtimes": { + "dotnet/x64": ["$(MicrosoftNETCorePlatformsVersion)", "$(MicrosoftNETCore3PlatformsVersion)" ] + } + }, + "msbuild-sdks": { + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20461.7", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20461.7", + "Microsoft.Build.Traversal": "2.1.1", + "Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02", + "Microsoft.SourceLink.Common": "1.1.0-beta-20206-02" + } } -} diff --git a/pkg/Directory.Build.props b/pkg/Directory.Build.props deleted file mode 100644 index 16ad2d7b8de..00000000000 --- a/pkg/Directory.Build.props +++ /dev/null @@ -1,59 +0,0 @@ - - - - - true - false - false - - true - $(MSBuildProjectName.Replace('.symbols', '')) - - - $(IntermediateOutputRootPath)$(MSBuildProjectName).NupkgProj\ - $(IntermediateOutputPath) - - - - - Microsoft - LICENSE - https://dot.net/ml - mlnetlogo.png - https://aka.ms/mlnetreleasenotes - - ML.NET ML Machine Learning - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - \ No newline at end of file diff --git a/pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.nupkgproj b/pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.nupkgproj deleted file mode 100644 index 4dbb257b8f7..00000000000 --- a/pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.nupkgproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netstandard2.0 - An integration package for ML.NET models on scalable web apps and services. - - - - - - - - - - - diff --git a/pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.symbols.nupkgproj b/pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.symbols.nupkgproj deleted file mode 100644 index 0b7af4d817c..00000000000 --- a/pkg/Microsoft.Extensions.ML/Microsoft.Extensions.ML.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj b/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj deleted file mode 100644 index 8a9fc5db713..00000000000 --- a/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netstandard2.0 - ML.NET AutoML: Optimizes an ML pipeline for your dataset, by automatically locating the best feature engineering, model, and hyperparameters - - - - - - - - - - - - diff --git a/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.symbols.nupkgproj b/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.symbols.nupkgproj deleted file mode 100644 index a648ab1d59e..00000000000 --- a/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.symbols.nupkgproj +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.nupkgproj b/pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.nupkgproj deleted file mode 100644 index 48c288fb6b0..00000000000 --- a/pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.nupkgproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netstandard2.0 - ML.NET Code Generator - - - - - - - - - - - - diff --git a/pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.symbols.nupkgproj b/pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.symbols.nupkgproj deleted file mode 100644 index cc330b9cbb5..00000000000 --- a/pkg/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.symbols.nupkgproj +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.nupkgproj b/pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.nupkgproj deleted file mode 100644 index e60e2b232d2..00000000000 --- a/pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.nupkgproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netstandard2.0;netcoreapp3.1 - Microsoft.ML.CpuMath contains optimized math routines for ML.NET. - - - - - - - - - - - diff --git a/pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.symbols.nupkgproj b/pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.symbols.nupkgproj deleted file mode 100644 index 8b44c50d7f9..00000000000 --- a/pkg/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.symbols.nupkgproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - $(NoWarn);NU5129 - - - diff --git a/pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.nupkgproj b/pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.nupkgproj deleted file mode 100644 index ab500b904e2..00000000000 --- a/pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.nupkgproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netstandard2.0 - 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/pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.symbols.nupkgproj b/pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.symbols.nupkgproj deleted file mode 100644 index 988c4c5f728..00000000000 --- a/pkg/Microsoft.ML.DataView/Microsoft.ML.DataView.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.nupkgproj deleted file mode 100644 index 4fb4e52d0a6..00000000000 --- a/pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.nupkgproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netstandard2.0 - ML.NET component for pretrained AlexNet image featurization - - - - - - - - - - - - diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.symbols.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.symbols.nupkgproj deleted file mode 100644 index 8c6a7fcc4c4..00000000000 --- a/pkg/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.nupkgproj deleted file mode 100644 index 3d667604cd9..00000000000 --- a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.nupkgproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netstandard2.0 - ML.NET component for pretrained ResNet101 image featurization - - - - - - - - - - - diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.symbols.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.symbols.nupkgproj deleted file mode 100644 index 7035bef7479..00000000000 --- a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.nupkgproj deleted file mode 100644 index 1055b4cbbe4..00000000000 --- a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.nupkgproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netstandard2.0 - ML.NET component for pretrained ResNet18 image featurization - - - - - - - - - - - diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.symbols.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.symbols.nupkgproj deleted file mode 100644 index 9fb3f5ca753..00000000000 --- a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.nupkgproj deleted file mode 100644 index 2c33df9ff86..00000000000 --- a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.nupkgproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netstandard2.0 - ML.NET component for pretrained ResNet50 image featurization - - - - - - - - - - - diff --git a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.symbols.nupkgproj b/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.symbols.nupkgproj deleted file mode 100644 index 2b04e494f99..00000000000 --- a/pkg/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj b/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj deleted file mode 100644 index f8b8082047b..00000000000 --- a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netstandard2.0 - ML.NET component for Ensembles - - - - - - - \ No newline at end of file diff --git a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj b/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj deleted file mode 100644 index bb48a51cab3..00000000000 --- a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.nupkgproj b/pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.nupkgproj deleted file mode 100644 index b845fdeb45e..00000000000 --- a/pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.nupkgproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netstandard2.0 - Microsoft.ML.EntryPoints contains the ML.NET entry point API catalog. - - - - - - - diff --git a/pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.symbols.nupkgproj b/pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.symbols.nupkgproj deleted file mode 100644 index 3fa02559607..00000000000 --- a/pkg/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.nupkgproj b/pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.nupkgproj deleted file mode 100644 index edf80ad4759..00000000000 --- a/pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.nupkgproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netstandard2.0 - Microsoft.ML.Experimental contains experimental work such extension methods to access internal methods. - - - - - - - diff --git a/pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.symbols.nupkgproj b/pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.symbols.nupkgproj deleted file mode 100644 index c869da5d2b5..00000000000 --- a/pkg/Microsoft.ML.Experimental/Microsoft.ML.Experimental.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj deleted file mode 100644 index ac6f2452ad8..00000000000 --- a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netstandard2.0 - ML.NET component for FastTree - - - - - - - - - - - diff --git a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj deleted file mode 100644 index 9f4c5712ff8..00000000000 --- a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.nupkgproj b/pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.nupkgproj deleted file mode 100644 index ea35d7d0192..00000000000 --- a/pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.nupkgproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netstandard2.0;netcoreapp2.1 - ML.NET featurizers with native code implementation - - - - - - - - - diff --git a/pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.symbols.nupkgproj b/pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.symbols.nupkgproj deleted file mode 100644 index 483e51c61a4..00000000000 --- a/pkg/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.nupkgproj b/pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.nupkgproj deleted file mode 100644 index bb59e06653b..00000000000 --- a/pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.nupkgproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netstandard2.0 - ML.NET component for Image support - - - - - - - - diff --git a/pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.symbols.nupkgproj b/pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.symbols.nupkgproj deleted file mode 100644 index b36800ea0bd..00000000000 --- a/pkg/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.nupkgproj b/pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.nupkgproj deleted file mode 100644 index d4e48e8dd01..00000000000 --- a/pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.nupkgproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netstandard2.0 - ML.NET component for LightGBM - - - - - - - - - diff --git a/pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.symbols.nupkgproj b/pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.symbols.nupkgproj deleted file mode 100644 index 91a20f3ed8f..00000000000 --- a/pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.nupkgproj b/pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.nupkgproj deleted file mode 100644 index 1bd16d235d5..00000000000 --- a/pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.nupkgproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netstandard2.0 - ML.NET additional learners making use of Intel Mkl. - - - - - - - - - - - - diff --git a/pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj b/pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj deleted file mode 100644 index 0eaabcdd6ec..00000000000 --- a/pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.nupkgproj b/pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.nupkgproj deleted file mode 100644 index bcc86939e22..00000000000 --- a/pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.nupkgproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netstandard2.0 - ML.NET component for exporting ONNX Models - - - - - - - - diff --git a/pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.symbols.nupkgproj b/pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.symbols.nupkgproj deleted file mode 100644 index ccc3e947706..00000000000 --- a/pkg/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.nupkgproj b/pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.nupkgproj deleted file mode 100644 index 3c7d9f2ccd6..00000000000 --- a/pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.nupkgproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netstandard2.0 - ML.NET component for Microsoft.ML.Scoring library - - - - - - - - - diff --git a/pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.symbols.nupkgproj b/pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.symbols.nupkgproj deleted file mode 100644 index 6358a823118..00000000000 --- a/pkg/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj b/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj deleted file mode 100644 index 750926db345..00000000000 --- a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netstandard2.0 - ML.NET components for Apache Parquet support. - - - - - - - - diff --git a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.symbols.nupkgproj b/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.symbols.nupkgproj deleted file mode 100644 index bc14894823c..00000000000 --- a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.nupkgproj b/pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.nupkgproj deleted file mode 100644 index bc0e57f8c0e..00000000000 --- a/pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.nupkgproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netstandard2.0 - LIBMF, the core computation library for matrix factorization in ML.NET - - - - - - - - - diff --git a/pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.symbols.nupkgproj b/pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.symbols.nupkgproj deleted file mode 100644 index d82f31ad896..00000000000 --- a/pkg/Microsoft.ML.Recommender/Microsoft.ML.Recommender.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.nupkgproj b/pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.nupkgproj deleted file mode 100644 index e2b85df5029..00000000000 --- a/pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.nupkgproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netstandard2.0 - Sample utils for Microsoft.ML.Samples - - - - - - - diff --git a/pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.symbols.nupkgproj b/pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.symbols.nupkgproj deleted file mode 100644 index 2a2228e6af5..00000000000 --- a/pkg/Microsoft.ML.SampleUtils/Microsoft.ML.SampleUtils.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.nupkgproj b/pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.nupkgproj deleted file mode 100644 index ac054f61361..00000000000 --- a/pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.nupkgproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - netstandard2.0 - Microsoft.ML.TensorFlow contains ML.NET integration of TensorFlow. - - - - - - - - - - diff --git a/pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.symbols.nupkgproj b/pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.symbols.nupkgproj deleted file mode 100644 index a2a2a153f7d..00000000000 --- a/pkg/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.nupkgproj b/pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.nupkgproj deleted file mode 100644 index d0325da0239..00000000000 --- a/pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.nupkgproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netstandard2.0 - Microsoft.ML.TimeSeries contains ML.NET Time Series prediction algorithms. Uses Intel Mkl. - - - - - - - - diff --git a/pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.symbols.nupkgproj b/pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.symbols.nupkgproj deleted file mode 100644 index 05f361fa6cf..00000000000 --- a/pkg/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.nupkgproj b/pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.nupkgproj deleted file mode 100644 index f3f00e368c6..00000000000 --- a/pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.nupkgproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netstandard2.0 - Microsoft.ML.Vision contains high level APIs for vision tasks like image classification. - - - - - - - diff --git a/pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.symbols.nupkgproj b/pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.symbols.nupkgproj deleted file mode 100644 index 1ba48a28b9b..00000000000 --- a/pkg/Microsoft.ML.Vision/Microsoft.ML.Vision.symbols.nupkgproj +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pkg/Microsoft.ML/Microsoft.ML.symbols.nupkgproj b/pkg/Microsoft.ML/Microsoft.ML.symbols.nupkgproj deleted file mode 100644 index fc08dc12dc9..00000000000 --- a/pkg/Microsoft.ML/Microsoft.ML.symbols.nupkgproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - $(NoWarn);NU5129 - - - diff --git a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj index a27aed83868..fa7367e855d 100644 --- a/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj +++ b/src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj @@ -1,8 +1,9 @@  + netstandard2.0 - Microsoft.Extensions.ML + An integration package for ML.NET models on scalable web apps and services. @@ -10,8 +11,16 @@ - - + + + all + + + + all + + + diff --git a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj index a098ab44a01..dc086ff8ff9 100644 --- a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj +++ b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj @@ -1,19 +1,28 @@  + + netstandard2.0 - Microsoft.ML.AutoML + ML.NET AutoML: Optimizes an ML pipeline for your dataset, by automatically locating the best feature engineering, model, and hyperparameters - - + + all + - + + all + + + all + + diff --git a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj index 9d823595caf..0358bb36239 100644 --- a/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj +++ b/src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj @@ -1,8 +1,9 @@  + netstandard2.0 - Microsoft.ML.CodeGenerator + ML.NET Code Generator @@ -19,8 +20,16 @@ + + all + + + + all + + - + TextTemplatingFilePreprocessor diff --git a/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs b/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs index f5bd505ce04..afc6fad704e 100644 --- a/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs +++ b/src/Microsoft.ML.Core/ComponentModel/ComponentCatalog.cs @@ -1110,10 +1110,15 @@ private void LoadExtensions(Assembly assembly, bool throwOnError) /// private static bool CanContainExtensions(Assembly assembly) { + // We used to have two separate strong name keys for product and test binaries and Arcade + // does not support that anymore (and that did not accept our PR for adding the additional + // signed key and using two strong name keys without the PR). If they ever decide to support + // this scenario we can remove the regex and go back to checking just the public key and startswith. if (assembly.FullName.StartsWith("Microsoft.ML.", StringComparison.Ordinal) - && HasMLNetPublicKey(assembly)) + && !Regex.IsMatch(assembly.FullName, @"Microsoft\.ML.*\.Tests.*") + && HasMLNetPublicKey(assembly)) { - return false; + return false; } return true; diff --git a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj index e8185ed8170..0bd0cf6addc 100644 --- a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj +++ b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj @@ -1,8 +1,9 @@  + netstandard2.0;netcoreapp3.1 - Microsoft.ML.CpuMath + Microsoft.ML.CpuMath contains optimized math routines for ML.NET. true $(DefineConstants);CPUMATH_INFRASTRUCTURE @@ -31,4 +32,8 @@ + + + + diff --git a/pkg/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props b/src/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props similarity index 100% rename from pkg/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props rename to src/Microsoft.ML.CpuMath/build/netstandard2.0/Microsoft.ML.CpuMath.props diff --git a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj index 718deb356e9..cc5dccfcd01 100644 --- a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj +++ b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj @@ -1,8 +1,9 @@  + netstandard2.0 - Microsoft.ML.DataView + 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. @@ -13,5 +14,5 @@ - + diff --git a/src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj b/src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj index 07aa31d8377..2810104dd49 100644 --- a/src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj +++ b/src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj @@ -8,6 +8,7 @@ + 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 9ea61617994..a162f54621f 100644 --- a/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj +++ b/src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj @@ -1,12 +1,24 @@ + netstandard2.0 - Microsoft.ML.DnnImageFeaturizer.AlexNet + ML.NET component for pretrained AlexNet image featurization + + + all + + + all + + + + + \ 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 348ca6d4a92..c5f51fb8f55 100644 --- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj +++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet101/Microsoft.ML.DnnImageFeaturizer.ResNet101.csproj @@ -1,12 +1,23 @@ + netstandard2.0 - Microsoft.ML.DnnImageFeaturizer.ResNet101 + 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 c415ff06ccb..370bd0b400c 100644 --- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj +++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet18/Microsoft.ML.DnnImageFeaturizer.ResNet18.csproj @@ -1,12 +1,24 @@ + netstandard2.0 - Microsoft.ML.DnnImageFeaturizer.ResNet18 + ML.NET component for pretrained ResNet18 image featurization + + + all + + + all + + + + + \ No newline at end of file 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 fce0a26b219..550ce557f63 100644 --- a/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj +++ b/src/Microsoft.ML.DnnImageFeaturizer.ResNet50/Microsoft.ML.DnnImageFeaturizer.ResNet50.csproj @@ -1,12 +1,24 @@ + netstandard2.0 - Microsoft.ML.DnnImageFeaturizer.ResNet50 + ML.NET component for pretrained ResNet50 image featurization + + + all + + + all + + + + + \ No newline at end of file diff --git a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj index cb69ad7a630..288b0c818c6 100644 --- a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj +++ b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj @@ -1,15 +1,23 @@  + netstandard2.0 - Microsoft.ML.Ensemble + 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 2dd542e4c52..33a05659e01 100644 --- a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj +++ b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj @@ -1,15 +1,26 @@  + netstandard2.0 - Microsoft.ML.EntryPoints + 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 4c1b189a5b5..e768c7298c1 100644 --- a/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj +++ b/src/Microsoft.ML.Experimental/Microsoft.ML.Experimental.csproj @@ -1,12 +1,17 @@  + netstandard2.0 - Microsoft.ML.Experimental + Microsoft.ML.Experimental contains experimental work such extension methods to access internal methods. - + + + + all + diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj index 9ba56bf8f65..6832cdf22a5 100644 --- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj +++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj @@ -1,16 +1,29 @@  + netstandard2.0 - Microsoft.ML.FastTree + ML.NET component for FastTree $(DefineConstants);USE_FASTTREENATIVE;NO_STORE;CORECLR true - - - + + + + all + + + all + + + all + - + + + + + diff --git a/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj b/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj index c40c34682fa..02eba201b6d 100644 --- a/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj +++ b/src/Microsoft.ML.Featurizers/Microsoft.ML.Featurizers.csproj @@ -1,9 +1,10 @@  + netstandard2.0;netcoreapp2.1 - Microsoft.ML.Featurizers true + ML.NET featurizers with native code implementation @@ -11,8 +12,14 @@ - - + + + + all + + + all + diff --git a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj index e32f0db25e7..ecb4944c8b2 100644 --- a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj +++ b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj @@ -1,8 +1,9 @@  + netstandard2.0 - Microsoft.ML.ImageAnalytics + ML.NET component for Image support @@ -11,8 +12,14 @@ - - + + + + all + + + all + - + diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj index 46e628fd261..45f6563c373 100644 --- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj +++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj @@ -1,16 +1,25 @@  + netstandard2.0 - Microsoft.ML.LightGbm true + ML.NET component for LightGBM - + - - + - + + + 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 907b75e11f3..6b92224b303 100644 --- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj +++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj @@ -1,15 +1,29 @@  + netstandard2.0 - Microsoft.ML.Mkl.Components true + ML.NET additional learners making use of Intel Mkl. - + + + + + + + all + + + all + + + all + + + - - - + diff --git a/pkg/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj similarity index 51% rename from pkg/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj rename to src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj index bda6fb1277d..e281e66258f 100644 --- a/pkg/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj +++ b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj @@ -1,7 +1,10 @@ + Intel + false + false netstandard2.0 LICENSE.txt $(MSBuildProjectName) contains the MKL library redistributed as a NuGet package. @@ -13,8 +16,8 @@ - - - + + + diff --git a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj index b1f49811f73..a8cdaa4b57a 100644 --- a/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj +++ b/src/Microsoft.ML.OnnxConverter/Microsoft.ML.OnnxConverter.csproj @@ -1,9 +1,10 @@ + netstandard2.0 - Microsoft.ML.OnnxConverter Microsoft.ML.Model.Onnx + ML.NET component for exporting ONNX Models @@ -11,7 +12,11 @@ - + + + + all + diff --git a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj index 7612f974eae..b6f6bb84f2c 100644 --- a/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj +++ b/src/Microsoft.ML.OnnxTransformer/Microsoft.ML.OnnxTransformer.csproj @@ -1,14 +1,21 @@  + netstandard2.0 - Microsoft.ML.OnnxTransformer true + ML.NET component for Microsoft.ML.Scoring library - - + + + + all + + + all + diff --git a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj index 9ae9b08662f..25a6c5342d8 100644 --- a/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj +++ b/src/Microsoft.ML.Parquet/Microsoft.ML.Parquet.csproj @@ -1,8 +1,9 @@  + netstandard2.0 - Microsoft.ML.Parquet + ML.NET components for Apache Parquet support. @@ -10,8 +11,14 @@ - - + + + + all + + + all + diff --git a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj index d78a44e669d..55c1d0fb8e6 100644 --- a/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj +++ b/src/Microsoft.ML.Recommender/Microsoft.ML.Recommender.csproj @@ -1,14 +1,26 @@ + netstandard2.0 - Microsoft.ML.Recommender true + LIBMF, the core computation library for matrix factorization in ML.NET - - + + + + all + + + all + + + + + + diff --git a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj index 3fb71a64426..c33cb3441d7 100644 --- a/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj +++ b/src/Microsoft.ML.SamplesUtils/Microsoft.ML.SamplesUtils.csproj @@ -1,8 +1,9 @@  + netstandard2.0 - Microsoft.ML.SampleUtils + Sample utils for Microsoft.ML.Samples @@ -10,9 +11,17 @@ - - - + + + + all + + + all + + + all + diff --git a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj index 7e018a4c03f..6b9c8a7f1d5 100644 --- a/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj +++ b/src/Microsoft.ML.TensorFlow/Microsoft.ML.TensorFlow.csproj @@ -1,10 +1,11 @@  + netstandard2.0 - Microsoft.ML.TensorFlow CORECLR true + Microsoft.ML.TensorFlow contains ML.NET integration of TensorFlow. @@ -14,9 +15,17 @@ - - - + + + + all + + + all + + + all + diff --git a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj index c5b4550c51b..c06d0006681 100644 --- a/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj +++ b/src/Microsoft.ML.TimeSeries/Microsoft.ML.TimeSeries.csproj @@ -1,13 +1,23 @@  + netstandard2.0 - Microsoft.ML.TimeSeries + Microsoft.ML.TimeSeries contains ML.NET Time Series prediction algorithms. Uses Intel Mkl. - - - + + + + + all + + + all + + + all + diff --git a/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj b/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj index a1e2ef00687..67d9285b423 100644 --- a/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj +++ b/src/Microsoft.ML.Vision/Microsoft.ML.Vision.csproj @@ -1,10 +1,11 @@  + netstandard2.0 - Microsoft.ML.Vision CORECLR true + Microsoft.ML.Vision contains high level APIs for vision tasks like image classification. @@ -13,9 +14,15 @@ - - - + + all + + + all + + + all + @@ -26,5 +33,5 @@ - + diff --git a/pkg/Microsoft.ML/Microsoft.ML.nupkgproj b/src/Microsoft.ML/Microsoft.ML.csproj similarity index 80% rename from pkg/Microsoft.ML/Microsoft.ML.nupkgproj rename to src/Microsoft.ML/Microsoft.ML.csproj index 43ad73f2485..7d67abd7d35 100644 --- a/pkg/Microsoft.ML/Microsoft.ML.nupkgproj +++ b/src/Microsoft.ML/Microsoft.ML.csproj @@ -1,13 +1,15 @@ + netstandard2.0 + false ML.NET is a cross-platform open-source machine learning framework which makes machine learning accessible to .NET developers. - - + + @@ -18,7 +20,7 @@ - + diff --git a/pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets b/src/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets similarity index 100% rename from pkg/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets rename to src/Microsoft.ML/build/netstandard2.0/Microsoft.ML.targets diff --git a/src/Native/Native.proj b/src/Native/Native.proj index f86d06ca8b0..d3554769465 100644 --- a/src/Native/Native.proj +++ b/src/Native/Native.proj @@ -1,10 +1,10 @@ - @@ -22,7 +22,7 @@ - $(PkgDir)_._ + $(RepoRoot)eng\pkg\_._ 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 index 6acbb993b52..73e591b2f8f 100644 --- a/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj +++ b/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj @@ -65,7 +65,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -85,13 +85,13 @@ - + - @@ -118,7 +118,9 @@ - + + + \ No newline at end of file diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index 390295efa92..ec3be4f3f6e 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -3,9 +3,9 @@ - - $(AllowedReferenceRelatedFileExtensions);.runtimeconfig.json;.runtimeconfig.dev.json;.deps.json + $(AllowedReferenceRelatedFileExtensions);.runtimeconfig.json;.runtimeconfig.dev.json;.deps.json \ No newline at end of file diff --git a/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj b/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj index 624384d9b50..29caed1c00f 100644 --- a/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj +++ b/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj @@ -25,6 +25,8 @@ + + diff --git a/test/Microsoft.ML.Functional.Tests/ModelFiles.cs b/test/Microsoft.ML.Functional.Tests/ModelFiles.cs index 64c86a08cda..6312073c494 100644 --- a/test/Microsoft.ML.Functional.Tests/ModelFiles.cs +++ b/test/Microsoft.ML.Functional.Tests/ModelFiles.cs @@ -68,7 +68,7 @@ public void DetermineNugetVersionFromModel() { // The only line in the file is the version of the model. var line = reader.ReadLine(); - Assert.Matches(new Regex(@"(\d+).(\d+)\.(\d+)\.(\d+) \@BuiltBy:(.)* \@SrcCode:(.)*"), line); + Assert.Matches(new Regex(@"(\d+)\.(\d+)\.(\d+)(-[dev|ci|preview\.(\d+)\.(\d+)\.(\d+)]){0,1}"), line); } } } @@ -79,8 +79,8 @@ public void DetermineNugetVersionFromModel() /// /// Serves two scenarios: /// 1. I can train a model and save it to a file, including transforms. - /// 2. Training and prediction happen in different processes (or even different machines). - /// The actual test will not run in different processes, but will simulate the idea that the + /// 2. Training and prediction happen in different processes (or even different machines). + /// The actual test will not run in different processes, but will simulate the idea that the /// "communication pipe" is just a serialized model of some form. /// [Fact] @@ -110,7 +110,7 @@ public void FitPipelineSaveModelAndPredict() serializedModel = mlContext.Model.Load(file, out var serializedSchema); TestCommon.CheckSameSchemas(data.Schema, serializedSchema); } - + // Create prediction engine and test predictions. var originalPredictionEngine = mlContext.Model.CreatePredictionEngine(model); var serializedPredictionEngine = mlContext.Model.CreatePredictionEngine(serializedModel); @@ -395,7 +395,7 @@ public void SaveCompositeLoaderAndLoad() out var loadedWithLoader, out var loadedLoaderWithTransformer); // Because we saved the transform model as part of the composite loader, with no transforms, // the transform that should be loaded should be an empty transformer chain, since the "model," - // such as it is, has been combined with the loader. + // such as it is, has been combined with the loader. Assert.Empty(Assert.IsType>(loadedWithSchema)); Assert.Empty(Assert.IsType>(loadedWithLoader)); diff --git a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj index 557c4a8ec05..c96155f76dc 100644 --- a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj +++ b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj @@ -12,10 +12,11 @@ + - + @@ -25,7 +26,7 @@ - + PreserveNewest diff --git a/test/TestFrameworkDependency.props b/test/TestFrameworkDependency.props index d71ebf26285..c815dd31668 100644 --- a/test/TestFrameworkDependency.props +++ b/test/TestFrameworkDependency.props @@ -1,6 +1,8 @@ - + + All + - + <_contractReferencePath Include="@(ReferencePath)" Condition="'%(FileName)' == '$(ContractName)'" />