Add restore support for C++/CLI .NET Core projects #4076
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nkolev92
force-pushed
the
dev-nkolev92-cppCliFrameworkSupport
branch
from
fcc7f80 to
ada28c0
Compare
nkolev92
commented
May 28, 2021
|
|
||
| return MSBuildProjectFrameworkUtility.GetProjectFramework( | ||
| projectFullPath, | ||
| targetFrameworkMoniker, | ||
| targetPlatformMoniker, | ||
| targetPlatformMinVersion); | ||
| targetPlatformMinVersion, | ||
| clrSupport); |
There was a problem hiding this comment.
This is nomination code that handles the VS side.
| @@ -465,6 +465,11 @@ public class SourceRepositoryDependencyProvider : IRemoteDependencyProvider | |||
| targetFramework, | |||
| item => item.TargetFramework); | |||
|
|
|||
| if (dependencyGroup == null && DeconstructFallbackFrameworks(targetFramework) is DualCompatibilityFramework dualCompatibilityFramework) | |||
There was a problem hiding this comment.
This handles the dependencies selection with dual compat framework.
| @@ -152,6 +152,11 @@ internal static List<List<SelectionCriteria>> CreateOrderedCriteriaSets(RestoreT | |||
| { | |||
| // Add the root project framework first. | |||
| orderedCriteriaSets.Add(CreateCriteria(targetGraph, assetTargetFallback.RootFramework)); | |||
| // Add the secondary framework if dual compatibility framework. | |||
| if (assetTargetFallback.RootFramework is DualCompatibilityFramework dualCompatibilityFramework) | |||
There was a problem hiding this comment.
This ensures the package assets are selected with dual compatibility in mind.
kartheekp-ms
reviewed
Jun 2, 2021
src/NuGet.Core/NuGet.Commands/Utility/MSBuildProjectFrameworkUtility.cs
Outdated
Show resolved
Hide resolved
kartheekp-ms
reviewed
Jun 2, 2021
kartheekp-ms
reviewed
Jun 2, 2021
nkolev92
force-pushed
the
dev-nkolev92-cppCliFrameworkSupport
branch
from
86edc41 to
4b13481
Compare
zivkan
reviewed
Jun 4, 2021
|
addressed your feedback @kartheekp-ms @zivkan PTAL |
zivkan
approved these changes
Jun 8, 2021
nkolev92
force-pushed
the
dev-nkolev92-cppCliFrameworkSupport
branch
from
cdff7da to
89d6b55
Compare
kartheekp-ms
approved these changes
Jun 8, 2021
amaitland
reviewed
Jun 8, 2021
| @@ -142,7 +142,7 @@ internal static List<List<SelectionCriteria>> CreateOrderedCriteriaSets(RestoreT | |||
| // Create an ordered list of selection criteria. Each will be applied, if the result is empty | |||
| // fallback frameworks from "imports" will be tried. | |||
| // These are only used for framework/RID combinations where content model handles everything. | |||
| // AssetTargetFallback frameworks will provide multiple criteria since all assets need to be | |||
| // AssetTargetFallback and DualCompatbiility frameworks will provide multiple criteria since all assets need to be | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bug
Fixes: NuGet/Home#10194
Regression? Last working version:
Description
Design at: NuGet/Home#10299
C++/CLI .NET Core projects are projects that can install both native and managed packages.
This PR introduces a new dual compatibility framework that allows us to represent these types of projects.
I'll add some comments inline to aide the review.
PR Checklist
PR has a meaningful title
PR has a linked issue.
Described changes
Tests
Documentation