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

Bundle NuGet.Build.Tasks.Console in redist #10794

Merged
merged 6 commits into from
Mar 15, 2020
Merged

Bundle NuGet.Build.Tasks.Console in redist #10794

merged 6 commits into from
Mar 15, 2020

Conversation

ViktorHofer
Copy link
Member

Add the NuGet.Build.Tasks.Console package for the pack bundle.
Fixes NuGet/Home#9267

@ViktorHofer
Bundle NuGet.Build.Tasks.Console in redist
6b1229b 
Add the NuGet.Build.Tasks.Console package for the pack bundle.
Fixes NuGet/Home#9267
@ViktorHofer ViktorHofer requested review from nkolev92 and jeffkl March 7, 2020 11:19
This was referenced Mar 7, 2020
Closed
Merged
@nkolev92
Copy link
Contributor

nkolev92 commented Mar 9, 2020

Does this automatically lay out the things the way it's supposed to?
Can you point to the code where that's happening?

@jeffkl
Copy link
Contributor

jeffkl commented Mar 9, 2020

I think so, when building this project, you just get a bunch of stuff in the output directory because of the various PackageReference items. And then this target lays things out:

https://github.com/dotnet/toolset/blob/8a99876e947686898a5208e26cac316dfeff449a/src/redist/targets/GenerateLayout.targets#L139

@ViktorHofer
Copy link
Member Author

This is the default behavior becuase CopyLocalLockFileAssemblies is being set.

@nkolev92
Copy link
Contributor

nkolev92 commented Mar 9, 2020

I assume this will be blocked on NuGet/NuGet.Client#3285 making it's way into the SDK?

@ViktorHofer
Copy link
Member Author

Right

@ViktorHofer
Copy link
Member Author

NuGet/NuGet.Client#3285 still needs to be approved by someone from the team :)

@nkolev92
Copy link
Contributor

nkolev92 commented Mar 9, 2020

Yep, getting to it haha :D

dsplaisted
dsplaisted reviewed Mar 9, 2020
View reviewed changes
Copy link
Member

@dsplaisted dsplaisted left a comment

Choose a reason for hiding this comment

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

Together with this could we add a basic test that exercises the functionality added with this package? That way we would at least have a sanity check that the files are going in the right place and working.

wli3
wli3 previously requested changes Mar 10, 2020
View reviewed changes
Copy link

@wli3 wli3 left a comment

Choose a reason for hiding this comment

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

Need test

@ViktorHofer
Copy link
Member Author

@jeffkl this is now building successfully. Do you have time to add a test?

@ViktorHofer ViktorHofer mentioned this pull request Mar 13, 2020
Merged
@jeffkl
Copy link
Contributor

jeffkl commented Mar 13, 2020

Sigh the package is still wrong.
image
Nothiing copes the runtimeconfig.json since assemblies in lib are only treated as reference assemblies not runable apps.

We'll need to either fix the package and have the runtimeconfig.json under runtimes\any\native or do something custom in this repo.

@ViktorHofer
Copy link
Member Author

Jeff it seems you were right about contentfiles. That's how VSTest does it:

image

@ViktorHofer
Copy link
Member Author

/azp run dotnet-sdk-public-ci

@azure-pipelines
Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@ViktorHofer
Copy link
Member Author

Manually requeued the build because of the AzDO outage: https://dnceng.visualstudio.com/public/_build/results?buildId=560056&view=logs

@ViktorHofer
Copy link
Member Author

Tests are added and the build is green: https://dnceng.visualstudio.com/public/_build/results?buildId=560056&view=logs

@ViktorHofer ViktorHofer dismissed wli3’s stale review March 15, 2020 11:39

Tests are added

@ViktorHofer ViktorHofer reopened this Mar 15, 2020
@ViktorHofer ViktorHofer merged commit 983c811 into dotnet:master Mar 15, 2020
@ViktorHofer ViktorHofer deleted the NuGetBuildTasksConsole branch March 15, 2020 11:40
@ViktorHofer ViktorHofer restored the NuGetBuildTasksConsole branch March 15, 2020 11:40
@ViktorHofer ViktorHofer deleted the NuGetBuildTasksConsole branch March 15, 2020 11:41
ViktorHofer added a commit that referenced this pull request Mar 15, 2020
@ViktorHofer
Bundle NuGet.Build.Tasks.Console in redist (#10794)
2d45b5a 
* Bundle NuGet.Build.Tasks.Console in redist

Add the NuGet.Build.Tasks.Console package for the pack bundle.
Fixes NuGet/Home#9267

* Update Versions.props

* Update Versions.props

* Add RestoreTaskEx tests

* Update NuGet to 5.6.0-preview.2.6508
@ViktorHofer ViktorHofer restored the NuGetBuildTasksConsole branch March 15, 2020 11:59
ViktorHofer added a commit that referenced this pull request Mar 16, 2020
@ViktorHofer
Bundle NuGet.Build.Tasks.Console in redist (#10794) (#10869)
25fdd3b 
* Bundle NuGet.Build.Tasks.Console in redist

Add the NuGet.Build.Tasks.Console package for the pack bundle.
Fixes NuGet/Home#9267

* Update Versions.props

* Update Versions.props

* Add RestoreTaskEx tests

* Update NuGet to 5.6.0-preview.2.6508
ghost pushed a commit that referenced this pull request Mar 31, 2020
@sfoslund @dotnet-maestro
@dsplaisted @ViktorHofer @MSLukeWest
Merge release/5.0.1xx-preview2 to master (#11057)
28bc42e 
* Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200305.8 (#10785)

- Microsoft.NET.Sdk.Razor - 5.0.0-preview.2.20155.8

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/aspnet/websdk build 20200306.2 (#10786)

- Microsoft.NET.Sdk.Web - 5.0.100-preview.2.20156.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200306.5 (#10789)

- Microsoft.NET.Sdk.Razor - 5.0.0-preview.2.20156.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* [release/5.0.1xx-preview2] Update dependencies from dotnet/windowsdesktop (#10787)

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200306.1

- Microsoft.WindowsDesktop.App - 5.0.0-preview.2.20156.1

Dependency coherency updates

- Microsoft.NET.Sdk.WindowsDesktop - 5.0.0-preview.2.20155.7 (parent: Microsoft.WindowsDesktop.App)

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200306.8

- Microsoft.WindowsDesktop.App - 5.0.0-preview.2.20156.8

Dependency coherency updates

- Microsoft.NET.Sdk.WindowsDesktop - 5.0.0-preview.2.20156.5 (parent: Microsoft.WindowsDesktop.App)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200306.4 (#10790)

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-preview.2.20156.4

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200309.2 (#10807)

- Microsoft.NET.Sdk.Razor - 5.0.0-preview.2.20159.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* [release/5.0.1xx-preview2] Update dependencies from dotnet/windowsdesktop (#10792)

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200306.9

- Microsoft.WindowsDesktop.App - 5.0.0-preview.2.20156.9

Dependency coherency updates

- Microsoft.NET.Sdk.WindowsDesktop - 5.0.0-preview.2.20156.7 (parent: Microsoft.WindowsDesktop.App)

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200309.2

- Microsoft.WindowsDesktop.App - 5.0.0-preview.2.20159.2

Dependency coherency updates

- Microsoft.NET.Sdk.WindowsDesktop - 5.0.0-preview.2.20156.7 (parent: Microsoft.WindowsDesktop.App)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200309.14 (#10814)

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-preview.2.20159.14

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200309.4 (#10811)

- Microsoft.NET.Sdk.Razor - 5.0.0-preview.2.20159.4

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/runtime build 20200310.6 (#10823)

- System.Security.Cryptography.ProtectedData - 5.0.0-preview.2.20160.6
- System.Text.Encoding.CodePages - 5.0.0-preview.2.20160.6
- System.Resources.Extensions - 5.0.0-preview.2.20160.6
- System.CodeDom - 5.0.0-preview.2.20160.6
- Microsoft.NETCore.DotNetHostResolver - 5.0.0-preview.2.20160.6
- Microsoft.Extensions.DependencyModel - 5.0.0-preview.2-runtime.20160.6
- Microsoft.NET.HostModel - 5.0.0-preview.2.20160.6
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.2.20160.6
- Microsoft.NETCore.App.Ref - 5.0.0-preview.2.20160.6
- Microsoft.DotNet.PlatformAbstractions - 5.0.0-preview.2.20160.6

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200310.6 (#10824)

- Microsoft.WindowsDesktop.App - 5.0.0-preview.2.20160.6

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200310.3 (#10825)

- Microsoft.NET.Sdk.Razor - 5.0.0-preview.2.20160.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/aspnet/websdk build 20200311.2 (#10834)

- Microsoft.NET.Sdk.Web - 5.0.100-preview.2.20161.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200310.9 (#10832)

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-preview.2.20160.9

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/NuGet/NuGet.Client build 5.6.0.6489 (#10813)

- NuGet.Build.Tasks - 5.6.0-preview.2.6489

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* [master] Update dependencies from Microsoft/vstest (#10806) (#10844)

* Update dependencies from https://github.com/microsoft/vstest build 20200305-01

- Microsoft.NET.Test.Sdk - 16.6.0-preview-20200305-01

* Remove vstest feed

The VSTest isn't necessary as VSTest pushes to the dotnet-tools feed already.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Enable test for net5.0 TargetFramework (#10846)

* Enable test for net5.0 TargetFramework

* Disable net5.0 test on full Framework MSBuild

* [release/5.0.1xx-preview2] Update dependencies from dotnet/templating (#10867)

* Update dependencies from https://github.com/dotnet/templating build 20200314.2

- Microsoft.TemplateEngine.Cli - 5.0.0-preview.2.20164.2

* Update dependencies from https://github.com/dotnet/templating build 20200314.4

- Microsoft.TemplateEngine.Cli - 5.0.0-preview.2.20164.4

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Bundle NuGet.Build.Tasks.Console in redist (#10794) (#10869)

* Bundle NuGet.Build.Tasks.Console in redist

Add the NuGet.Build.Tasks.Console package for the pack bundle.
Fixes NuGet/Home#9267

* Update Versions.props

* Update Versions.props

* Add RestoreTaskEx tests

* Update NuGet to 5.6.0-preview.2.6508

* Pass RunConfiguration values correctly to vstest

The RunConfiguration delimiter "--" was parsed incorrectly and treated
as an option, i.e. like --platform. Adding a path in the parsing for the
delimiter to fix this and treat remaining args as literals.

Added the RunConfiguration entries to the tests.

* Ignore args after -- for dll/exe vs proj

* Update tests

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200317.3 (#10887)

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-preview.2.20167.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/aspnet/websdk build 20200317.4 (#10889)

- Microsoft.NET.Sdk.Web - 5.0.100-preview.2.20167.4

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/templating build 20200324.1 (#10977)

- Microsoft.TemplateEngine.Cli - 5.0.0-preview.2.20174.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Adding back ComputeFilesCopiedToPublishDir item group to fix wapproj compat bug (#10925) (#10978)

Co-authored-by: Luke Westendorf <lukewest@microsoft.com>

Co-authored-by: Luke Westendorf <lukewest@microsoft.com>

* Adding nuget import lost in merge

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Co-authored-by: William Li <wul@microsoft.com>
Co-authored-by: MSLukeWest <42553283+MSLukeWest@users.noreply.github.com>
Co-authored-by: Luke Westendorf <lukewest@microsoft.com>
@nkolev92 nkolev92 mentioned this pull request Apr 24, 2020
Closed
@wli3 wli3 mentioned this pull request Jun 2, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dsplaisted dsplaisted dsplaisted left review comments

@nkolev92 nkolev92 nkolev92 approved these changes

@wli3 wli3 wli3 left review comments

@jeffkl jeffkl Awaiting requested review from jeffkl

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Ensure Static Graph restore is available in dotnet.exe
5 participants
@ViktorHofer @nkolev92 @jeffkl @dsplaisted @wli3