Skip to content
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

Jump to bottom

Fix generate package on build pack as tool #3255

Merged
merged 2 commits into from
May 22, 2019
Merged

Fix generate package on build pack as tool #3255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7880d0
Fix GeneratePackageOnBuild with PackAsTool both on
May 22, 2019
d59a547
Revert "Disable failing tool pack tests due to #3253"
May 22, 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
4 changes: 2 additions & 2 deletions src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ Copyright (c) .NET Foundation. All rights reserved.
</PropertyGroup>

<Target Name="_PublishBuildAlternative"
Condition="'$(NoBuild)' != 'true'"
Condition="'$(NoBuild)' != 'true' and '$(GeneratePackageOnBuild)' != 'true'"
DependsOnTargets="Build;$(_CorePublishTargets)" />

<Target Name="_PublishNoBuildAlternative"
Condition="'$(NoBuild)' == 'true'"
Condition="'$(NoBuild)' == 'true' or '$(GeneratePackageOnBuild)' == 'true'"
DependsOnTargets="$(_BeforePublishNoBuildTargets);$(_CorePublishTargets)" />

<Target Name="Publish"
Expand Down
4 changes: 2 additions & 2 deletions ...crosoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProjectWithGeneratePackageOnBuild.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ private TestAsset SetupAndRestoreTestAsset([CallerMemberName] string callingMeth
return testAsset;
}

[Fact(Skip = "https://github.com/dotnet/sdk/issues/3253")]
[Fact]
public void It_builds_successfully()
{
TestAsset testAsset = SetupAndRestoreTestAsset();
Expand All @@ -61,7 +61,7 @@ public void It_builds_successfully()
.NotHaveStdOutContaining("There is a circular dependency");
}

[Fact(Skip = "https://github.com/dotnet/sdk/issues/3253")]
[Fact]
public void It_builds_and_result_contains_dependencies_dll()
{
TestAsset testAsset = SetupAndRestoreTestAsset();
Expand Down