Skip to content

Commit d1b42da

Browse files
committed
Revert "Turn of nuget"
This reverts commit ef12135.
1 parent ef12135 commit d1b42da

File tree

2 files changed

+26
-39
lines changed

2 files changed

+26
-39
lines changed

Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<!-- This is required for IDE0005 to fail the build https://github.com/dotnet/roslyn/issues/41640 -->
3434
<GenerateDocumentationFile>true</GenerateDocumentationFile>
3535
<Nullable>enable</Nullable>
36-
<IsPackable>false</IsPackable>
3736
</PropertyGroup>
3837

3938
<!-- For official builds we want to set this so that "official build" settings such as normalized source

build.cake

Lines changed: 26 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -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>
291296
Task("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>
297316
Task("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

Comments
 (0)