Skip to content

Add Parquet symbols nuget package. #145

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 1 commit into from
May 14, 2018
Merged

Add Parquet symbols nuget package. #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions pkg/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>

<IsSymbolsPackage Condition="$(MSBuildProjectName.Contains('.symbols'))">true</IsSymbolsPackage>
<PackageIdFolderName>$(MSBuildProjectName.Replace('.symbols', ''))</PackageIdFolderName>

<!--
Our .nupkgproj files have conflicting names with src projects, which puts their intermediate
output in the same folder (like project.assets.json). Override the intermediate output to
Expand All @@ -24,6 +27,17 @@
<PackageReleaseNotes>https://github.com/dotnet/machinelearning/tree/master/Documentation/release-notes</PackageReleaseNotes>
</PropertyGroup>

<ItemGroup>
<Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\lib\**\*" Pack="true" PackagePath="lib" />
<Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\**\*" Pack="true" PackagePath="runtimes" />
</ItemGroup>

<ItemGroup Condition="'$(IsSymbolsPackage)' != 'true'">
Copy link
Contributor

Choose a reason for hiding this comment

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

there will be some symbols with the extension .dll, this wont remove them

Copy link
Member Author

Choose a reason for hiding this comment

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

what symbols have an extension of .dll?

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry, my bad I got confused.

<Content Remove="$(PackageAssetsPath)$(PackageIdFolderName)\**\*.pdb" />
<Content Remove="$(PackageAssetsPath)$(PackageIdFolderName)\**\*.dwarf" />
<Content Remove="$(PackageAssetsPath)$(PackageIdFolderName)\**\*.dbg" />
</ItemGroup>

<!-- Work around https://github.com/NuGet/Home/issues/6091 -->
<ItemDefinitionGroup>
<PackageReference>
Expand Down
6 changes: 0 additions & 6 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 @@ -10,10 +10,4 @@
<PackageReference Include="Parquet.Net" Version="$(ParquetDotNetPackageVersion)" />
</ItemGroup>

<ItemGroup>
<Content Include="$(PackageAssetsPath)$(MSBuildProjectName)\lib\**\*" Pack="true" PackagePath="lib" />
<Content Include="$(PackageAssetsPath)$(MSBuildProjectName)\lib\**\*.xml" Pack="true" PackagePath="lib" />
<Content Include="$(PackageAssetsPath)$(MSBuildProjectName)\runtimes\**\*" Pack="true" PackagePath="runtimes" />
</ItemGroup>

</Project>
5 changes: 5 additions & 0 deletions pkg/Microsoft.ML.Parquet/Microsoft.ML.Parquet.symbols.nupkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project DefaultTargets="Pack">

<Import Project="Microsoft.ML.Parquet.nupkgproj" />

</Project>
10 changes: 1 addition & 9 deletions pkg/Microsoft.ML/Microsoft.ML.nupkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,7 @@
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPackageVersion)" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowPackageVersion)" />
<PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
<PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
</ItemGroup>

<ItemGroup>
<Content Include="$(PackageAssetsPath)$(MSBuildProjectName)\lib\**\*.dll" Pack="true" PackagePath="lib" />
<Content Include="$(PackageAssetsPath)$(MSBuildProjectName)\lib\**\*.xml" Pack="true" PackagePath="lib" />
<Content Include="$(PackageAssetsPath)$(MSBuildProjectName)\runtimes\**\*.dll" Pack="true" PackagePath="runtimes" />
<Content Include="$(PackageAssetsPath)$(MSBuildProjectName)\runtimes\**\*.dylib" Pack="true" PackagePath="runtimes" />
<Content Include="$(PackageAssetsPath)$(MSBuildProjectName)\runtimes\**\*.so" Pack="true" PackagePath="runtimes" />
<PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
</ItemGroup>

</Project>
11 changes: 1 addition & 10 deletions pkg/Microsoft.ML/Microsoft.ML.symbols.nupkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
<Project DefaultTargets="Pack">

<Import Project="Microsoft.ML.nupkgproj" />

<PropertyGroup>
<MSBuildProjectNameWithoutSymbols>$(MSBuildProjectName.Replace('.symbols', ''))</MSBuildProjectNameWithoutSymbols>
</PropertyGroup>

<ItemGroup>
<Content Include="$(PackageAssetsPath)$(MSBuildProjectNameWithoutSymbols)\lib\**\*" Pack="true" PackagePath="lib" />
<Content Include="$(PackageAssetsPath)$(MSBuildProjectNameWithoutSymbols)\runtimes\**\*" Pack="true" PackagePath="runtimes" />
</ItemGroup>

</Project>