diff --git a/.gitignore b/.gitignore index 16aab321..c7947855 100644 --- a/.gitignore +++ b/.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. diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 98512c56..932f456f 100644 --- a/azure-pipelines.yml +++ b/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 diff --git a/eng/Sign.proj b/eng/Sign.proj index 64c43efe..c72145f4 100644 --- a/eng/Sign.proj +++ b/eng/Sign.proj @@ -36,7 +36,7 @@ - + NuGet diff --git a/examples/Directory.Build.props b/examples/Directory.Build.props index 818c3f55..85d30b22 100644 --- a/examples/Directory.Build.props +++ b/examples/Directory.Build.props @@ -1,4 +1,8 @@ + + + False + diff --git a/examples/Microsoft.Spark.CSharp.Examples/Microsoft.Spark.CSharp.Examples.csproj b/examples/Microsoft.Spark.CSharp.Examples/Microsoft.Spark.CSharp.Examples.csproj index 06c29a9b..6264a302 100644 --- a/examples/Microsoft.Spark.CSharp.Examples/Microsoft.Spark.CSharp.Examples.csproj +++ b/examples/Microsoft.Spark.CSharp.Examples/Microsoft.Spark.CSharp.Examples.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/examples/Microsoft.Spark.FSharp.Examples/Microsoft.Spark.FSharp.Examples.fsproj b/examples/Microsoft.Spark.FSharp.Examples/Microsoft.Spark.FSharp.Examples.fsproj index cf9d33ad..1fd2790e 100644 --- a/examples/Microsoft.Spark.FSharp.Examples/Microsoft.Spark.FSharp.Examples.fsproj +++ b/examples/Microsoft.Spark.FSharp.Examples/Microsoft.Spark.FSharp.Examples.fsproj @@ -1,4 +1,4 @@ - + Exe diff --git a/src/csharp/Directory.Build.props b/src/csharp/Directory.Build.props index 96ee16e8..9f816b34 100644 --- a/src/csharp/Directory.Build.props +++ b/src/csharp/Directory.Build.props @@ -15,6 +15,14 @@ .NET for Apache Spark © Microsoft Corporation. All rights reserved. + MIT + true + https://github.com/dotnet/spark + + true + true + snupkg + $(MSBuildThisFileDirectory)..\..\eng\ true @@ -24,4 +32,8 @@ false true + + + + diff --git a/src/csharp/Microsoft.Spark.Worker/Microsoft.Spark.Worker.csproj b/src/csharp/Microsoft.Spark.Worker/Microsoft.Spark.Worker.csproj index 22f8ef08..c66dd31b 100644 --- a/src/csharp/Microsoft.Spark.Worker/Microsoft.Spark.Worker.csproj +++ b/src/csharp/Microsoft.Spark.Worker/Microsoft.Spark.Worker.csproj @@ -1,4 +1,4 @@ - + Exe @@ -6,6 +6,7 @@ netcoreapp2.1 Microsoft.Spark.Worker bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml + False diff --git a/src/csharp/Microsoft.Spark.nuspec b/src/csharp/Microsoft.Spark.nuspec deleted file mode 100644 index e0fc008f..00000000 --- a/src/csharp/Microsoft.Spark.nuspec +++ /dev/null @@ -1,28 +0,0 @@ - - - - Microsoft.Spark - 0.1.0 - Microsoft - MIT - https://github.com/dotnet/spark - true - .NET for Apache Spark - Initial release - © Microsoft Corporation. All rights reserved. - spark dotnet csharp - - - - - - - - - - - - - - - diff --git a/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj b/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj index 7c5144d6..5120fff7 100644 --- a/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj +++ b/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj @@ -1,10 +1,14 @@ - + netstandard2.0 Microsoft.Spark true bin\$(Configuration)\$(TargetFramework)\$(MSBuildProjectName).xml + + .NET for Apache Spark + Initial release + spark;dotnet;csharp @@ -15,4 +19,16 @@ + + + + + + + + + diff --git a/src/csharp/build/Microsoft.Spark.targets b/src/csharp/Microsoft.Spark/build/netstandard2.0/Microsoft.Spark.targets similarity index 66% rename from src/csharp/build/Microsoft.Spark.targets rename to src/csharp/Microsoft.Spark/build/netstandard2.0/Microsoft.Spark.targets index cc6f3eb7..e2cdac9f 100644 --- a/src/csharp/build/Microsoft.Spark.targets +++ b/src/csharp/Microsoft.Spark/build/netstandard2.0/Microsoft.Spark.targets @@ -1,6 +1,6 @@ - + PreserveNewest