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

Adding back ComputeFilesCopiedToPublishDir item group to fix wapproj compat bug #10925

Merged

Conversation

MSLukeWest
Copy link
Contributor

This item group was removed in .NET 5 due to some refactoring around the single file scenario. However, since it's consumed by wapproj we need it to continue to exist for compat reasons. So I'm adding back a simplified version of the target.

@MSLukeWest
Copy link
Contributor Author

@swaroop-sridhar - Please take a look

@swaroop-sridhar swaroop-sridhar merged commit 61eb835 into dotnet:master Mar 23, 2020
@MSLukeWest MSLukeWest deleted the dev/lukewest/master/FixWapprojCompat branch March 23, 2020 20:51
mmitche pushed a commit that referenced this pull request Mar 26, 2020
…compat bug (#10925) (#10978)

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

Co-authored-by: Luke Westendorf <lukewest@microsoft.com>
ghost pushed a commit that referenced this pull request Mar 31, 2020
* 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>
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.

None yet

2 participants