Commit graph

99 commits

Author SHA1 Message Date
Piotr Puszkiewicz
ab1797cb29 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-26 22:39:40 -07:00
Piotr Puszkiewicz
1ce482a8d1 Merge remote-tracking branch 'refs/remotes/origin/rel/1.0.0'
Conflicts:
	scripts/obtain/dotnet-install.ps1
	src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template
2016-08-26 22:39:14 -07:00
Simon de Lang
8f92f0d74b Update xunit dependencies for CSharp_xunittest template 2016-08-25 15:02:52 +02:00
Eric Erhardt
a543050c62 Update the Sdk version to the latest build. 2016-08-23 13:44:07 -05:00
Piotr Puszkiewicz
578adf072c Merge remote-tracking branch 'refs/remotes/origin/feature/msbuild'
Conflicts:
	src/dotnet/Program.cs
2016-08-18 18:08:45 -07:00
Piotr Puszkiewicz
c5cc9feb6d Update xunit template 2016-08-18 17:10:20 -07:00
Piotr Puszkiewicz
e92c9603c8 Test reliability and format cleanups 2016-08-18 17:10:20 -07:00
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
Eric Erhardt
6cf2167992 Update the CLI to use the new Core SDK nuget package.
No need for build3 to set Platform properties and BaseNuGetRuntimeIdentifier.  The SDK handles that.

Also, no need to set "runtimes" any more in the default project.json.
2016-08-11 12:05:28 -05:00
Livar Cunha
dc7f1fdf84 Updating the xunit version to one that does not depend on internalabstractions. 2016-08-10 13:40:13 -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
408d083525 eeeek! (sorry, wrong dependency version edited) 2016-08-03 22:06:17 +01:00
jplebre
4508884c42 clean up and added nunit command to README 2016-08-03 22:06:17 +01:00
jplebre
09d37fe3ec removed the -* from version numbers in xunit and nunit templates 2016-08-03 22:06:17 +01:00
jplebre
82bf84f46b projec.json should be the same as nunit's template 2016-08-03 22:06:17 +01:00
jplebre
069a351971 adding nunit test to the list of commands 2016-08-03 22:06:17 +01:00
Zlatko Knezevic
6766017ffb Responding to PR feedback 2016-07-22 12:11:01 -07:00
Zlatko Knezevic
252be27100 Remove namespace and public from console app
Fixes #745, #3531
2016-07-22 11:56:05 -07:00
Eric Erhardt
69619c0716 PR feedback. 2016-07-21 18:17:20 -05:00
Eric Erhardt
b068687413 Implement 'run3' command which will execute the MSBuild project.
Also create a 'dotnet new -t msbuild' template.
2016-07-21 11:57:20 -05:00
Eric Erhardt
d2db776d87 Merge rel/1.0.0 into feature/msbuild. 2016-07-18 14:44:06 -05:00
cartermp
e1be430f59 Add missing comma to F# lib project.json 2016-07-12 15:33:18 -07:00
Eric Erhardt
fc73287c53 Merge pull request #3789 from cartermp/fs-update
Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase)
2016-07-12 13:45:43 -05:00
Mark Clearwater
6df15c341a Fix typo in Avaiable
* Should be Available
2016-07-09 19:10:54 +01:00
cartermp
fd1da95522 Don't print arguments in F# console app 2016-07-07 14:00:42 -07:00
cartermp
51e7ab465b Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase)
This updates the F# templates for dotnet-new to be compatible with Preview 2.
2016-07-05 21:38:12 -07:00
Piotr Puszkiewicz
d6849c2fa1 Piotrp msft/3628 rebase (#3694)
* fix typo

* doc
2016-06-28 16:29:36 -07:00
Eric Erhardt
cec5bacaad Merge branch 'feature/msbuild' of https://github.com/dotnet/cli.git 2016-06-23 17:52:51 -05:00
Bryan Thornbury
400e1db3b9 dotnet-build3 Adding msbuild execution command to cli 2016-06-23 13:57:33 -07:00
Petr Onderka
63846c5751 Added valid --type values to dotnet help new (#3644)
Used approach that ensures valid values for --lang and --type
in dotnet help new are always up to date.
2016-06-22 15:20:40 -07:00
Lakshmi Priya
8dd2479965 Check if project.json exists before creating new project in the same dir (#3543)
* Check if project.json exists before creating new project in the same dir.

* Change error message.
2016-06-14 13:20:29 -07:00
Eric Erhardt
b93388cde2 Merge pull request #3555 from dotnet/FinalSharedFX
Final shared framework versions
2016-06-14 11:39:11 -05:00
Zlatko Knezevic
4da4f95e21 Update documentation (#3549)
* Updating README.md files as well as man pages

This aligns with the latest changes in the official documentation. It also aligns dotnet test readme.md to official docs and introduces a new doc in the "Documentation" directory that deals with dotnet test protocols.
2016-06-14 06:42:21 -07:00
Bryan Thornbury
9e97d0400c dotnet-compile-fsc bump to latest 2016-06-14 03:31:22 -07:00
Eric Erhardt
f25f047376 Updating CoreFX, CoreCLR, Roslyn, CoreSetup to stable versions. 2016-06-14 03:14:53 -05:00
Eric Erhardt
8e83ccb659 Merge pull request #3518 from eerhardt/UpdateDependencies20160611042958
Updating CoreFx, CoreClr, Roslyn, CoreSetup to rc3-24210-10, rc3-24210-10, beta1-20160610-04, rc3-3004459-00 respectively
2016-06-11 11:33:21 -05: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
eerhardt
2aa3dd0843 Updating CoreFx, CoreClr, Roslyn, CoreSetup to rc3-24210-10, rc3-24210-10, beta1-20160610-04, rc3-3004459-00 respectively 2016-06-11 04:29:58 +00:00
eerhardt
7b51f28c7f Updating CoreFx, CoreClr, CoreSetup to rc3-24210-06, rc3-24210-01, rc3-3004449-00 respectively 2016-06-10 15:05:30 +00:00
Eric Erhardt
ef4a8e85ef Updating CoreSetup to rc3-004443-00. 2016-06-10 01:09:46 -05:00
eerhardt
cd9bcd40b3 Updating CoreFx, CoreClr, CoreSetup to rc3-24209-08, rc3-24208-04, rc3-3004442-00 respectively 2016-06-09 21:14:15 -05:00
Ajay Bhargav Baaskaran
1d44105b4b [Fixes #3421] Made dotnet new templates generate portable pdbs 2016-06-09 12:05:54 -07:00
Zlatko Knezevic
4b1735bdaf Fixing F# template project.json
Two changes:
1. Moving from netstandard1.5 to netcoreapp1.0
2. Fixing the version of F# netcore package
2016-06-09 08:17:45 -07:00
Zlatko Knezevic
85e4ed2b74 Responding to PR feedback 2016-06-09 08:06:38 -07:00
Zlatko Knezevic
c066ef1540 Add C# Lib and xunittest templates
Adding the C# lib and xunittest templates to `dotnet new`. These need
to be invoked with the `dotnet new -t lib` and `dotnet new -t
xunittest` keywords respectively.
2016-06-09 08:06:03 -07:00
Eric Erhardt
f43aad780c Updating CoreFx, CoreClr, Roslyn, CoreSetup, DiaSymReader to rc3-24208-04, rc3-24208-04, beta1-20160608-03, rc3-004425, rc2-60608-04 respectively 2016-06-08 22:56:25 -05:00
Ajay Bhargav Baaskaran
4a88cff185 [Fixes #3255] Added a web template to dotnet new 2016-06-08 11:31:08 -07:00
Eric Erhardt
d2f1fa0300 Updating CoreFx, CoreClr, CoreSetup to rc3-24207-03, rc3-24207-03, rc3-004415 respectively. 2016-06-07 18:24:30 -05:00
Eric Erhardt
334b079995 Updating CoreSetup, Roslyn, DiaSymReader to rc3-004408, beta1-20160606-02, 1.0.8-rc2-60606-01 respectively. 2016-06-06 18:56:24 -05:00
Eric Erhardt
42938f180f Updating CoreSetup to rc3-004406 2016-06-06 11:15:07 -05:00