Skip to content
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

Jump to bottom

Adds mlnet src and test projects from feature branch #4496

Closed
wants to merge 9 commits into from
Closed

Adds mlnet src and test projects from feature branch #4496

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f6dc065
Add mlnet src project
maryamariyan Nov 22, 2019
143ed37
Add mlnet.Tests test project
maryamariyan Nov 22, 2019
f78df09
Fix header license on files
maryamariyan Nov 22, 2019
1d2f54a
Simplify csproj
maryamariyan Nov 22, 2019
fdc8c2f
pack mlnet
maryamariyan Nov 22, 2019
35b53e7
add commandline args and verify simple use case
maryamariyan Dec 18, 2019
80eb758
simplify mlnet nupkgproj
maryamariyan Dec 18, 2019
ca085f1
tested installed package and mlnet.dll directly for win-64
maryamariyan Dec 19, 2019
1680b5d
Merge remote-tracking branch 'upstream/master' into add-mlnet
maryamariyan Jan 3, 2020
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
7 changes: 7 additions & 0 deletions Microsoft.ML.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mlnet", "src\mlnet\mlnet.cs
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mlnet.Tests", "test\mlnet.Tests\mlnet.Tests.csproj", "{ED9F2605-52E3-46AF-AA1C-D0B98D387E65}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mlnet", "mlnet", "{B69EAEAB-5269-4175-9494-4AF34F2E476A}"
ProjectSection(SolutionItems) = preProject
pkg\mlnet\mlnet.nupkgproj = pkg\mlnet\mlnet.nupkgproj
pkg\mlnet\mlnet.symbols.nupkgproj = pkg\mlnet\mlnet.symbols.nupkgproj
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1911,6 +1917,7 @@ Global
{027DBA48-85B6-46F1-9487-0B49B5057FC0} = {C91F81E3-B900-4968-A6DF-F53B515E97E1}
{ACC3E9F6-1CAA-4D6F-8EFC-122F7DA00268} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
{ED9F2605-52E3-46AF-AA1C-D0B98D387E65} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
{B69EAEAB-5269-4175-9494-4AF34F2E476A} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
Expand Down
27 changes: 27 additions & 0 deletions pkg/mlnet/mlnet.nupkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
  <PropertyGroup>
    <TargetFramework>netcoreapp2.1</TargetFramework>
    <PackageDescription>ML.NET command line tool.</PackageDescription>
    <PackageType>DotNetCliTool</PackageType>
    <ToolCommandName>mlnet</ToolCommandName>
    <PackAsTool>true</PackAsTool>
    <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
    <GenerateDependencyFile>false</GenerateDependencyFile>
    <CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
  </PropertyGroup>

<ItemGroup>
<ProjectReference Include="../Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.nupkgproj" />
</ItemGroup>

  <ItemGroup>
<PackageReference Include="NLog" Version="$(NLogVersion)" />
<PackageReference Include="System.CommandLine.Experimental" Version="$(SystemCommandLineExperimentalVersion)" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesVersion)" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="$(MicrosoftApplicationInsightsVersion)" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsVersion)" />
  </ItemGroup>

  <Target Name="CreateManifestResourceNames" />
maryamariyan marked this conversation as resolved.
Show resolved Hide resolved
</Project>
10 changes: 10 additions & 0 deletions pkg/mlnet/mlnet.symbols.nupkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
  <ItemGroup>
<Content Remove="$(PackageAssetsPath)$(PackageIdFolderName)\tools\**\*"/>
<Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\tools\**\mlnet.dll" Pack="true" PackagePath="tools" />
<Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\tools\**\mlnet.pdb" Pack="true" PackagePath="tools" />
  </ItemGroup>
</Project>