85b2a129db
Conflicts: TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj build.proj build/Compile.targets build/Microsoft.DotNet.Cli.Compile.targets build/Microsoft.DotNet.Cli.DependencyVersions.props build/Microsoft.DotNet.Cli.Monikers.props build/Microsoft.DotNet.Cli.Prepare.targets build/package/Microsoft.DotNet.Cli.Nupkg.targets build/package/Nupkg.targets build/test/TestPackageProjects.targets build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs build_projects/dotnet-cli-build/GetCommitCount.cs build_projects/dotnet-cli-build/dotnet-cli-build.csproj build_projects/shared-build-targets-utils/Utils/BuildVersion.cs src/dotnet-archive/dotnet-archive.csproj src/tool_msbuild/tool_msbuild.csproj src/tool_nuget/tool_nuget.csproj test/ArgumentForwardingTests/ArgumentForwardingTests.csproj test/ArgumentsReflector/ArgumentsReflector.csproj test/EndToEnd/EndToEnd.csproj test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj test/binding-redirects.Tests/binding-redirects.Tests.csproj test/crossgen.Tests/crossgen.Tests.csproj test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj test/dotnet-build.Tests/dotnet-build.Tests.csproj test/dotnet-help.Tests/dotnet-help.Tests.csproj test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj test/dotnet-new.Tests/dotnet-new.Tests.csproj test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj test/dotnet-pack.Tests/dotnet-pack.Tests.csproj test/dotnet-publish.Tests/dotnet-publish.Tests.csproj test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj test/dotnet-restore.Tests/dotnet-restore.Tests.csproj test/dotnet-run.Tests/dotnet-run.Tests.csproj test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj test/dotnet-test.Tests/dotnet-test.Tests.csproj test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj test/dotnet.Tests/dotnet.Tests.csproj test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj tools/Archiver/Archiver.csproj |
||
|---|---|---|
| .. | ||
| DesktopTestProjects | ||
| LockFiles/ExportFiles | ||
| NonRestoredTestProjects | ||
| TestPackages | ||
| TestProjects | ||