From f257d2ac029118b295c4af4d26bf639bcf9bc110 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 9 May 2018 17:55:16 -0500 Subject: [PATCH 1/4] Update NuGet packages to fill out all metadata. Also, a minor build change (move property ordering) to fix SourceLink with our packages. Fix #43 Fix #103 --- Directory.Build.props | 20 +++++++------------ Microsoft.ML.sln | 18 +++++++++++++++++ pkg/Directory.Build.props | 9 +++++++++ .../Microsoft.ML.Parquet.nupkgproj | 3 +-- pkg/Microsoft.ML/Microsoft.ML.nupkgproj | 1 + 5 files changed, 36 insertions(+), 15 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index bc5a641246..334e460b23 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -63,25 +63,19 @@ $(VersionSuffix)-$(BuildNumberMajor)-$(BuildNumberMinor) + + + true + machinelearning + + - - - - Microsoft - true - - - - - true - machinelearning - - + latest diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln index 631f75088e..3e905b7328 100644 --- a/Microsoft.ML.sln +++ b/Microsoft.ML.sln @@ -85,6 +85,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "specs", "specs", "{2DEFC784 Documentation\specs\mvp.md = Documentation\specs\mvp.md EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{D3D38B03-B557-484D-8348-8BADEE4DF592}" + ProjectSection(SolutionItems) = preProject + pkg\Directory.Build.props = pkg\Directory.Build.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML", "Microsoft.ML", "{DEC8F776-49F7-4D87-836C-FE4DC057D08C}" + ProjectSection(SolutionItems) = preProject + pkg\Microsoft.ML\Microsoft.ML.nupkgproj = pkg\Microsoft.ML\Microsoft.ML.nupkgproj + pkg\Microsoft.ML\Microsoft.ML.symbols.nupkgproj = pkg\Microsoft.ML\Microsoft.ML.symbols.nupkgproj + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Parquet", "Microsoft.ML.Parquet", "{6C95FC87-F5F2-4EEF-BB97-567F2F5DD141}" + ProjectSection(SolutionItems) = preProject + pkg\Microsoft.ML.Parquet\Microsoft.ML.Parquet.nupkgproj = pkg\Microsoft.ML.Parquet\Microsoft.ML.Parquet.nupkgproj + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -210,6 +226,8 @@ Global {52794B40-AB8A-41AF-9EF7-799C80D6E0BC} = {E20AF96D-3F66-4065-8A89-BEE479D74536} {DB751004-5D49-4B88-B78F-29CA9887087D} = {E20AF96D-3F66-4065-8A89-BEE479D74536} {2DEFC784-F2B5-44EA-ABBB-0DCF3E689DAC} = {E20AF96D-3F66-4065-8A89-BEE479D74536} + {DEC8F776-49F7-4D87-836C-FE4DC057D08C} = {D3D38B03-B557-484D-8348-8BADEE4DF592} + {6C95FC87-F5F2-4EEF-BB97-567F2F5DD141} = {D3D38B03-B557-484D-8348-8BADEE4DF592} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D} diff --git a/pkg/Directory.Build.props b/pkg/Directory.Build.props index 34ddf4281d..f54b77974c 100644 --- a/pkg/Directory.Build.props +++ b/pkg/Directory.Build.props @@ -7,6 +7,15 @@ false + + + Microsoft + https://github.com/dotnet/machinelearning/blob/master/LICENSE + http://dot.net/ml + + https://github.com/dotnet/machinelearning/tree/master/Documentation/release-notes + + diff --git a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj b/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj index 03a15f830f..f1a56dedc8 100644 --- a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj +++ b/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj @@ -2,8 +2,7 @@ netstandard2.0 - true - false + A set of Apache Parquet components for ML.NET. diff --git a/pkg/Microsoft.ML/Microsoft.ML.nupkgproj b/pkg/Microsoft.ML/Microsoft.ML.nupkgproj index f2a873a6df..651f48da97 100644 --- a/pkg/Microsoft.ML/Microsoft.ML.nupkgproj +++ b/pkg/Microsoft.ML/Microsoft.ML.nupkgproj @@ -2,6 +2,7 @@ netstandard2.0 + ML.NET is a cross-platform open-source machine learning framework which makes machine learning accessible to .NET developers. From 5781cbdd324cbee4968b3e41145571304aac6d02 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 10 May 2018 15:10:03 -0500 Subject: [PATCH 2/4] Adding package icon URL. --- pkg/Directory.Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/Directory.Build.props b/pkg/Directory.Build.props index f54b77974c..04a795b7f2 100644 --- a/pkg/Directory.Build.props +++ b/pkg/Directory.Build.props @@ -11,8 +11,8 @@ Microsoft https://github.com/dotnet/machinelearning/blob/master/LICENSE - http://dot.net/ml - + https://dot.net/ml + https://aka.ms/mlnetlogo https://github.com/dotnet/machinelearning/tree/master/Documentation/release-notes From 5ca8f818622abe2bb1dc0fcd7edb1f0c69771211 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 10 May 2018 16:54:12 -0500 Subject: [PATCH 3/4] Update Parquet package description. --- pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj b/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj index f1a56dedc8..fb73fd2230 100644 --- a/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj +++ b/pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj @@ -2,7 +2,7 @@ netstandard2.0 - A set of Apache Parquet components for ML.NET. + ML.NET components for Apache Parquet support. From 4761f25c280daed528322ad3e83b9d2da7d3b721 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 11 May 2018 10:05:16 -0500 Subject: [PATCH 4/4] Add source code control properties to the NuGet packages. Also, fix a small bug with the nupkgproj files. The intermediate output folders conflict between the nupkgproj and csproj with the same name. This causes issues because the project.assets.json file is being shared between the two projects, which isn't correct. --- Directory.Build.props | 12 +++++++++++- pkg/Directory.Build.props | 8 ++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 334e460b23..a37097204f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -63,12 +63,22 @@ $(VersionSuffix)-$(BuildNumberMajor)-$(BuildNumberMinor) - + true machinelearning + + + https://github.com/dotnet/$(GitHubRepositoryName) + true + $(LatestCommit) + + + $(IntermediateOutputRootPath)$(MSBuildProjectName).NupkgProj\ + $(IntermediateOutputPath)