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.

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

Adapt PackTask to breaking changes in MsBuild 16 #3542

Merged
merged 1 commit into from
Apr 8, 2019

Conversation

cdrnet
Copy link
Member

@cdrnet cdrnet commented Apr 7, 2019

Attempting to fix #3540

For MsBuils 16 and newer:

Changes:

  • BuildOutputFolder -> BuildOutputFolders

While at it, also adds the following (preparation for #3475). I can also remove them from the PR if you prefer:

  • PackageLicenseFile
  • PackageLicenseExpression
  • PackageLicenseExpressionVersion

@cdrnet cdrnet changed the title Adapt PackTask to breaking changes in MsBUild 16 Adapt PackTask to breaking changes in MsBuild 16 Apr 7, 2019
@forki forki merged commit ce7d2ee into fsprojects:master Apr 8, 2019
@forki
Copy link
Member

forki commented Apr 8, 2019

Thanks!

@cdrnet cdrnet deleted the adapt-pack-to-msbuild16 branch April 8, 2019 09:17
@cdrnet cdrnet restored the adapt-pack-to-msbuild16 branch April 8, 2019 09:37
<UseMSBuild15_8_Pack>false</UseMSBuild15_8_Pack>
<UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) ">true</UseMSBuild15_8_Pack>
<UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseMSBuild15_8_Pack>
<UseNuGet4_Pack>false</UseNuGet4_Pack>
<UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) ">true</UseNuGet4_Pack>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Somehow a condition got lost here. Preparing a fix in a second commit. Sorry!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Running dotnet pack with Paket.Restore.Targets referenced in a new csproj file with msbuild 16 fails.
2 participants