Skip to content

Commit 48a000f

Browse files
committed
mlnet CLI nupkg creation/signing (dotnet#3606)
* mlnet CLI nupkg creation/signing * relmove includeinpackage from mlnet csproj * address PR comments -- some minor reshuffling of stuff * publish symbols for mlnet CLI * fix case in NLog.config
1 parent 3be3323 commit 48a000f

File tree

5 files changed

+62
-5
lines changed

5 files changed

+62
-5
lines changed

pkg/mlnet/mlnet.nupkgproj

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
2+
  <PropertyGroup>
3+
    <TargetFramework>netcoreapp2.1</TargetFramework>
4+
    <PackageDescription>ML.NET command line tool.</PackageDescription>
5+
    <PackageType>DotNetCliTool</PackageType>
6+
    <ToolCommandName>mlnet</ToolCommandName>
7+
    <PackAsTool>true</PackAsTool>
8+
    <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
9+
    <GenerateDependencyFile>false</GenerateDependencyFile>
10+
    <CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
11+
  </PropertyGroup>
12+
13+
  <ItemGroup>
14+
    <PackageReference Include="Microsoft.CodeAnalysis" Version="2.10.0" />
15+
    <PackageReference Include="NLog" Version="4.5.11" />
16+
    <PackageReference Include="System.CodeDom" Version="4.5.0" />
17+
    <PackageReference Include="System.CommandLine.Experimental" Version="0.2.0-alpha.19174.3" />
18+
    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
19+
    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
20+
    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
21+
<!-- references from AutoML -->
22+
<PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
23+
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
24+
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
25+
  </ItemGroup>
26+
27+
  <Target Name="CreateManifestResourceNames" />
28+
</Project>

pkg/mlnet/mlnet.symbols.nupkgproj

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
2+
<PropertyGroup>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
</PropertyGroup>
5+
  <ItemGroup>
6+
<Content Remove="$(PackageAssetsPath)$(PackageIdFolderName)\tools\**\*"/>
7+
<Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\tools\**\mlnet.dll" Pack="true" PackagePath="tools" />
8+
<Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\tools\**\mlnet.pdb" Pack="true" PackagePath="tools" />
9+
  </ItemGroup>
10+
</Project>

src/Microsoft.ML.Auto/Microsoft.ML.Auto.csproj

+9-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,13 @@
1919
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2020
</PropertyGroup>
2121

22-
22+
<!-- here we place this assembly into CLI package dir so it gets included in CLI nuget -->
23+
<Import Project="..\mlnet\mlnet.Build.props" />
24+
25+
<Target Name="PrepareMlNetCLIPackageAssets" BeforeTargets="PreparePackageAssets">
26+
<ItemGroup>
27+
<PackageAsset Include="$(TargetPath)" RelativePath="$(MlNetPackagePath)" />
28+
</ItemGroup>
29+
</Target>
30+
2331
</Project>

src/mlnet/mlnet.Build.props

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<MlNetPackagePath>mlnet\tools\netcoreapp2.1\any\</MlNetPackagePath>
4+
</PropertyGroup>
5+
</Project>

src/mlnet/mlnet.csproj

+10-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp2.1</TargetFramework>
6-
<PackAsTool>true</PackAsTool>
76
<RootNamespace>Microsoft.ML.CLI</RootNamespace>
8-
<ToolCommandName>mlnet</ToolCommandName>
9-
<PackageId>mlnet</PackageId>
10-
<Authors>mlnet</Authors>
117
<!-- TODO: make the code compliant and remove the following two lines: -->
128
<UseStyleCopAnalyzer>false</UseStyleCopAnalyzer>
139
<UseMLCodeAnalyzer>false</UseMLCodeAnalyzer>
@@ -106,4 +102,14 @@
106102
</None>
107103
</ItemGroup>
108104

105+
<Import Project="mlnet.Build.props" />
106+
<Target Name="PrepareMlNetCLIPackageAssets" BeforeTargets="PreparePackageAssets">
107+
<ItemGroup>
108+
<PackageAsset Include="$(TargetPath)" RelativePath="$(MlNetPackagePath)" />
109+
<PackageAsset Include="$(ProjectDepsFilePath)" RelativePath="$(MlNetPackagePath)" />
110+
<PackageAsset Include="$(ProjectRuntimeConfigFilePath)" RelativePath="$(MlNetPackagePath)" />
111+
<PackageAsset Include="$(TargetDir)\NLog.config" RelativePath="$(MlNetPackagePath)" />
112+
<PackageAsset Include="$(TargetDir)\mlnet.pdb" RelativePath="$(MlNetPackagePath)" />
113+
</ItemGroup>
114+
</Target>
109115
</Project>

0 commit comments

Comments
 (0)