Commit graph

156 commits

Author SHA1 Message Date
Ryan Nowak
6a1b41fac6 Update version of routing to 1.0.1
This is needed because MVC still references 1.0.0.
2016-08-31 13:42:05 -07:00
cartermp
07b581f091 Add missing comma to F# lib project.json 2016-08-31 12:13:31 -07:00
Ryan Nowak
9646db0cc8 Update cshtml wildcard in publishOptions
Updating the publishOptions wildcard that used to publish everything in
the views folder to now publish all .cshtml files. The problem was that
the old wildcard only included the Views folder and didn't include
anything in the Areas/*/Views folders (used by views inside areas).

This change makes things much simpler, all .csthml files are published.
2016-08-31 11:31:10 -07:00
cartermp
5d8aedebf3 Don't print arguments in F# console app 2016-08-31 11:27:18 -07:00
cartermp
0c10baa40d 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-08-31 11:26:41 -07:00
Ryan Nowak
01caa0fb4f Update MVC version to 1.0.1
We're shipping a new patch of all MVC packages in 1.0.1. This bumps up the
version number of the MVC metapackage so that projects created with
`dotnet new` get the latest version.
2016-08-31 11:22:43 -07:00
Sridhar Periyasamy
8fcfc2af05 Upgrade Corefx and coreclr references
Microsoft.NetCore.App 1.0.0 => 1.0.1
Microsoft.NETCore.Runtime.CoreCLR 1.0.2 => 1.0.4
CLI Branding "Microsoft .NET Core 1.0.0 - SDK Preview" => "Microsoft .NET Core 1.0.1 - SDK 1.0.0 Preview 2-003122"

List of changes
- all project.jsons
- dotnet new templates
- and build projects files
   - shared-build-targets-utils\DependencyVersions.cs
   - CliDependencyVersions.cs
2016-08-31 10:41:47 -07:00
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
eerhardt
354b1d38d5 Updating CoreFx, CoreSetup to rc3-24206-00, rc3-004404 respectively 2016-06-06 14:24:51 +00:00
eerhardt
ea8ae8d1c7 Updating CoreFx, CoreSetup to rc3-24204-00, rc3-004400 respectively 2016-06-04 18:32:34 +00:00
Eric Erhardt
4f95bc0010 Update CoreSetup to rc3-004397 2016-06-04 00:00:28 -05:00
Eric Erhardt
f16f2e64eb Updating CoreFx, CoreSetup, Roslyn to rc3-24201-00, rc3-004391, beta1-20160602-01 2016-06-03 07:27:42 -05:00
Eric Erhardt
351255dda1 Updating CoreSetup to rc3-004373 2016-06-02 14:45:00 -05:00
eerhardt
657c03b625 Updating CoreFx, CoreSetup to rc3-24131-00, rc3-004363 respectively 2016-05-31 20:27:46 +00:00
Eric Erhardt
d50068a5e4 Updating CoreFx, CoreSetup to rc3-24128-00, rc3-004338 respectively 2016-05-31 12:55:36 -05:00
eerhardt
a087de2f87 Updating CoreFx, CoreSetup to rc3-24127-01, rc3-004336 respectively 2016-05-28 00:48:49 +00:00
eerhardt
80820a638b Updating CoreFx, CoreSetup to rc3-24127-00, rc3-004324 respectively 2016-05-27 18:12:45 +00:00
eerhardt
ef76efa02c Updating CoreFx, CoreSetup to rc3-24126-01, rc3-004322 respectively 2016-05-27 08:05:08 +00:00
Zlatko Knezevic
18e3892529 Move the Microsoft.NETCore.App dependency under the Framework
As per #2970, this PR moves the main metapackage dependency under the
framework. In the F# project.json, it moves *just this* under the
framework, while the F# Core package remains under general
dependencies. The rationale is that since this is an F# project, this
packages is needed for all TFMs in the project.

Fixes #2970
2016-05-26 19:03:00 -07:00
Eric Erhardt
cc178d425f Update CoreFx, SharedFx to rc3-24126-00, rc3-004312 2016-05-26 13:11:22 -05:00
Eric Erhardt
70ed305171 Update dotnet-new project.json templates
Now that Microsoft.NETCore.App is built in a separate repo, we don't need the project.json.pretemplate files.
2016-05-26 09:44:21 -05:00
Zlatko Knezevic
ca554c9838 Fix the dotnet-new README.md (#2891)
Remove the `--type` additional options that are not valid. 

skip ci please

Fix #2867
2016-05-04 15:43:34 -07:00
dasMulli
d39a905a5b Updated dotnet-new templates to new project.json schema. 2016-05-03 23:19:20 +02:00
Eric Erhardt
44483ddc98 Remove System.CommandLine dependency.
Also removed the dependency on Microsoft.Extensions.CommandLineUtils.Sources NuGet package and instead just checking the source files into our repo as internal classes.

Fix #2526
2016-04-20 18:47:37 -05:00
Piotr Puszkiewicz
496ec6b474 dotnet-new template imports dnxcore50. Tests Green. 2016-04-19 11:22:45 -07:00
Zlatko Knezevic
c83a2fb6f9 Add and modify commands' README files (#2338)
* Add and modify commands' README files

Update those READMEs that are outdated. Add READMEs for dotnet pack
and dotnet restore as well.

* Removing private info, adding feedback alias
2016-04-15 10:36:31 -07:00
Eric Erhardt
99371436f3 Consume NETCore.App 2016-04-08 09:27:23 -05:00
Matt Ellis
d0ac16129d Update package dependencies to rc2-24008 2016-04-08 04:05:26 -07:00
Peter Marcu
aa88de1e6c Merge pull request #2198 from dotnet/Petermarcu-update-netcoreapp
Update project.json template to be netcoreapp1.0
2016-04-07 09:07:37 -07:00
Bryan Thornbury
3e903438b3 Merge pull request #2319 from dotnet/brthor/remove-nuget-config
Remove NuGet.config from the default dotnet new drop.
2016-04-06 22:35:12 -07:00
Bryan Thornbury
939366165f Remove NuGet.config from the default dotnet new drop. Patch the tests to cover this gap until corefx is on nuget.org 2016-04-06 14:34:39 -07:00
Peter Marcu
d8858e4d6b Update project.json template to be netcoreapp1.0
It should be time, now that RID inference is off, to update dotnet new to finally use netcoreapp1.0.
2016-04-04 14:43:50 -07:00
Bryan Thornbury
8370effbb0 Add imports to the fsharp dotnet new template 2016-04-01 15:35:12 -07:00
Bryan
0fd81e0a2d Extract dotnet-compile-fsc into a standalone command
Add basic Tests for dotnet-compile-fsc

Package Targets execute before TestTargets. Use Generated Nuget Packages in TestTargets. Generate Nuget packages on all platforms, and in C#

Fix bug in dotnet-restore, change fsharp new template, add support for native assets in DependencyContextCsvReader

copy fsc.exe to temp directory instead of package cache

fix rebase error

fix issue

fixes

fixes

fix

temporarily disable debian package e2e testing

fixes

bump fsc version

update fsc version

fix rebase errors

WIP update fsc tool

WIP, rebased and working again, need to solve issues with System.CommandLine

Working state for packaged, command, fsc.exe bugging out with dlopen(, 1): no suitable image found.

execute fsc like a unpublished standalone app

fixup after rebase

working? internet is out

working

cleanup

More cleanup, and run the debian package tests during the Test phase of the build.

update FSharp Test Projects NetStandard Library Version

Update Version Suffix when packing TestPackages. This will enable packing with the right dependency versions on Windows.

update dotnet-test version

Undo the reordering of the build

fix test package project pathsj

ignore net451 build failures for test packages which we need to build on non-windows

update dependency of desktop test app

add dotnetcli feed to nuget config for fsharp dotnet new

update deps after rebase

update dependency of dotnet-compile-fsc

pass args before commandPath when using muxer for tools

adjust testpackage cleaning not to clean packages which are also generated as part of the product from the nuget cache.

undo

Pass projectJson to pack instead of using WorkingDirectory

fix path separators using depsjsoncommandresolver on windows, fix building only specific frameworks for testpackages on non-windows.

PR Feedback

rebase

overwrite fsc runtimeconfig
2016-03-31 14:01:08 -07:00
eerhardt
3afd85068a Updating dependencies from last known good builds 2016-03-31 11:57:21 -05:00
Eric Erhardt
8816664062 Merge pull request #2136 from eerhardt/UpdateDependencies20160330021008
Updating CoreFX from rc2-23929 to rc2-23930
2016-03-30 18:32:17 -05:00
eerhardt
ea984c50c7 Updating dependencies from last known good builds 2016-03-30 11:49:37 -05:00
Peter Marcu
0ef189c07a Update new template to remove imports 2016-03-29 23:02:58 -07:00
eerhardt
7eb9d07fb5 Updating dependencies from last known good builds 2016-03-29 15:59:19 +00:00
eerhardt
cefed77ca9 Updating dependencies from last known good builds 2016-03-28 17:27:54 +00:00
eerhardt
ed887d183a Updating dependencies from last known good builds 2016-03-25 16:48:25 -05:00
Eric Erhardt
1febe48d71 Updating CoreFX version to rc2-23924 2016-03-24 16:05:24 -05:00
Eric Erhardt
a5813791d5 Updating CoreFX version to rc2-23923 2016-03-24 16:04:37 -05:00
eerhardt
9bc478660a Updating dependencies from last known good builds 2016-03-24 16:02:33 -05:00
Andrew Stanton-Nurse
43512b8973 add support for type: platform
also some refactoring of DependencyContext to properly handle
placeholders in 'runtimeTargets'.
2016-03-23 21:53:14 -07:00
Enrico Sada
c2afaa265f bump f# compiler and FSharp.Core 2016-03-16 16:19:28 +01:00
Andrew Stanton-Nurse
cc00d9d839 update project templates for portable app
also fix dotnet run
2016-03-15 15:18:48 -07:00
eerhardt
8953400eee Updating dependencies from last known good builds 2016-03-14 17:58:13 -05:00
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
Andrew Stanton-Nurse
b5450cabc2 update version in 'dotnet new' template 2016-02-11 12:11:45 -08:00
Eric Erhardt
74d8051f79 Bump CoreFx to rc2-23810 2016-02-10 13:50:28 -06:00