Commit graph

704 commits

Author SHA1 Message Date
Jeff Kluge
a2d438288e Reduce line lengths 2016-11-02 13:06:44 -07:00
Justin Goshi
d1772f6ed4 Add mstest support (#4572)
* Migrate: auto-injected dependencies should overwrite existing dependency version if present

* WIP adding new mstest templates

* Auto-inject mstest dependencies when testrunner is set to mstest

* WIP trying to get new web test to work

* Get dotnet new -t Web test to pass

* Remove whitespace and accidentally added (redundant) tests

* Shorten test method name
2016-11-02 08:49:45 -10:00
Jeff Kluge
efa1cef866 Some more try...catches 2016-11-02 08:04:02 -07:00
Justin Goshi
3f7a21339f Fix typo in dotnet test help message 2016-11-01 18:57:32 -07:00
Livar Cunha
9139c4006b Fixing full framework tests 2016-11-01 00:31:21 -07:00
Livar Cunha
c2f60cede4 Updating the SDK to the latest. 2016-11-01 00:29:54 -07:00
Jeff Kluge
595a768e30 Custom logger for MSBuild to receive telemetry events (#4551)
* Upgrade MSBuild references to 15.1.0-preview-000370-00

* Custom logger for MSBuild to receive telemetry events

Had to make the telemetry session ID a static variable so that the forwarding app could use it.

I've tested this all manually and will be writing tests after everyone signs off on the implementation here.
2016-10-31 16:16:39 -07:00
Livar
5a621b53e2 Merge pull request #4540 from livarcocc/issue4492/migrateWeb
Issue4492/migrate web
2016-10-31 12:26:26 -07:00
Livar Cunha
b45a3ba698 Addressing code review comments by Adding an enum, renaming the PackageConstants and making the Sdk.Web version the same as the Sdk version. 2016-10-31 11:00:43 -07:00
Piotr Puszkiewicz
f53c51fc07 [WiP] enable /m by default (#4543)
* MSBuild integration project + refactoring

* Feature Complete

* Change default target to an existing one
2016-10-29 12:08:52 -07:00
Piotr Puszkiewicz
5ede3b6367 post migration cleanup (#4449)
* Create tests

* Basic scenario working & tested

* Feature Complete

* prevent build of intentionally broken test asset

* Update migrate command backup

* PR Feedback

* Move negative test to negative test directory

* Fix tests

* make test output directories unique

* Merge Conflict

* make backup the default behavior

* Pass2Fail

* Remove tests' PJ dependency
2016-10-29 01:58:37 -07:00
Livar
be8f2e212e Merge pull request #4519 from livarcocc/whitespace
Adding whitespace to csproj and removing xml node from the beginning of it
2016-10-28 20:54:58 -07:00
Livar Cunha
3752264b8e Pulling in the new msbuild based xunit template 2016-10-28 18:20:53 -07:00
Livar Cunha
59ac685dcd Updating the msbuild version to one with the preserve compilation context fix. 2016-10-28 18:19:41 -07:00
Livar Cunha
9e49ec2723 Replacing DeepClone with a call that creates a copy of the project using the template csproj under a new ProjectCollection everytime. 2016-10-28 18:19:40 -07:00
Bryan Thornbury
c9f9421b93 preserve whitespace 2016-10-28 18:19:39 -07:00
Faizan Ahmad
a09690d8df 1) Added diag support
2) Added log in test which are failing in windows machine for framework net46
2016-10-28 20:15:38 +05:30
Piotr Puszkiewicz
6fcbefa4f7 [WIP] Removes *3 verbs, making msbuild the driver (#4456)
Removes *3 verbs, making msbuild the driver
2016-10-27 18:46:43 -07:00
Justin Goshi
68afda8e4d Handle "runtimes" section (#4503)
* Migrate "runtimes" section as a RuntimeIdentifiers property in the resulting csproj file. Also do not call restore3 from publish3 anymore.

* Fix up the publish3 tests to call restore3 first and the csproj files to have RuntimeIdentifiers
2016-10-26 22:23:40 +00:00
Eric Erhardt
33ec55aee3 Fix dotnet run3 --project to pass the project to msbuild.
Also update Microsoft.NET.Sdk to 1.0.0-alpha-20161026-2 since this has the corresponding fix needed for https://github.com/dotnet/sdk/issues/301.
2016-10-26 00:04:40 -05:00
Livar
f68670e13c Merge pull request #4438 from jeffkl/restore
Reduce MSBuild verbosity for restore
2016-10-24 12:49:07 -07:00
Livar
501d575aeb Merge pull request #4455 from livarcocc/update_sdk
Updating the SDK version to the latest.
2016-10-19 20:55:43 -07:00
Livar Cunha
368d7a19af Updating the SDK version to the latest. 2016-10-19 16:21:54 -07:00
Livar Cunha
22bc479927 Updating msbuild to 15.1.319-preview5 2016-10-19 12:43:21 -07:00
Livar
b7ac730a7f Merge pull request #4444 from livarcocc/update_templates
Updating the msbuild templates in the CLI to use TargetFramework
2016-10-18 17:39:03 -07:00
Livar Cunha
e2e72a9662 Updating the msbuild templates in the CLI to use TargetFramework (singular). 2016-10-18 15:02:35 -07:00
Livar Cunha
440871bad0 Removing -t msbuild, now that the default template is msbuild. 2016-10-18 10:35:04 -07:00
Jeff Kluge
c98b6cc412 Reduce MSBuild verbosity for restore
Remove the MSBuild logo
Set verbosity to minimal
2016-10-18 09:10:26 -07:00
Eric Erhardt
1b6502848e Respond to PR feedback. 2016-10-17 21:03:09 -05:00
Eric Erhardt
cbeb5b9912 Report a meaningful error when trying to run a multi-TFM project.
Add `--no-build` option to `dotnet run3` since even incrementally building a project takes a non-trivial amount of time.
2016-10-17 21:00:58 -05:00
Piotr Puszkiewicz
cfcc97b3f0 Move Web template to csproj (#4429)
* Move Web template to csproj

* PR Feedback

* Updated template
2016-10-17 14:45:37 -07:00
Eric Erhardt
c3ddbba163 Rename restore3 --recursive to --no-dependencies to match the build3 option. 2016-10-14 17:28:58 -05:00
Justin Emgarten
bc82b16a01 Merge pull request #4406 from dotnet/emgarten/solutionRestore
Adding recursive restore and solution level restore
2016-10-14 11:18:24 -07:00
Piotr Puszkiewicz
02a19aff56 dotnet-new csproj templates (#4382)
Make csproj templates first-class in dotnet-new.
2016-10-14 00:06:35 -07:00
Justin Emgarten
fcdc23233e Recursive restore and solution restore support
This change adds support for restoring solution files with msbuild /t:Restore and dotnet restore3.
Restoring a project file will now recursively restore all dependency projects to match build.

Fixes https://github.com/dotnet/cli/issues/4252
Related to: https://github.com/NuGet/Home/issues/2993
2016-10-13 19:18:02 -07:00
Faizan Ahmad
4dd685a45c Addressed livar PR comment 2016-10-12 15:20:07 +05:30
Faizan Ahmad
391fff1f20 Merge branch 'rel/1.0.0' into clitest3verb 2016-10-12 11:57:46 +05:30
Justin Goshi
07418af874 Fixes #4293
https://github.com/dotnet/cli/issues/4293
2016-10-11 18:25:47 -10:00
Justin Goshi
59f2483fd3 https://github.com/dotnet/cli/issues/4293
Improve help text for commands that shell out to msbuild.
2016-10-11 17:29:09 -07:00
Eric Erhardt
b5329995d8 Merge branch 'rel' 2016-10-11 17:01:33 -05:00
Justin Goshi
19abf66412 Fixes issue #4313
Improve error messages for the migrate command
2016-10-11 10:58:49 -10:00
Piotr Puszkiewicz
28193c5f75 Merge pull request #4303 from dasMulli/feature/dotnet-clean-verb
Added clean3 verb for msbuild based projects.
2016-10-11 11:36:27 -07:00
Justin Goshi
48ae5d17ac Improve error messages for the migrate command
https://github.com/dotnet/cli/issues/4313
2016-10-10 15:38:25 -07:00
Eric Erhardt
eec324a844 Move all CLI libraries to be single-TFM targeting netstandard1.3 where possible.
Microsoft.Extensions.Testing.Abstractions is the only one I couldn't move to netstandard1.3 that should be.  But this library should be removed with the new `dotnet test` strategy.
2016-10-10 15:57:08 -05:00
Eric Erhardt
633b56e448 Update Microsoft.NETCore.Sdk => Microsoft.NET.Sdk. 2016-10-10 14:04:30 -05:00
dasMulli
148319a3c2 Added clean3 verb for msbuild based projects. 2016-10-10 18:31:30 +02:00
Faizan Ahmad
23af21d7bb Merge with rel/1.0.0 2016-10-10 15:29:35 +05:30
Bryan Thornbury
2727b191e3 Merge pull request #4310 from brthor/brthor/migrationreport
Migration Report
2016-10-07 11:01:06 -07:00
Livar Cunha
167470b1c9 Updating the SDK version, which we need to pick up the NuGetTargetMoniker fix. 2016-10-06 18:31:15 -07:00
Bryan Thornbury
fbaf9a679e Project Migration Report 2016-10-06 15:56:15 -07:00
Rohit Agrawal
28bd507f40 update nuget and sdk to 3.6.0-rc-1954 and 1.0.0-alpha-20161006-3 (#4332) 2016-10-06 09:35:58 -07:00
Faizan Ahmad
3f271e1215 Merge branch 'rel/1.0.0' into clitest3verb 2016-10-06 17:50:59 +05:30
Sridhar Periyasamy
c6064677db Address PR feedback 2016-10-05 17:58:42 -07:00
Sridhar Periyasamy
1d85c241b1 Add support to migrate folders specified in global.json 2016-10-05 16:27:17 -07:00
Faizan Ahmad
a8e7df848b Adding support for noBuild, output and framework. 2016-10-06 04:33:54 +05:30
Fredric Silberberg
b2802cdf50
Added comment about updating in VS calls of dotnet migrate when cli args change. 2016-10-05 14:26:20 -07:00
Bryan Thornbury
7632cd3502 Merge pull request #4261 from brthor/brthor/packageref
PackageReference Migration
2016-10-04 14:42:43 -07:00
Faizan Ahmad
579df78466 - Implementation of test3 verb for single TragetFramework
- E2E test for test3 verb.
2016-10-04 15:37:36 +05:30
Bryan Thornbury
adff632929 green 2016-10-03 20:10:09 -07:00
Eric Erhardt
5055935008 Merging rel/1.0.0-preview2 into rel/1.0.0. 2016-10-03 14:47:24 -05:00
Eric Erhardt
a7366f5864 Add support for publishing self-contained applications.
Fix #4204
2016-10-03 09:23:00 -05:00
Livar Cunha
5f3da6428d Testing out a theory that setting the output path will solve this problem. 2016-09-30 15:52:22 -07:00
Livar Cunha
27b5abfc36 Trying out with the latest SDK. 2016-09-30 12:03:03 -07:00
Livar Cunha
4173d19b3c Pinning the SDK version for migrated apps. 2016-09-30 09:27:16 -07:00
Livar Cunha
29b197534c Updating to a new SDK and adding a work around to set project.lock.json for migrated projects. 2016-09-30 09:27:15 -07:00
Livar Cunha
7e16ad0388 Adding TargetFrameworks even for single TFM and cleaning up PackageRef. 2016-09-30 09:27:15 -07:00
Livar Cunha
715f1f6a10 Addressing code review comments. 2016-09-30 09:27:15 -07:00
Livar Cunha
c04f7a0cd0 Changing the migrate command to obtain the sdk package version from the PackageRef in csproj instead of project.json. 2016-09-30 09:27:15 -07:00
Livar Cunha
c41b35f06f Updating tests to reflect msbuild projects running without project.json. 2016-09-30 09:25:11 -07:00
Livar Cunha
2bbef9328b Removing project.json from msbuild template and msbuild test app. 2016-09-30 09:25:11 -07:00
Eric Erhardt
ce6c29676d Adding "BuildRid" to the CLI as a fallback RID to use when inferring which RID to use when building, running, and publishing self-contained applications.
This enables users to use the CLI on newer versions of the OS that aren't fully supported yet - for example using a new OSX version that isn't listed in the runtime graph in the current NuGet packages.

Fix #4238
2016-09-29 22:39:00 -05:00
Sridhar Periyasamy
98231a6628 Merge pull request #4254 from dotnet/sridhar-ms/migrate-directory
Add support to migrate a directory.
2016-09-29 10:13:55 -07:00
Sridhar Periyasamy
a50708ac5c Address PR feedback 2016-09-28 09:00:15 -07:00
Livar Cunha
f0a50c92ac Fixing issues small issues found during build and tests. 2016-09-27 10:53:22 -07:00
Livar Cunha
6527cbc592 Replacing the LockFile APIs from the one in ProjectModel to the one in NuGet.ProjectModel. 2016-09-27 10:53:21 -07:00
Sridhar Periyasamy
7ee2bd1f26 Add support to migrate a directory.
- Given a directory migrate all the project.jsons in it recursively.
- Remove '-p/--project' option. Instead directly pass a directory or project.json as argument.
- Add tests.
2016-09-26 14:16:17 -07:00
Eric Erhardt
5434c7f392 Merge pull request #4237 from eerhardt/PublishCommand
Add `dotnet publish3` command
2016-09-26 11:51:19 -05:00
Sridhar Periyasamy
038fb6fbae Merge pull request #4221 from dotnet/sridhar-ms/multiple-proj-migrate
Migrate P2P references
2016-09-23 22:30:58 -07:00
Eric Erhardt
fce4b9044a Respond to PR feedback. 2016-09-23 16:53:57 -05:00
Sridhar Periyasamy
46ab621422 Migrate P2P references
- Given a project migrate all the project references recursively.
- Add a boolean option '--skip-project-references' to skip migrating P2P references. By default P2P references are migrated.
- Remove the '--output' since it is not used heavily and makes migrating multiple projects easier.
- Add tests
2016-09-23 14:25:57 -07:00
Eric Erhardt
66fbd6f278 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160923-4. 2016-09-23 16:14:03 -05:00
Livar Cunha
f11e555480 Adding framework as an option to the run3 verb. 2016-09-23 11:16:52 -07:00
Livar Cunha
bd2e66fca6 Switching to a new API to detect platform. 2016-09-23 10:40:25 -07:00
Livar Cunha
4019fdca16 Removing DotnetHostPath and setting CscToolExe to determine which script to use to run csc.exe using dotnet. Need to add the script counterpart for windows still. Doing that next. 2016-09-23 10:16:44 -07:00
Eric Erhardt
eed29be806 Add dotnet publish3 command. 2016-09-23 12:12:55 -05:00
Eric Erhardt
d4f6144355 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160921-4. 2016-09-23 12:12:55 -05:00
Eric Erhardt
5cfe3e9ff5 Merge pull request #4229 from eerhardt/NewCommands
Create a `dotnet msbuild` command and fill out the applicable command line arguments to `dotnet build3`.
2016-09-23 09:05:01 -05:00
Bryan Thornbury
a04194c0f7 Merge pull request #4224 from brthor/brthor/remove-nuget
Migration: Remove dependency on lock file and dotnet restore
2016-09-22 18:47:58 -07:00
Eric Erhardt
65218848e8 Respond to PR feedback. 2016-09-22 19:11:08 -05:00
James Ko
5397cac939 Remove whitespace from dotnet-new C# library template 2016-09-22 17:50:33 -04:00
Eric Erhardt
d6adea1af0 Create a dotnet msbuild command and fill out the applicable command line arguments to dotnet build3.
Fix #4203
2016-09-22 14:47:50 -05:00
Bryan Thornbury
5d2f0579d2 Migrate xproj to csproj dependencies 2016-09-21 17:27:02 -07:00
Rohit Agrawal
bf8b588e8b add includesymbols and includesource to pack3 command as symbols package is not created by default (#4193) 2016-09-21 16:39:59 -07:00
Faizan2304
0ce597a147 Implemented vstest verb which will run the test from given container. (#4115)
* Implemented vstest verb which will run the test from given container.

* Fixed Nitpick.

* 1) Addressed PR comment
2) Added tests for vstest verb

* Using specific version of Microsoft.TestPlatform.

* Address PR comments.

Modified help text for the vstest command.
Removed unused function.

* Fixed package related issue.
--Taking reference of microsoft.testplatform.cli nuget package which has contentFolder in it so that sub folder of this nuget can also be added in cli package.
-- Removing vstest.console, vshost and datacollector from Bundletools as we dont want *.deps.json to be override

* Nitpick

* Making vstest.console arguments compatible for non windows platform

* Fix tests to run on linux machine

* Updated the microsoft.testplatform.cli nuget package version. This version has fix related to non windows machine.

* changed dapter path from bin/debug to bin/Debug

* updated nuget version of package Microsoft.TestPlatform.CLI.

* Revert "updated nuget version of package Microsoft.TestPlatform.CLI."

This reverts commit bcc26c21d11c2bd2e5259a74f9890b0fd75962c7.

* Updated version of nuget package Microsoft.TestPlatform.CLI
Added Test project in solution file

* Addressed PR comment.

* Removed unnecessary --platform argument from test
2016-09-19 10:59:26 -07:00
Eric Erhardt
95def6b243 Merge pull request #4178 from kotovaleksandr/rel/1.0.0
fix #4090
2016-09-15 10:57:56 -05:00
Eric Erhardt
3026eb9d35 Add a better error message for 'dotnet run3' when it is unable to find a RunCommand property. 2016-09-14 16:27:52 -05:00
Eric Erhardt
f9953c1e68 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160914-1. 2016-09-14 14:55:17 -05:00
kotov.a
8a93af528b fix #4090 2016-09-14 16:35:37 +03:00
Eric Erhardt
a8c804cba7 Update the CLI to the new Run static properties from the SDK.
See https://github.com/dotnet/sdk/issues/98
2016-09-13 20:47:22 -05:00
Rohit Agrawal
194a850c71 update nuget and sdk to include msbuild pack target 2016-09-12 17:10:31 -07:00
Eric Erhardt
5035746370 Merge pull request #4152 from livarcocc/bring_back_project_model_server
Adding dotnet-projectmodel-server back
2016-09-12 14:39:38 -05:00
Eric Erhardt
f084032af6 Ensure the project is built in dotnet run3. 2016-09-09 08:53:57 -05:00
Livar Cunha
55c57608f8 Adding dotnet-projectmodel-server back because ASP.NET needs it to unblock themselves from start migrating to msbuild. We need to remove this as soon as ASP.NET can migrate all their projects to csproj and the tooling is in place. 2016-09-07 14:14:41 -07:00
Eric Erhardt
ab8e1b707b Merge pull request #4143 from eerhardt/NewSDK
Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160907-1
2016-09-07 15:44:23 -05:00
Eric Erhardt
8000c98103 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160907-1 2016-09-07 14:49:18 -05:00
Livar Cunha
1767385aa1 Updating versions in a few places that did not exist in the preview2 branch. 2016-09-02 15:01:59 -07:00
Livar Cunha
27bc1c4f91 Merge branch 'rel/1.0.0-preview2' into merge_preview2_to_rel100
* rel/1.0.0-preview2:
  Update versions of EF and scaffolding tools
  Update Kestrel to 1.0.1
  Update version of routing to 1.0.1
  Add missing comma to F# lib project.json
  Update cshtml wildcard in publishOptions
  Don't print arguments in F# console app
  Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase)
  Update MVC version to 1.0.1
  Upgrade Corefx and coreclr references
  fix typo in dotnet-install file
  Remove the VS2012 CRT dependency from docs (#3632)
  Fix README to use hostfxr download links (#3622)
  Fix Oracle Linux version in README.md
  Use NugetCache Sentinel for Telemetry setting.
  Add Serviceable assembly attribute and nuspec attributes for all shipping CLI assemblies.
  Remove showing firsttime eula for non verbs.
  Adding Oracle Linux and Linux Mint to the titles
  Moving Ubuntu 16.04 to be next to Ubuntu 14.04
  Update README.md
2016-09-02 14:53:16 -07:00
Eric Erhardt
0e4044b8bd Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160831-1 2016-09-01 11:08:34 -05:00
Ryan Nowak
5e173f38e9 Update versions of EF and scaffolding tools 2016-08-31 14:42:29 -07:00
Ryan Nowak
6bd5bfc3e5 Update Kestrel to 1.0.1 2016-08-31 13:53:02 -07:00
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
PiotrP
a6ee3df5b2 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-30 14:10:47 -07:00
Bryan Thornbury
b0554d3ff3 PR Feedback 2016-08-30 12:00:56 -07:00
Bryan Thornbury
611e4ccfde dotnet-migrate built in command for cli 2016-08-30 11:56:53 -07:00
PiotrP
3cdd15a145 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-30 10:30:45 -07:00
Livar
be8428cb6c Merge pull request #4102 from livarcocc/test_without_pj
Adding the capability to run tests against a published dll
2016-08-29 21:58:13 -07:00
Piotr Puszkiewicz
8eecff0112 Address build issues 2016-08-27 15:57:14 -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
PiotrP
ae4a690724 Fix tests
Missing namespace
Re-enable dotnet-nuget unit tests
2016-08-26 18:14:04 -07:00
PiotrP
336ecc0e89 Merge Nuget changes
Fix pack
Move dotnet-nuget to NuGetForwardingApp [tests will need to be fixed]
2016-08-26 17:23:33 -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
Livar Cunha
8e432e567a Adding TestRunner resolvers that will be able to find a test runner based on different criteria.
Moving dotnet test command to its own library that can be shared between dotnet test and the test target in the SDK folder.
2016-08-22 15:45:13 -07: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
Rohit Agrawal
e08da40a1f added pack3 command for dotnet (#4058) 2016-08-18 16:53:55 -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
drewgil
11b666acee Add nuget command to dotnet cli 2016-08-16 09:27:55 -07:00
Justin Emgarten
51ea2e6014 Adding Restore3 command for msbuild restore support. 2016-08-12 00:05:21 -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
Eric Erhardt
94223a7009 Tell dotnet restore to install nuget.props and nuget.targets files using an environment variable, so the SDK .targets are installed into the user's project. 2016-08-10 20:08:17 -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
Piotr Puszkiewicz
b3f5174f00 PR Feedback 2016-08-09 14:49:13 -07:00
Piotr Puszkiewicz
3a55a4182f src/redist/project.json 2016-08-09 13:22:22 -07:00
Zlatko Knezevic
3abada74d4 Update HelpCommand.cs
Changing the text from "Common Commands" to just "Commands" to indicate that these are in the box, so to speak.
2016-08-07 07:31:28 -07:00
Tomáš Matoušek
8f00e03c43 Merge pull request #3989 from tmat/AnyDebugType
Pass debugType thru to the command line compiler
2016-08-04 13:14:42 -07:00
Tomas Matousek
dfbea3df34 Pass debugType thru to the command line compiler 2016-08-03 18:08:14 -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
Eric Erhardt
b5d312e7fa PR feedback. 2016-08-01 19:06:46 -05:00
Livar Cunha
b05b0e6dc5 After NuGet started lower casing the packages, we started hitting issues where we failed to locate dependencies under our list of libraries due to different casing in the libraries names. The fix here is to compare the library names ignoring casing. 2016-07-28 21:17:32 -07:00
Eric Erhardt
104ca5219d Ensure additional probing paths don't have a trailing slash.
Workaround for https://github.com/dotnet/core-setup/issues/228.
2016-07-26 22:27:25 -05:00
Eric Erhardt
a48def9ade Fix package code for new NuGet.
The new NuGet uses tolower paths, and we need to react to it.

Port https://github.com/dotnet/cli/pull/2722
Port https://github.com/dotnet/cli/pull/3554
2016-07-26 20:53:20 -05:00
Eric Erhardt
6eabeb9be0 Generate runtimeconfig.json and runtimeconfig.dev.json from MSBuild
Moves generating the runtimeconfig files to a separate MSBuild target which is only dependent on project.lock.json.

Also, moving up our NuGet dependency to 3.5.0-rc1-1653, since that brings in the LockFile.PackageFolders property, which is needed for runtimeconfig.dev.json.
2016-07-26 20:53:17 -05: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
f0afc7eb79 Minor cleanup. 2016-07-21 12:41: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
Eric Erhardt
164244f4df Merge pull request #3760 from svick/broken-links
Fixed docs links in READMEs
2016-07-14 15:20:17 -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
Piotr Puszkiewicz
08e9bc903e CLI Testing via msbuild (#3779)
* Rebase

* Remove Multi-Project Validator

* Remove projectmodelserver tests

* Enable test package creation

* Incremental test restore

* WiP

* Enable Test Asset Project restore

* Build Test Assets & Restore Test Projects

* Build Test projects

* Enable Test Execution

also moves Test Targets to a well-known CLI Version [Stage 2]

* Pass throuh existing telemetry profile

* 2-space tabs

* Revert TestTargets.cs

* WiP PR feedback

* Refactoring

* Fix naming of RestoreTestAssetPackages

* DotNetTest task

* Fix merge issue

* ExecuteWithCapturedOutput

MSBuild considers StdErr output to be failures. This causes output of any test command which is expected to produce an error to be swallowed in the test.

* Workaround for always-on tracing functionality in dotnet-test

* Fix Path Separator Windows/Unix

* Seperate package build from pack

* Windows Pathing issues

* PR Feedback

* Workaround for msbuild #773

https://github.com/Microsoft/msbuild/issues/773
2016-07-11 12:46:27 -07:00
Mark Clearwater
6df15c341a Fix typo in Avaiable
* Should be Available
2016-07-09 19:10:54 +01:00
Livar Cunha
17ef19e788 Removing ForwardStdOut and ForwardStdErr from the ConsoleTestRunner and from dotnet verbs that are not built-in. BuiltIn verbs were already not using it. 2016-07-07 14:51:35 -07: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
Petr Onderka
c6e42cfe7e fixed docs links in READMEs 2016-07-01 19:33:36 +02:00
PiotrP
5ed1371cd9 Remove Project Model Server 2016-06-30 14:31:08 -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
Petr Onderka
90b7617dc5 Fixed links in dotnet READMEs (#3642)
Also renamed dotnet-test README for consistency.
2016-06-22 15:19:10 -07:00
Eric Erhardt
04f40f906d Merge pull request #3472 from svick/master-branch-links
Fixed broken links pointing to master branch
2016-06-17 14:35:30 -05:00
Petr Onderka
90d32ab3de Fixed broken links pointing to master branch 2016-06-16 18:37:26 +02:00
Troy Dai
b3f67b5bef Update parameter names 2016-06-15 23:25:06 -07:00
Troy Dai
97da0b0696 Fix dependencies type changes scenario in project model server. 2016-06-15 23:24:03 -07:00
Troy Dai
8c67ac9272 Add comments for refresh dependency trigger 2016-06-15 16:07:47 -07:00
Troy Dai
64c49d972a Add test to ensure refresh dependencies' consistency 2016-06-15 16:07:47 -07:00
Troy Dai
4c475002ec Enable project model server to clear cache forcefully 2016-06-15 16:07:47 -07:00
Bryan Thornbury
f0380cfd9c replicate https://github.com/dotnet/cli/pull/3492 2016-06-15 12:29:09 -07:00
Bryan Thornbury
d717b84ec8 merge rel/1.0.0-preview2 into rel/1.0.0 2016-06-15 10:20:50 -07:00
Pavel Krymets
6b54ae0bcc Trim platfrom libraries from deps fiels 2016-06-15 09:09:38 -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
Eric Erhardt
4293d05571 Porting @svick's fix to change a hard-coded URL to a redirect link. 2016-06-10 17:51:50 -05:00
Rob Relyea
c39fbd37d3 Merge pull request #3492 from dotnet/toddmosc/serviceable-p2
Removing the nuspec schema change used for adding the serviceable tag.
2016-06-10 10:04:16 -07: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
Todd Moscinski
013fa1b8c0 Removing the nuspec schema change used for adding the serviceable tag. 2016-06-10 07:51:10 -07:00
Eric Erhardt
ef4a8e85ef Updating CoreSetup to rc3-004443-00. 2016-06-10 01:09:46 -05:00