Skip to content

Update NuGet packages to fill out all metadata. #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 14, 2018
Merged

Update NuGet packages to fill out all metadata. #115

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f257d2a
Update NuGet packages to fill out all metadata.
eerhardt May 9, 2018
5781cbd
Adding package icon URL.
eerhardt May 10, 2018
5ca8f81
Update Parquet package description.
eerhardt May 10, 2018
761c86d
Merge remote-tracking branch 'upstream/master' into FixNuGetPackages
eerhardt May 10, 2018
4761f25
Add source code control properties to the NuGet packages.
eerhardt May 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,25 +63,19 @@
<VersionSuffix Condition="'$(IncludeBuildNumberInPackageVersion)' == 'true'">$(VersionSuffix)-$(BuildNumberMajor)-$(BuildNumberMinor)</VersionSuffix>
</PropertyGroup>

<!-- SourceLink properties - need to be set before importing $(ToolsDir)versioning.props -->
<PropertyGroup>
<UseSourceLink>true</UseSourceLink>
<GitHubRepositoryName>machinelearning</GitHubRepositoryName>
</PropertyGroup>

<!--
Ensure to import versioning.props before overwriting BaseIntermediateOutputPath since
the source link file exists in the root bin/obj folder.
-->
<Import Project="$(ToolsDir)versioning.props"
Condition="Exists('$(ToolsDir)versioning.props') and '$(DisableImportVersioningProps)' != 'true'" />

<!-- NuGet package properties -->
<PropertyGroup>
<Authors>Microsoft</Authors>
<IncludeSymbols>true</IncludeSymbols>
</PropertyGroup>

<!-- SourceLink properties -->
<PropertyGroup>
<UseSourceLink>true</UseSourceLink>
<GitHubRepositoryName>machinelearning</GitHubRepositoryName>
</PropertyGroup>


<!-- Language configuration -->
<PropertyGroup>
<LangVersion>latest</LangVersion> <!-- default to allowing all language features -->
Expand Down
18 changes: 18 additions & 0 deletions Microsoft.ML.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
9 changes: 9 additions & 0 deletions pkg/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@
<IncludeSymbols>false</IncludeSymbols>
</PropertyGroup>

<!-- nuspec properties -->
<PropertyGroup>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PropertyGroup [](start = 3, length = 13)

Just curious, does anything here in the nuspec make it clear to consumers of the nuget not only what repository it comes from, but what the commithash was on build? Not sure if that's buried somewhere in here, if it was it wasn't obvious.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a new NuGet feature with the 2.1.200 SDK that just got merged that will put the commit hash and repo in the nuspec file.

I'll update this PR to set these properties as well.

See these random collection of links about this:

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice, thanks @eerhardt .

<Authors>Microsoft</Authors>
<PackageLicenseUrl>https://github.com/dotnet/machinelearning/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://dot.net/ml</PackageProjectUrl>
<PackageIconUrl>https://aka.ms/mlnetlogo</PackageIconUrl>
<PackageReleaseNotes>https://github.com/dotnet/machinelearning/tree/master/Documentation/release-notes</PackageReleaseNotes>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have 2 suggested solutions to the package release notes problem listed here:

https://github.com/dotnet/corefx/issues/29314#issuecomment-387898104

I am taking the first approach for now (pointing to the root of the release-notes folder). If we agree on the templating approach, we can change it.

</PropertyGroup>

<!-- Work around https://github.com/NuGet/Home/issues/6091 -->
<ItemDefinitionGroup>
<PackageReference>
Expand Down
3 changes: 1 addition & 2 deletions pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<NoBuild>true</NoBuild>
<IncludeBuildOutput>false</IncludeBuildOutput>
<PackageDescription>ML.NET components for Apache Parquet support.</PackageDescription>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions pkg/Microsoft.ML/Microsoft.ML.nupkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageDescription>ML.NET is a cross-platform open-source machine learning framework which makes machine learning accessible to .NET developers.</PackageDescription>
</PropertyGroup>

<ItemGroup>
Expand Down