Commit graph

9 commits

Author SHA1 Message Date
Piotr Puszkiewicz
2db1997bc0 Merge remote-tracking branch 'refs/remotes/origin/feature/msbuild'
Conflicts:
	Microsoft.DotNet.Cli.sln
	build_projects/dotnet-cli-build/DebTargets.cs
	build_projects/dotnet-cli-build/TestTargets.cs
	scripts/package/package-debian.sh
	src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs
	src/dotnet/commands/dotnet-new/Program.cs
	src/dotnet/commands/dotnet-pack/PackageGenerator.cs
	test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs
2016-08-16 18:30:52 -07:00
Livar Cunha
75524b0c6a Disabling the net451 discovery tests. 2016-08-10 13:40:27 -07:00
Livar Cunha
d8e7d37616 Addressing code review comments 2016-08-10 13:40:27 -07:00
Livar Cunha
8fa2d35291 Updating dotnet new test so that it does not use project dependencies and honors package dependencies. 2016-08-10 13:40:27 -07:00
Livar Cunha
e900e23544 Updating dependencies to use the new dependencymodel and platformabstractions. Also updated the xunit template to add internalabstractions.
Conflicts:
	src/Microsoft.DotNet.Cli.Utils/project.json
	test/dotnet-build.Tests/BuildOutputTests.cs
2016-08-10 13:39:49 -07:00
jplebre
db17fb6889 xunit and nunit template tests cannot run in parallel 2016-08-03 22:06:17 +01:00
jplebre
e5dad7e451 Cleaned up unused bits 2016-08-03 22:06:17 +01:00
jplebre
06d7a84c08 Added tests as a project to the solution 2016-08-03 22:06:17 +01:00
Zlatko Knezevic
79bbfafc51 Fix the project.json for C# library and add tests (#3507)
* Fix the project.json for C# library and add tests

This commit fixes the bug introduced in project.json for the C# Library
template. It also adds two simple tests for the library template that
drop the class library and then restore and another that also builds.

Fixes #3496
2016-06-11 06:43:56 -07:00