This repository has been archived by the owner on Apr 20, 2023. It is now read-only.
Remove dependency model #4017
Merged
Remove dependency model #4017
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
|
@dotnet-bot Test Ubuntu x64 Release Build |
| @@ -24,7 +24,13 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Testin | |||
| EndProject | |||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}" | |||
| EndProject | |||
| <<<<<<< HEAD | |||
| Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.DependencyModel", "src\Microsoft.Extensions.DependencyModel\Microsoft.Extensions.DependencyModel.xproj", "{688870C8-9843-4F9E-8576-D39290AD0F25}" | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
livarcocc
force-pushed
the
remove_dependency_model
branch
2 times, most recently
from
fa29a28
to
1d8c524
Compare
livarcocc
changed the title
| @@ -7,6 +7,7 @@ | |||
| using System.Linq; | |||
| using System.Text; | |||
| using Microsoft.DotNet.InternalAbstractions; | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
some comments, but don't feel you need to block.
|
|
@dotnet-bot test Windows_NT x64 Release Build please. |
|
@dotnet-bot test Windows_NT x86 Debug Build please. |
Conflicts: Microsoft.DotNet.Cli.sln build_projects/dotnet-cli-build/PackageTargets.cs build_projects/dotnet-cli-build/TestPackageProjects.cs build_projects/dotnet-cli-build/TestTargets.cs src/Microsoft.Extensions.DependencyModel/CompilationLibrary.cs src/Microsoft.Extensions.DependencyModel/DependencyContext.cs src/Microsoft.Extensions.DependencyModel/DependencyContextLoader.cs src/Microsoft.Extensions.DependencyModel/DependencyContextPaths.cs src/Microsoft.Extensions.DependencyModel/DependencyContextWriter.cs src/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs src/Microsoft.Extensions.DependencyModel/Resolution/PackageCacheCompilationAssemblyResolver.cs src/Microsoft.Extensions.DependencyModel/Resolution/ResolverUtils.cs src/Microsoft.Extensions.DependencyModel/project.json test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonWriterTests.cs test/Microsoft.Extensions.DependencyModel.Tests/FunctionalTests.cs test/Microsoft.Extensions.DependencyModel.Tests/PackageCacheResolverTest.cs test/Microsoft.Extensions.DependencyModel.Tests/PackageResolverTest.cs
…ractions. Also updated the xunit template to add internalabstractions. Conflicts: src/Microsoft.DotNet.Cli.Utils/project.json test/dotnet-build.Tests/BuildOutputTests.cs
…re-setup instead of a project dependency.
… and honors package dependencies.
…lsAbstractions version to 2.0.0, since I removed some public APIs from it.
livarcocc
force-pushed
the
remove_dependency_model
branch
from
860b269
to
75524b0
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
cc @eerhardt @brthor @piotrpMSFT