Commit graph

4 commits

Author SHA1 Message Date
Eric Erhardt
6468b14e1d Move to CoreFX build rc2-23901
Update .exe's project.json Target Framework from dnxcore50 to netstandardapp1.5.
Update .dll's project.json Target Framework from dnxcore50 to netstandard1.3.

Adding workaround for DataContractSerialization to src\dotnet\project.json to fix crossgen issue.
Build 23901 has a dependency issue that doesn't allow the runtime.any.System.Private.DataContractSerialization
package to be restored. When we move to a new build of CoreFX we should take this workaround out.
2016-03-03 16:41:55 -06:00
Sridhar Periyasamy
2a94a1e384 Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into test-fx
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
2016-02-12 17:26:58 -08:00
Sridhar Periyasamy
f86952cf1d Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into test-fx 2016-02-11 14:22:24 -08:00
Sridhar Periyasamy
d1d14283a1 TestFramework with support for managing test projects.
The CLI tool's tests are run against sample test projects for validation.
TestFramework provides an easy way to manage these sample test projects.

Converted the publish test to use the TestFramework.
2016-02-10 00:21:19 -08:00
Renamed from TestAssets/TestProjects/TestApp/project.json (Browse further)