Commit graph

645 commits

Author SHA1 Message Date
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
Livar Cunha
9f2a0169fc Addressing code review comments. 2016-08-26 11:23:47 -07:00
Simon de Lang
8f92f0d74b Update xunit dependencies for CSharp_xunittest template 2016-08-25 15:02:52 +02:00
Nick Guerrera
c702957730 Update to new msbuild 2016-08-24 10:10:20 -07: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
Joel Verhagen
aacc30d5d8 Add "path" property the .deps.json file for libraries
Update DependencyModel and PlatformAbstractions packages to 1.0.1-beta-000917
Update dotnet-test-xunit to 1.0.0-rc2-330423-54
2016-08-18 15:57:03 -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
f48effff61 Add System.Resources.Writer to src\dotnet\project.json 2016-08-10 20:08:54 -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
Eric Erhardt
736652fe71 Remove the SDK artifacts from the CLI.
These are now contained in github.com/dotnet/sdk.
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
Eric Erhardt
2bea6bac83 Move 14.1 to 15.0 now that MSBuild is version 15.0. 2016-08-09 10:28:50 -05: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
Piotr Puszkiewicz
79648f9ccb Update stage0 msbuild 2016-08-07 01:51:47 -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
b889e97a88 fixed trailing commas 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
Bryan Thornbury
931e8fdf96 Add support for user runtimeconfig 2016-08-02 16:18:19 -07:00
Eric Erhardt
df3fea3736 Merge pull request #3962 from eerhardt/msbuild-GenerateDepsFile
Implement GenerateDepsFile MSBuild Task
2016-08-01 20:17:05 -05:00
Eric Erhardt
b5d312e7fa PR feedback. 2016-08-01 19:06:46 -05:00
Eric Erhardt
10cfa744e5 PR feedback.
Implement VersionPrefix and VersionSuffix MSBuild properties.

Use FluentAssertions in the test.
2016-08-01 15:02:22 -05:00
Eric Erhardt
b3e69b139e Update NuGet to 3.5.0-rc1-1697 2016-08-01 13:58:04 -05:00
Eric Erhardt
a4aa0a99cd Implement GenerateDepsFile MSBuild Task 2016-07-29 20:46:34 -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
2ac8ca0e07 Update Microsoft.NuGet.Build.Tasks to 1.0.0-alpha-000002, which has the casing fix for Microsoft.Net.Compilers.netcore dependency. 2016-07-26 20:53:19 -05:00
Eric Erhardt
369a6894dd Fix the casing of Microsoft.Net.Compilers.netcore since the latest NuGet cares about this now. 2016-07-26 20:53:18 -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
Bryan Thornbury
5d96412b14 change feature-msbuild branch versions 2016-07-25 14:05:41 -07: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
c317c92691 Correcting the casing of Microsoft.Common.targets directory 2016-07-22 07:04:24 -05:00
Eric Erhardt
3a446ec5d4 Fixing the Sdk.props to work correctly for Release config and xplat pdb creation. 2016-07-22 07:04:24 -05:00
Eric Erhardt
5296b28db7 Removing all PlatformTarget setting in the default Sdk.props file.
This value is passed in by the CLI.
2016-07-22 07:04:23 -05: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
9751b3203c Remove the Sdk nuget package. 2016-07-21 12:18:00 -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
bccff16c18 Round 2: rename the SDK NuGet package and add ImportBeforeAfter files to load them. 2016-07-21 11:57:19 -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
Eric Erhardt
703da0da3e Microsoft.NuGet.ImportBefore and ImportAfter
Add Microsoft.NuGet.ImportBefore and ImportAfter files so .nuget.props and .nuget.targets files get picked up invoking 'dotnet build3'.

I also fixed some .xproj and .sln file issues to get our code to work in VS.
2016-07-12 18:44:16 -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
kloun
1706eb19f9 del duplicate newline 2016-06-29 23:54:31 +03: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
Piotr Puszkiewicz
9d01e3bc2e Merge rel/1.0.0-preview2 to rel/1.0.0 (#3677)
* Update README.md

* Moving Ubuntu 16.04 to be next to Ubuntu 14.04

* Adding Oracle Linux and Linux Mint to the titles

Adding Oracle Linux and Linux Mint to the titles next to their compatible binaries.

* Remove showing firsttime eula for non verbs.

* Add Serviceable assembly attribute and nuspec attributes for all shipping CLI assemblies.

Fix #3345

* Use NugetCache Sentinel for Telemetry setting.

* Fix Oracle Linux version in README.md

Oracle Linux 7 -> Oracle Linux 7.1

* Fix README to use hostfxr download links (#3622)

Also fix a rebase error from b524fd079e6dcdd744faeb6061ccbfe99d1f810f#diff-04c6e90faac2675aa89e2176d2eec7d8

* Remove the VS2012 CRT dependency from docs (#3632)

* fix typo in dotnet-install file

This was needed to rebuild the CLI with the updated Roslyn NuGet packages.

Thanks goes to @akoken for the fix.
2016-06-22 15:17:54 -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
Josh Free
ef9ad4044a Merge pull request #3579 from Priya91/rel/1.0.0-preview2
Remove showing firsttime eula for non verbs.
2016-06-15 17:02:34 -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
Lakshmi Priya Sekar
db7f68716b Use NugetCache Sentinel for Telemetry setting. 2016-06-15 15:55:28 -07:00
Bryan Thornbury
f0380cfd9c replicate https://github.com/dotnet/cli/pull/3492 2016-06-15 12:29:09 -07:00
Eric Erhardt
15a5c34149 Add Serviceable assembly attribute and nuspec attributes for all shipping CLI assemblies.
Fix #3345
2016-06-15 14:14:25 -05: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 Sekar
eab2494ed5 Remove showing firsttime eula for non verbs. 2016-06-14 17:55:10 -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
jacalvar
635c3331df Update to Json.NET 9.0.1 2016-06-14 03:21:56 -05:00
Eric Erhardt
a4cef6d367 Updating NuGet to beta2-1484 2016-06-14 03:19:04 -05:00
Eric Erhardt
f25f047376 Updating CoreFX, CoreCLR, Roslyn, CoreSetup to stable versions. 2016-06-14 03:14:53 -05:00
Livar
9f2bb66198 Merge pull request #3485 from livarcocc/offline
Offline feature work
2016-06-12 00:58:26 -07:00
Eric Erhardt
c1c7ca06c2 Update NuGet to 3.5.0-beta2-1480 2016-06-11 12:23:24 -05:00