Migrated nuspec to csproj and improved packaging (#54)

.gitignore

@@ -180,6 +180,8 @@ PublishScripts/
 
 # NuGet Packages
 *.nupkg
+# NuGet Symbol Packages
+*.snupkg
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.

azure-pipelines.yml

@@ -179,10 +179,6 @@ jobs:
         contents: '**/*.jar'
         targetFolder: $(Build.SourcesDirectory)/src/scala
 
-    - task: NuGetToolInstaller@0
-      inputs:
-        versionSpec: '4.9.2'
-
     - task: MicroBuildSigningPlugin@2
       displayName: Install MicroBuild plugin
       inputs:
@@ -204,7 +200,7 @@ jobs:
       displayName: 'Sign .NET binaries'
       inputs:
         solution: eng/Sign.proj
-        msbuildArguments:  /t:SignBinaries
+        msbuildArguments: /t:SignBinaries
                           /p:SignSparkBinaries=true
                           /p:SignAssetsDir=$(Build.SourcesDirectory)\src\csharp\Microsoft.Spark\bin\$(buildConfiguration)\
                           /p:SignType=$(_SignType)
@@ -230,10 +226,12 @@ jobs:
                           /p:SignType=$(_SignType)
         msbuildVersion: 15.0
 
-    - task: NuGetCommand@2
+    - task: DotNetCoreCLI@2
+      displayName: 'Create NuGet packages'
       inputs:
         command: pack
-        packagesToPack: '$(Build.SourcesDirectory)\src\csharp\Microsoft.Spark.nuspec'
+        projects: '$(solution)'
+        arguments: '--no-build --configuration $(buildConfiguration) --output $(Build.ArtifactStagingDirectory)'
 
     - task: MSBuild@1
       displayName: 'Sign nuget packages'
@@ -251,13 +249,25 @@ jobs:
         sourceFolder: $(Build.ArtifactStagingDirectory)
         contents: 'Microsoft.Spark*.nupkg'
         targetFolder: $(Build.ArtifactStagingDirectory)/Packages
-    
+
+    - task: CopyFiles@2
+      displayName: Copy snupkg to publish
+      inputs:
+        sourceFolder: $(Build.ArtifactStagingDirectory)
+        contents: 'Microsoft.Spark*.snupkg'
+        targetFolder: $(Build.ArtifactStagingDirectory)/SymbolPackages
+
     - task: PublishBuildArtifacts@1
       inputs:
         pathtoPublish: '$(Build.ArtifactStagingDirectory)/Microsoft.Spark.Binaries'
         artifactName:  Microsoft.Spark.Binaries
-    
+
     - task: PublishBuildArtifacts@1
       inputs:
         pathtoPublish: '$(Build.ArtifactStagingDirectory)/Packages'
         artifactName:  Microsoft.Spark.Binaries
+
+    - task: PublishBuildArtifacts@1
+      inputs:
+        pathtoPublish: '$(Build.ArtifactStagingDirectory)/SymbolPackages'
+        artifactName:  Microsoft.Spark.Binaries

eng/Sign.proj

@@ -36,7 +36,7 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(SignNugetPackages)' == 'true'">
-      <FilesToSign Include="$(OutDir)*.nupkg" Exclude="$(OutDir)*.symbols.nupkg">
+      <FilesToSign Include="$(OutDir)*.nupkg">
         <Authenticode>NuGet</Authenticode>
       </FilesToSign>
     </ItemGroup>

examples/Directory.Build.props

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="ExcludeRestorePackageImports">
   <Import Project="..\src\csharp\Directory.Build.props" />
+
+  <PropertyGroup>
+    <IsPackable>False</IsPackable>
+  </PropertyGroup>
 </Project>

examples/Microsoft.Spark.CSharp.Examples/Microsoft.Spark.CSharp.Examples.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

examples/Microsoft.Spark.FSharp.Examples/Microsoft.Spark.FSharp.Examples.fsproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

src/csharp/Directory.Build.props

@@ -15,6 +15,14 @@
     <Product>.NET for Apache Spark</Product>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
 
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RequireLicenseAcceptance>true</RequireLicenseAcceptance>
+    <PackageProjectUrl>https://github.com/dotnet/spark</PackageProjectUrl>
+    
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
     <EngDir>$(MSBuildThisFileDirectory)..\..\eng\</EngDir>
     <IsTestProject Condition="$(MSBuildProjectName.EndsWith('Test'))">true</IsTestProject>
     
@@ -24,4 +32,8 @@
     <DelaySign>false</DelaySign>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
   </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)..\..\THIRD-PARTY-NOTICES.TXT" Pack="true" PackagePath="\" />
+  </ItemGroup>
 </Project>

src/csharp/Microsoft.Spark.Worker/Microsoft.Spark.Worker.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -6,6 +6,7 @@
     <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
     <RootNamespace>Microsoft.Spark.Worker</RootNamespace>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml</DocumentationFile>
+    <IsPackable>False</IsPackable>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.1' ">

src/csharp/Microsoft.Spark.nuspec

@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.Spark</id>
-    <version>0.1.0</version>
-    <authors>Microsoft</authors>
-    <license type="expression">MIT</license>
-    <projectUrl>https://github.com/dotnet/spark</projectUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>.NET for Apache Spark</description>
-    <releaseNotes>Initial release</releaseNotes>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <tags>spark dotnet csharp</tags>
-    <dependencies>
-      <dependency id="Newtonsoft.Json" version="11.0.2" />
-      <dependency id="System.Configuration.ConfigurationManager" version="4.5.0" />
-      <dependency id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" />
-      <dependency id="Apache.Arrow" version="0.13.0" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="Microsoft.Spark\bin\Release\netstandard2.0\Microsoft.Spark.dll" target="lib\netstandard2.0" />
-    <file src="Microsoft.Spark\bin\Release\netstandard2.0\Microsoft.Spark.pdb" target="lib\netstandard2.0" />
-    <file src="..\scala\microsoft-spark-2.3.x\target\microsoft-spark-2.3.x-0.1.0.jar" target="jars" />
-    <file src="..\scala\microsoft-spark-2.4.x\target\microsoft-spark-2.4.x-0.1.0.jar" target="jars" />
-    <file src="build\**" target="build" />
-  </files>
-</package>

src/csharp/Microsoft.Spark/Microsoft.Spark.csproj

@@ -1,10 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Microsoft.Spark</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml</DocumentationFile>
+
+    <Description>.NET for Apache Spark</Description>
+    <PackageReleaseNotes>Initial release</PackageReleaseNotes>
+    <PackageTags>spark;dotnet;csharp</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,4 +19,16 @@
     <PackageReference Include="System.Memory" Version="4.5.2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="..\..\scala\microsoft-spark-*\target\microsoft-spark-*.jar"
+             Link="jars\%(Filename)%(Extension)"
+             Pack="true"
+             PackagePath="jars\%(Filename)%(Extension)" />
+    <Content Include="build\**" Pack="true" PackagePath="build" />
+  </ItemGroup>
+
 </Project>

src/csharp/Microsoft.Spark/build/netstandard2.0/Microsoft.Spark.targets

@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)../jars/microsoft-spark*.jar">
+    <None Include="$(MSBuildThisFileDirectory)../../jars/microsoft-spark*.jar">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>