Skip to content

Do not set NoBuild with GeneratePackageOnBuild because property reuse breaks publish #2822

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
nkolev92 merged 6 commits into from
Apr 24, 2019
Merged

Do not set NoBuild with GeneratePackageOnBuild because property reuse breaks publish #2822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d93c716
Try to remove the no build dependency
nkolev92 Apr 23, 2019
d0e9889
fix whitespace
nkolev92 Apr 23, 2019
1f1ecf9
add test
nkolev92 Apr 24, 2019
929bfdb
fix the test
nkolev92 Apr 24, 2019
50b138a
fix the test
nkolev92 Apr 24, 2019
4578b01
work
nkolev92 Apr 24, 2019
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
5 changes: 2 additions & 3 deletions src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ Copyright (c) .NET Foundation. All rights reserved.
<ContentTargetFolders Condition="'$(ContentTargetFolders)' == ''">content;contentFiles</ContentTargetFolders>
<PackDependsOn>$(BeforePack); _IntermediatePack; GenerateNuspec; $(PackDependsOn)</PackDependsOn>
<IsInnerBuild Condition="'$(TargetFramework)' != '' AND '$(TargetFrameworks)' != ''">true</IsInnerBuild>
<NoBuild Condition="'$(GeneratePackageOnBuild)' == 'true'">true</NoBuild>
<SymbolPackageFormat Condition="'$(SymbolPackageFormat)' == ''">symbols.nupkg</SymbolPackageFormat>
<AddPriFileDependsOn Condition="'$(MicrosoftPortableCurrentVersionPropsHasBeenImported)' == 'true'">DeterminePortableBuildCapabilities</AddPriFileDependsOn>
<NuspecOutputPath Condition="'$(NuspecOutputPath)' == ''">$(BaseIntermediateOutputPath)$(Configuration)\</NuspecOutputPath>
Expand All @@ -49,10 +48,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder Condition="'$(SymbolPackageFormat)' == 'snupkg'">.pdb</AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder>
<SuppressDependenciesWhenPacking Condition="'$(SuppressDependenciesWhenPacking)' == ''">false</SuppressDependenciesWhenPacking>
</PropertyGroup>
<PropertyGroup Condition="'$(NoBuild)' == 'true' ">
<PropertyGroup Condition="'$(NoBuild)' == 'true' or '$(GeneratePackageOnBuild)' == 'true'">
<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
</PropertyGroup>
<PropertyGroup Condition="'$(NoBuild)' != 'true' ">
<PropertyGroup Condition="'$(NoBuild)' != 'true' and '$(GeneratePackageOnBuild)' != 'true'">
<GenerateNuspecDependsOn>Build;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
</PropertyGroup>
<ItemGroup>
Expand Down
25 changes: 25 additions & 0 deletions test/NuGet.Core.FuncTests/Dotnet.Integration.Test/PackCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3941,5 +3941,30 @@ public void PackCommand_PackProject_PacksFrameworkReferences_FrameworkReferences
}
}
}

[PlatformFact(Platform.Windows)]
public void PackCommand_WithGeneratePackageOnBuildSet_CanPublish()
{
using (var testDirectory = TestDirectory.Create())
{
var projectName = "ClassLibrary1";
var workingDirectory = Path.Combine(testDirectory, projectName);
// Act
msbuildFixture.CreateDotnetNewProject(testDirectory.Path, projectName, " console");

var projectFile = Path.Combine(workingDirectory, $"{projectName}.csproj");
using (var stream = new FileStream(projectFile, FileMode.Open, FileAccess.ReadWrite))
{
var xml = XDocument.Load(stream);
ProjectFileUtils.AddProperty(xml, "GeneratePackageOnBuild", "true");
ProjectFileUtils.WriteXmlToFile(xml, stream);
}
// Act
var result = msbuildFixture.RunDotnet(workingDirectory, $"publish {projectFile}");

// Assert
Assert.True(result.Success);
}
}
}
}