@@ -288,54 +288,42 @@ Task("DotnetPack")
288288 }
289289} ) ;
290290
291+ /// <summary>
292+ /// Packages projects specified in FxBuildProjects using available Nuspecs, these projects require that publishing be done first. Note that we
293+ /// don't do the publishing here because we need the binaries to be signed before being packaged up and that is done by the pipeline
294+ /// currently.
295+ /// </summary>
291296Task ( "NugetPackNuspec" )
297+ . IsDependentOn ( "DotnetPack" )
292298 . Does ( ( ) =>
293299{
294- Information ( "NugetPackNuspec: Skipped." ) ;
300+ foreach ( var project in buildPlan . FxBuildProjects )
301+ {
302+ if ( project . SkipPack != null && project . SkipPack )
303+ {
304+ continue ;
305+ }
306+ // For now, putting all nugets in the 1 directory
307+ var outputFolder = System . IO . Path . Combine ( nugetPackageFolder ) ;
308+ var projectFolder = System . IO . Path . Combine ( packagesFolder , project . Name ) ;
309+ NugetPackNuspec ( outputFolder , projectFolder , project . Name ) ;
310+ }
295311} ) ;
296312
313+ /// <summary>
314+ /// Packages dotnet tool projects specified in DotnetToolProjects.
315+ /// </summary>
297316Task ( "DotnetPackServiceTools" )
298317 . Does ( ( ) =>
299318{
300- Information ( "DotnetPackServiceTools: Skipped." ) ;
319+ foreach ( var project in buildPlan . DotnetToolProjects )
320+ {
321+ var outputFolder = System . IO . Path . Combine ( nugetPackageFolder ) ;
322+ var projectFolder = System . IO . Path . Combine ( sourceFolder , project ) ;
323+ DotnetPackNoBuild ( outputFolder , projectFolder , project ) ;
324+ }
301325} ) ;
302326
303-
304- // /// <summary>
305- // /// Packages projects specified in FxBuildProjects using available Nuspecs, these projects require that publishing be done first. Note that we
306- // /// don't do the publishing here because we need the binaries to be signed before being packaged up and that is done by the pipeline
307- // /// currently.
308- // /// </summary>
309- // Task("NugetPackNuspec")
310- // .IsDependentOn("DotnetPack")
311- // .Does(() =>
312- // {
313- // foreach (var project in buildPlan.FxBuildProjects)
314- // {
315- // if (project.SkipPack != null && project.SkipPack)
316- // {
317- // continue;
318- // }
319- // // For now, putting all nugets in the 1 directory
320- // var outputFolder = System.IO.Path.Combine(nugetPackageFolder);
321- // var projectFolder = System.IO.Path.Combine(packagesFolder, project.Name);
322- // NugetPackNuspec(outputFolder, projectFolder, project.Name);
323- // }
324- // });
325- // /// <summary>
326- // /// Packages dotnet tool projects specified in DotnetToolProjects.
327- // /// </summary>
328- // Task("DotnetPackServiceTools")
329- // .Does(() =>
330- // {
331- // foreach (var project in buildPlan.DotnetToolProjects)
332- // {
333- // var outputFolder = System.IO.Path.Combine(nugetPackageFolder);
334- // var projectFolder = System.IO.Path.Combine(sourceFolder, project);
335- // DotnetPackNoBuild(outputFolder, projectFolder, project);
336- // }
337- // });
338-
339327/// <summary>
340328/// Run all tests for .NET Desktop and .NET Core
341329/// </summary>
0 commit comments