2a94a1e384
Conflicts: Microsoft.DotNet.Cli.sln scripts/dockerbuild.sh scripts/test/setup/build-test-prerequisites.ps1 test/dotnet-build.Tests/IncrementalTestBase.cs test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs test/dotnet-publish.Tests/project.json |
||
---|---|---|
.. | ||
Program.cs | ||
project.json | ||
TestApp.xproj |