e900e23544
Conflicts: src/Microsoft.DotNet.Cli.Utils/project.json test/dotnet-build.Tests/BuildOutputTests.cs |
||
---|---|---|
.. | ||
DesktopTestProjects | ||
LockFiles/ExportFiles | ||
NonRestoredTestProjects | ||
TestPackages | ||
TestProjects |
e900e23544
Conflicts: src/Microsoft.DotNet.Cli.Utils/project.json test/dotnet-build.Tests/BuildOutputTests.cs |
||
---|---|---|
.. | ||
DesktopTestProjects | ||
LockFiles/ExportFiles | ||
NonRestoredTestProjects | ||
TestPackages | ||
TestProjects |