Skip to content

Include "ResolveTargetingPackAssets" in AfterTargets; Remove unused Targets #2230

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

Conversation

rladuca
Copy link
Member

@rladuca rladuca commented Nov 22, 2019

Porting changes over from Release/3.1 into the DARC flow for Release/3.0.

Cherry-picked commits:
e1d79c0
MarkupCompilationPass1 getting too large a list of references which was causing a conflict between WindowsBase (the facade in NetCoreApp) and WindowsBase (the product assembly).

7f91d7c
NuGet changes here are creating errors in our packaging.

@ghost ghost requested a review from vatsan-madhavan November 22, 2019 21:31
@ghost ghost added the PR metadata: Label to tag PRs, to facilitate with triage label Nov 22, 2019
@ghost ghost requested a review from SamBent November 22, 2019 21:31
@vatsan-madhavan
Copy link
Member

This looks right to me - you got just the right subset of #1835 that's needed to make #1803 work.

/cc @mmitche.

@rladuca
Copy link
Member Author

rladuca commented Nov 22, 2019

Adding further cherry picks for nuget packaging issues.

@mmitche mmitche merged commit 0ac1ae1 into dotnet:darc-release/3.0-a3262d79-668a-447f-baf4-f135ad5bfe7c Nov 22, 2019
ghost pushed a commit that referenced this pull request Nov 22, 2019
* Update dependencies from https://github.com/dotnet/arcade build 20190924.3

- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19474.3
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19474.3
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19474.3
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19474.3
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19474.3

* Update Nuget.config

* Remove Versions.props restore sources

* Attempt to remove dotnet-core, add dotnet3 and dotnet3-transport

* Fix feed urls

* Update NuGet.config

* Update dependencies

* Update test package version

* Update dependencies from https://github.com/dotnet/arcade build 20191119.2

- Microsoft.DotNet.ApiCompat - 1.0.0-beta.19569.2
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19569.2
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19569.2
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19569.2

* Add reference to System.Resources.Extensions

* Add System.Resources.Extensions references to PresentationUI

* Revert "Add reference to System.Resources.Extensions"

This reverts commit 6506e43.

* Update dependencies

* Include "ResolveTargetingPackAssets" in AfterTargets; Remove unused Targets (#2230)

*         Workaround for dotnet/installer#4744
            .NET Core 3.1 SDK hasn't consumed the fix for NuGet/Home#8467 yet.
            Suppress these warnings temporarily

* Fixing NoWarn to include SDK defines.
@rladuca rladuca deleted the darc-release/3.0-a3262d79-668a-447f-baf4-f135ad5bfe7c branch December 10, 2019 22:09
@ghost ghost locked as resolved and limited conversation to collaborators Apr 14, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
PR metadata: Label to tag PRs, to facilitate with triage
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants