Skip to content

Commit 39d3253

Browse files
eerhardteerhardt
committed
Update NuGet packages to fill out all metadata. (dotnet#115)
* Update NuGet packages to fill out all metadata. Also, a minor build change (move property ordering) to fix SourceLink with our packages. Fix dotnet#43 Fix dotnet#103 * Adding package icon URL. * Update Parquet package description. * 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.
1 parent 3970b82 commit 39d3253

File tree

5 files changed

+54
-15
lines changed

5 files changed

+54
-15
lines changed

‎Directory.Build.props

+17-13
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,29 @@
6363
<VersionSuffix Condition="'$(IncludeBuildNumberInPackageVersion)' == 'true'">$(VersionSuffix)-$(BuildNumberMajor)-$(BuildNumberMinor)</VersionSuffix>
6464
</PropertyGroup>
6565

66+
<!-- SourceLink properties used by dotnet/buildtools - need to be set before importing $(ToolsDir)versioning.props -->
67+
<PropertyGroup>
68+
<UseSourceLink>true</UseSourceLink>
69+
<GitHubRepositoryName>machinelearning</GitHubRepositoryName>
70+
</PropertyGroup>
71+
72+
<!--
73+
Source code control properties used by the .NET Core SDK to inject SCC info into the NuGet package.
74+
In future versions, these will be used for SourceLink and to generate AssemblyInfo.
75+
-->
76+
<PropertyGroup>
77+
<PrivateRepositoryUrl>https://github.com/dotnet/$(GitHubRepositoryName)</PrivateRepositoryUrl>
78+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
79+
<SourceRevisionId>$(LatestCommit)</SourceRevisionId>
80+
</PropertyGroup>
81+
6682
<!--
6783
Ensure to import versioning.props before overwriting BaseIntermediateOutputPath since
6884
the source link file exists in the root bin/obj folder.
6985
-->
7086
<Import Project="$(ToolsDir)versioning.props"
7187
Condition="Exists('$(ToolsDir)versioning.props') and '$(DisableImportVersioningProps)' != 'true'" />
72-
73-
<!-- NuGet package properties -->
74-
<PropertyGroup>
75-
<Authors>Microsoft</Authors>
76-
<IncludeSymbols>true</IncludeSymbols>
77-
</PropertyGroup>
78-
79-
<!-- SourceLink properties -->
80-
<PropertyGroup>
81-
<UseSourceLink>true</UseSourceLink>
82-
<GitHubRepositoryName>machinelearning</GitHubRepositoryName>
83-
</PropertyGroup>
84-
88+
8589
<!-- Language configuration -->
8690
<PropertyGroup>
8791
<LangVersion>latest</LangVersion> <!-- default to allowing all language features -->

‎Microsoft.ML.sln

+18
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "specs", "specs", "{2DEFC784
8585
Documentation\specs\mvp.md = Documentation\specs\mvp.md
8686
EndProjectSection
8787
EndProject
88+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{D3D38B03-B557-484D-8348-8BADEE4DF592}"
89+
ProjectSection(SolutionItems) = preProject
90+
pkg\Directory.Build.props = pkg\Directory.Build.props
91+
EndProjectSection
92+
EndProject
93+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML", "Microsoft.ML", "{DEC8F776-49F7-4D87-836C-FE4DC057D08C}"
94+
ProjectSection(SolutionItems) = preProject
95+
pkg\Microsoft.ML\Microsoft.ML.nupkgproj = pkg\Microsoft.ML\Microsoft.ML.nupkgproj
96+
pkg\Microsoft.ML\Microsoft.ML.symbols.nupkgproj = pkg\Microsoft.ML\Microsoft.ML.symbols.nupkgproj
97+
EndProjectSection
98+
EndProject
99+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Parquet", "Microsoft.ML.Parquet", "{6C95FC87-F5F2-4EEF-BB97-567F2F5DD141}"
100+
ProjectSection(SolutionItems) = preProject
101+
pkg\Microsoft.ML.Parquet\Microsoft.ML.Parquet.nupkgproj = pkg\Microsoft.ML.Parquet\Microsoft.ML.Parquet.nupkgproj
102+
EndProjectSection
103+
EndProject
88104
Global
89105
GlobalSection(SolutionConfigurationPlatforms) = preSolution
90106
Debug|Any CPU = Debug|Any CPU
@@ -210,6 +226,8 @@ Global
210226
{52794B40-AB8A-41AF-9EF7-799C80D6E0BC} = {E20AF96D-3F66-4065-8A89-BEE479D74536}
211227
{DB751004-5D49-4B88-B78F-29CA9887087D} = {E20AF96D-3F66-4065-8A89-BEE479D74536}
212228
{2DEFC784-F2B5-44EA-ABBB-0DCF3E689DAC} = {E20AF96D-3F66-4065-8A89-BEE479D74536}
229+
{DEC8F776-49F7-4D87-836C-FE4DC057D08C} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
230+
{6C95FC87-F5F2-4EEF-BB97-567F2F5DD141} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
213231
EndGlobalSection
214232
GlobalSection(ExtensibilityGlobals) = postSolution
215233
SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}

‎pkg/Directory.Build.props

+17
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,23 @@
55
<NoBuild>true</NoBuild>
66
<IncludeBuildOutput>false</IncludeBuildOutput>
77
<IncludeSymbols>false</IncludeSymbols>
8+
9+
<!--
10+
Our .nupkgproj files have conflicting names with src projects, which puts their intermediate
11+
output in the same folder (like project.assets.json). Override the intermediate output to
12+
make it unique for the .nupkgprojs.
13+
-->
14+
<IntermediateOutputPath>$(IntermediateOutputRootPath)$(MSBuildProjectName).NupkgProj\</IntermediateOutputPath>
15+
<BaseIntermediateOutputPath>$(IntermediateOutputPath)</BaseIntermediateOutputPath>
16+
</PropertyGroup>
17+
18+
<!-- nuspec properties -->
19+
<PropertyGroup>
20+
<Authors>Microsoft</Authors>
21+
<PackageLicenseUrl>https://github.com/dotnet/machinelearning/blob/master/LICENSE</PackageLicenseUrl>
22+
<PackageProjectUrl>https://dot.net/ml</PackageProjectUrl>
23+
<PackageIconUrl>https://aka.ms/mlnetlogo</PackageIconUrl>
24+
<PackageReleaseNotes>https://github.com/dotnet/machinelearning/tree/master/Documentation/release-notes</PackageReleaseNotes>
825
</PropertyGroup>
926

1027
<!-- Work around https://github.com/NuGet/Home/issues/6091 -->

‎pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.nupkgproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<NoBuild>true</NoBuild>
6-
<IncludeBuildOutput>false</IncludeBuildOutput>
5+
<PackageDescription>ML.NET components for Apache Parquet support.</PackageDescription>
76
</PropertyGroup>
87

98
<ItemGroup>

‎pkg/Microsoft.ML/Microsoft.ML.nupkgproj

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

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

78
<ItemGroup>

0 commit comments

Comments
 (0)