Commit graph

5372 commits

Author SHA1 Message Date
Jon Sequeira
53ea7f62bf update CliCommandLine version 2017-03-07 11:29:29 -08:00
Jon Sequeira
1ed5b420a9 don't split on : or = in restore command parse 2017-03-07 11:28:35 -08:00
Jon Sequeira
c176b5953f additional logging 2017-03-07 07:10:12 -08:00
Jon Sequeira
3dafe9a6e2 add logging to build 2017-03-06 22:10:37 -08:00
Jon Sequeira
69bc90dc6f dotnet restore using new parser 2017-03-06 20:53:26 -08:00
Jon Sequeira
0094fd4e08 revert subcommand change, align CliCommandLine versions 2017-03-06 16:34:05 -08:00
jonsequitur
6b66db7436 a few small code cleanups 2017-03-06 12:22:32 -08:00
jonsequitur
5f227c1c45 split parser definitions across multiple files 2017-03-06 12:21:51 -08:00
jonsequitur
8b0dd3579c a couple of parser unit tests 2017-03-06 12:21:22 -08:00
jonsequitur
614f71d19f add help text for a couple of commands 2017-03-06 12:20:14 -08:00
jonsequitur
d40a87bc44 introduce dotnet complete command 2017-03-06 12:19:06 -08:00
Eric Erhardt
2048940760 Merge pull request #5933 from eerhardt/FixVersionsRepoUpdater
Fix UpdateVersionsRepo to pass file paths instead of a directory
2017-03-06 12:22:01 -06:00
Eric Erhardt
7e1a2fac9a Merge pull request #5932 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to beta-001675 (master)
2017-03-06 11:23:00 -06:00
Eric Erhardt
21080fc5be Fix UpdateVersionsRepo to pass file paths instead of a directory 2017-03-06 11:22:28 -06:00
dotnet-bot
44b6bbdba3 Update CoreSetup to beta-001675 2017-03-06 16:52:17 +00:00
Rich Lander
489cd753a5 Re-license as MIT (#5925) 2017-03-05 17:33:16 -08:00
Livar
b42697ff09 Merge pull request #5917 from eerhardt/FixVersionsRepoUpdater
Fix UpdateVersionsRepo to always write the files correctly.
2017-03-03 20:31:05 -08:00
Livar
04d2501272 Merge pull request #5915 from ravimeda/master
Remove BuildPipeline definitions.
2017-03-03 20:30:55 -08:00
Eric Erhardt
0819949172 Merge pull request #5717 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to beta-001663 (master)
2017-03-03 22:13:02 -06:00
Eric Erhardt
21471aa956 Fix UpdateVersionsRepo to always write the files correctly.
We were only building nupkgs on windows, which meant if a non-windows machine was the last leg to finish, we were writing a blank file to the versions repo.

Fix #4399
2017-03-03 21:43:38 -06:00
dotnet-bot
74defebb5a Update CoreSetup to beta-001663 2017-03-04 03:34:35 +00:00
Eric Erhardt
0e0b59f910 Merge pull request #5909 from dotnet/UpdateSDK
Update NET.Sdk to 1.1.0-alpha-20170303-2
2017-03-03 19:56:16 -06:00
Rama Krishnan Raghupathy
99301d0d95 fix cache test 2017-03-03 16:59:12 -08:00
Rama Krishnan Raghupathy
94dab4559a Merge remote-tracking branch 'upstream/master' into UpdateSDK 2017-03-03 14:27:05 -08:00
Livar
70c65160f6 Merge pull request #5892 from livarcocc/merge_rel101_into_master
Merge rel101 into master
2017-03-03 14:11:06 -08:00
Ravi Eda
8643d4722e Remove BuildPipeline definitions since CLI maintains VSTS definitions only. These checked in definitions will likely be out of sync. 2017-03-03 16:04:13 -06:00
Livar
1f536a11a0 Merge pull request #5913 from dotnet/update-msbuild-and-nuget
Update versions of MSBuild and NuGet
2017-03-03 13:50:14 -08:00
Parallels
a5c7ac12f7 Fixing a couple more merge issues regarding deb generation. 2017-03-03 13:30:57 -08:00
Piotr Puszkiewicz
a9ba12921b Merge pull request #5889 from dotnet/dev/jgoshi/updateDotnetInstallScript
Update the install script to support osname
2017-03-03 12:49:58 -08:00
Daniel Plaisted
4b9c4efc3f Update versions of MSBuild and NuGet 2017-03-03 12:33:56 -08:00
Parallels
f42599dec2 Fixing ubuntu deb generation. 2017-03-03 11:13:41 -08:00
Piotr Puszkiewicz
5eeb3c04fd Merge pull request #5766 from dotnet/blackdwarf-patch-1
Update cli-installation-scenarios.md
2017-03-03 11:13:05 -08:00
Justin Goshi
a66ef9f0ef Fix spacing 2017-03-03 11:05:13 -08:00
Justin Goshi
cdf85ec1d2 Update the descriptino 2017-03-03 11:02:09 -08:00
Justin Goshi
e21c1a4a98 Change the command line argument per PR comments 2017-03-03 09:25:31 -08:00
Justin Goshi
18169e1c6a Merge branch 'master' into dev/jgoshi/updateDotnetInstallScript 2017-03-03 09:12:29 -08:00
Eric Erhardt
7fca740af5 Update NET.Sdk to 1.1.0-alpha-20170303-2 2017-03-03 10:11:30 -06:00
Livar Cunha
ecdf6419fb Merge branch 'merge_rel101_into_master' of github.com:livarcocc/cli-1 into merge_rel101_into_master
* 'merge_rel101_into_master' of github.com:livarcocc/cli-1:
  Merge issues
2017-03-03 01:09:23 -08:00
Livar Cunha
c667ec7702 Fixing a bad merge on Installer.DEB.proj. 2017-03-03 01:08:58 -08:00
Piotr Puszkiewicz
5fe182e038 Merge issues 2017-03-03 00:36:11 -08:00
Livar Cunha
89b2785b74 Undoing a change that apparently broke the tests. 2017-03-03 00:20:17 -08:00
Piotr Puszkiewicz
e8d805ee1e Merge remote-tracking branch 'refs/remotes/livarcocc/merge_rel101_into_master'
Conflicts:
	TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
	TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj
	TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
2017-03-02 23:50:15 -08:00
Piotr Puszkiewicz
a07ebe2e7b Merge remote-tracking branch 'refs/remotes/dotnet/master'
Conflicts:
	TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
	TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
	TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
	TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
	TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
	TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
	TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
	TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
	TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
	build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs
2017-03-02 23:49:01 -08:00
Livar Cunha
a97010d589 Fixing windows tests. I was missing the RuntimeFrameworkVersion in a desktop project, which meant that the metapackage version was being inferred as 2.0, which does not exist yet. 2017-03-02 23:48:26 -08:00
Livar Cunha
d20a1d4e2e Fixing failing test. 2017-03-02 23:43:06 -08:00
Piotr Puszkiewicz
cc80822c16 Merge pull request #5906 from piotrpMSFT/piotrpMSFT/infra/CodeCleanup
Code Cleanup
2017-03-02 23:26:28 -08:00
Piotr Puszkiewicz
ef23038dcd Yet more fixups 2017-03-02 22:35:24 -08:00
Piotr Puszkiewicz
5048f65703 Merged branch master into piotrpMSFT/infra/CodeCleanup 2017-03-02 21:56:50 -08:00
Piotr Puszkiewicz
db90fb2796 More Fixups 2017-03-02 21:56:44 -08:00
Livar
a47cce6150 Merge pull request #5905 from piotrpMSFT/piotrpMSFT/infra/TasklessGitInfo
Remove task usage in commitcount & hash calculation
2017-03-02 21:44:25 -08:00