Add "path" property to .deps.json file libraries #4032

joelverhagen · 2016-08-11T00:47:06Z

This is step #3 in this NuGet issue: NuGet/Home#2522. This work is also tracked by this CLI issue: https://github.com/dotnet/cli/issues/2874.

This PR adds a "path" property to the "libraries" entries in the .deps.json file. For packages, this is the relative path appended to the global packages folder (or fallback folder) to access the package's assets. For projects and other library types, this value is null.

After this work, the .NET Core host process need to be modified to prefer this property over the concatenation of the package ID and version.

/cc @eerhardt @emgarten @rrelyea @piotrpMSFT

dotnet-build3 Adding msbuild execution command to cli

FI rel/1.0.0 into feature/msbuild

Base Prepare Infrastructure

Convert 'Init' to MSBuild.

This adds the DotNetTool custom task, with `dotnet restore` implemented.

Implement RestorePackages in MSBuild.

msbuild package targets

Implement DownloadHostAndSharedFxArtifacts Implement ZipTemplates Switch the Prepare target to use all the MSBuild targets.

CompileTargets moved to MSBuild. Still need to work on input/outputs, refactoring of targets, specially around CompileStage and moving some of the tasks back to msbuild instead of C# code.

…caching of targets.

…msbuild caching of targets." This reverts commit e100b95.

…uild.proj." This reverts commit 58c75d5.

This reverts commit 262a46e.

Finish converting 'Prepare' to MSBuild.

Implement incremental builds for Prepare targets.

src/redist/project.json

Fix and re-enable build3 tests for windows and OSX

This capability is being replaced by MSBuild, and the project.json tests are very long running.

…ests remove dotnet-build.tests

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.

…tractions.

…nit.

… and honors package dependencies.

…lsAbstractions version to 2.0.0, since I removed some public APIs from it.

Remove dependency model

eerhardt · 2016-08-11T12:51:08Z

@joelverhagen, I hate to break this to you, but @livarcocc just removed the DependencyModel library from the dotnet/cli repo in the feature/msbuild branch. Instead, this library now lives in https://github.com/dotnet/core-setup/tree/master/src/Microsoft.Extensions.DependencyModel.

Is there any way you can port your changes to DependencyModel into that repo?

src/dotnet/commands/dotnet-publish/Program.cs

@@ -69,7 +69,7 @@ public static int Run(string[] args)
            }
            catch (Exception ex)
            {
-                Reporter.Error.WriteLine(ex.Message.Red());
+                Reporter.Error.WriteLine(ex.ToString().Red());


joelverhagen · 2016-08-11T15:27:46Z

@joelverhagen, I hate to break this to you, but @livarcocc just removed the DependencyModel library from the dotnet/cli repo in the feature/msbuild branch.

No worries. I'll react to this change and close this PR if necessary.

eerhardt · 2016-08-11T15:36:16Z

I looked through the changes, and they all look good to me. Minus the part about this library being moved to another repo.

Maybe the best way forward is to make the change to DependencyModel and the DotNetHost in core-setup first. And then make the CLI changes in the feature/msbuild branch.

joelverhagen · 2016-08-11T18:12:33Z

Closing because this should be based off of the feature/msbuild branch (due to DependencyModel change).

brthor and others added 30 commits June 23, 2016 13:57

dotnet-build3 Adding msbuild execution command to cli

400e1db

Merge pull request #3680 from brthor/brthor/dotnet-msbuild

c90287e

dotnet-build3 Adding msbuild execution command to cli

Merge branch 'feature/msbuild' of https://github.com/dotnet/cli.git

cec5bac

Merge branch 'rel'

007661a

Merge pull request #3688 from eerhardt/FIRelIntoMsBuild

0c96175

FI rel/1.0.0 into feature/msbuild

Convert all CLI build targets to MSBuild Tasks. (#3690)

15b2a9d

Update branchinfo.txt

bca4572

base init infra

4d8ed81

Merge pull request #3706 from brthor/brthor/preparebase

219d9d2

Base Prepare Infrastructure

Convert 'Init' to MSBuild.

038758a

Merge pull request #3710 from eerhardt/msbuild-Prepare

0d37da4

Convert 'Init' to MSBuild.

Implement RestorePackages in MSBuild.

aff23d0

This adds the DotNetTool custom task, with `dotnet restore` implemented.

Respond to PR feedback and fix CommitCount not being padded with zeros.

bf172df

Fix Stage0 calculation on Unix.

a7d2972

Merge pull request #3721 from eerhardt/msbuild-Prepare

47f32a7

Implement RestorePackages in MSBuild.

change to properties, artifact names

fa97921

PR Feedback

ddb3637

ToUpper

e6905da

Merge pull request #3696 from brthor/brthor/msbuild-package-targets

2ed5363

msbuild package targets

Finish converting 'Prepare' to MSBuild.

15642cf

Implement DownloadHostAndSharedFxArtifacts Implement ZipTemplates Switch the Prepare target to use all the MSBuild targets.

CompileTargets moved to MSBuild

262a46e

CompileTargets moved to MSBuild. Still need to work on input/outputs, refactoring of targets, specially around CompileStage and moving some of the tasks back to msbuild instead of C# code.

Fixing some paths, moving the compile.targets to the end of build.proj.

58c75d5

Making CompileStage batch over the different stages to avoid msbuild …

e100b95

…caching of targets.

Revert "Making CompileStage batch over the different stages to avoid …

f661ec4

…msbuild caching of targets." This reverts commit e100b95.

Revert "Fixing some paths, moving the compile.targets to the end of b…

014b898

…uild.proj." This reverts commit 58c75d5.

Revert "CompileTargets moved to MSBuild"

a711ac2

This reverts commit 262a46e.

Merge pull request #3726 from eerhardt/msbuild-Prepare

7b72512

Finish converting 'Prepare' to MSBuild.

Implement incremental builds for Prepare targets.

cddf8fa

Merge pull request #3744 from eerhardt/msbuild-Prepare-incremental

58fa0bf

Implement incremental builds for Prepare targets.

Remove Project Model Server

5ed1371

Piotr Puszkiewicz and others added 19 commits August 9, 2016 13:22

src/redist/project.json

3a55a41

PR Feedback

b3f5174

Merge pull request #4024 from dotnet/piotrpMSFT/redistProj

6b04136

src/redist/project.json

Fix and re-enable build3 tests.

2b741bc

Merge pull request #4027 from eerhardt/msbuild-reenableBuild3Tests

ec2cd25

Fix and re-enable build3 tests for windows and OSX

Remove dotnet-build.tests

a7d5940

This capability is being replaced by MSBuild, and the project.json tests are very long running.

Merge pull request #4031 from dotnet/piotrpMSFT/remove_dotnet-build.t…

66dd155

…ests remove dotnet-build.tests

Updating dependencies to use the new dependencymodel and platformabst…

e900e23

…ractions. Also updated the xunit template to add internalabstractions. Conflicts: src/Microsoft.DotNet.Cli.Utils/project.json test/dotnet-build.Tests/BuildOutputTests.cs

Updating the msbuild changes to handle DependencyModel coming from co…

0a55a7c

…re-setup instead of a project dependency.

Removing dependency model from one of the packaged projects in the CLI.

5c4785e

Removing the public types from InternalAbstractions.

b7b9017

Updating the xunit version to one that does not depend on internalabs…

dc7f1fd

…tractions.

Updating the xunit version to match the new version of dotnet-test-xu…

7b94fa7

…nit.

Updating dotnet new test so that it does not use project dependencies…

8fa2d35

… and honors package dependencies.

Addressing code review comments

d8e7d37

Fixing a version conflict in Testing.Abstractions and bumping Interna…

8bb7e01

…lsAbstractions version to 2.0.0, since I removed some public APIs from it.

Disabling the net451 discovery tests.

75524b0

Merge pull request #4017 from livarcocc/remove_dependency_model

a0244b9

Remove dependency model

dnfclas added the cla-already-signed label Aug 11, 2016

eerhardt reviewed Aug 11, 2016
View reviewed changes

joelverhagen force-pushed the jver/depspath branch from 72f0b2b to 065ab9a Compare August 11, 2016 15:47

joelverhagen mentioned this pull request Aug 11, 2016

Add support for the "path" property in the .deps.json file dotnet/core-setup#235

Merged

Add "path" property the .deps.json file for libraries

c6baeb8

joelverhagen force-pushed the jver/depspath branch from 065ab9a to c6baeb8 Compare August 11, 2016 18:08

joelverhagen closed this Aug 11, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add "path" property to .deps.json file libraries #4032

Add "path" property to .deps.json file libraries #4032

joelverhagen commented Aug 11, 2016

eerhardt commented Aug 11, 2016

This comment was marked as spam.

This comment was marked as spam.

joelverhagen commented Aug 11, 2016

eerhardt commented Aug 11, 2016

joelverhagen commented Aug 11, 2016

Add "path" property to .deps.json file libraries #4032

Add "path" property to .deps.json file libraries #4032

Conversation

joelverhagen commented Aug 11, 2016

eerhardt commented Aug 11, 2016

This comment was marked as spam.

This comment was marked as spam.

joelverhagen commented Aug 11, 2016

eerhardt commented Aug 11, 2016

joelverhagen commented Aug 11, 2016