mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5385 commits 41 branches 190 tags 95 MiB
Commit graph

1422 commits

Author SHA1 Message Date
Krzysztof Wicher
59ae0e2d3d fix tools when restoring with --packages 2016-12-20 12:18:55 -08:00
Zlatko Knezevic
b467d66182 Remove argument separator from commands (#5080) 
* Remove argument separator from commands

Currently, the argument separator (`--`) is only supported on
`dotnet run`. This PR removes it from other commands to make the help and
usage of these command clearer.

* Adding dotnet run message test

* Responding to PR feedback
 2016-12-19 22:11:39 -08:00
Krzysztof Wicher
2d5e40f3ba Merge pull request #5085 from krwq/i5019 
Add error message when tool is ivoked but not restored
 2016-12-19 16:51:14 -08:00
Livar
134e9af798 Merge pull request #5078 from livarcocc/preserve_rids_from_pj 
Only adding rids for full framework TFMs if the project.json does not have runtimes
 2016-12-19 16:20:12 -08:00
Krzysztof Wicher
ccfb4135c4 Add error message when tool is not restored 2016-12-19 14:12:04 -08:00
Livar
2aa166b5d0 Merge pull request #5069 from livarcocc/version_attributes 
Making version an attribute for packagereference and dotnetclitoolreference
 2016-12-19 09:48:00 -08:00
Livar Cunha
b2ce6c794a Only adding rids for full framework TFMs if the project.json does not already have Runtimes in its Runtimes section. 2016-12-18 18:45:35 -08:00
Krzysztof Wicher
476a83eb1a Ensure dotnet restore --packages is working (#5008) 
* add dotnet restore --packages tests

* add dotnet build, publish, pack, dotnet-test test

* Shorten the test name in attempt to fix test failure

* fix whitespaces
 2016-12-18 00:45:25 -08:00
Livar Cunha
52b45d0c49 Fixing tests and a couple of issues in the code due to Localization. 2016-12-16 23:59:58 -08:00
Piotr Puszkiewicz
2a612f88af https://github.com/dotnet/cli/issues/5070 2016-12-16 22:45:48 -08:00
Scott Addie
e25e387f1f Add hyphen in Welcome to .NET Core Telemetry paragraph - commandline 2016-12-16 22:45:47 -08:00
Livar Cunha
ee999ef874 Adding clean to the expected help output. 2016-12-16 20:14:33 -08:00
Livar Cunha
612da09a78 Fixing the failing dotnet --help test. 2016-12-16 19:16:38 -08:00
Livar Cunha
e1c0bbe0f7 Making version an attribute for packagereference and dotnetclitoolreference. 2016-12-16 19:13:37 -08:00
Livar
9c3141b63f Merge pull request #5057 from dotnet/dev/jgoshi/removeProj 
Implement dotnet remove project
 2016-12-16 18:56:28 -08:00
Livar
e491fbdcd0 Merge pull request #5054 from codito/fix-retcode 
Return non-zero exit code for test failure in multitargeted test project
 2016-12-16 18:08:12 -08:00
Livar
a9ca6d8c5b Merge pull request #5062 from livarcocc/clean_empty_targets_migration 
Added a clean empty targets method to CleanOutputProjectRule
 2016-12-16 18:07:37 -08:00
Livar
f1c16e59d6 Merge pull request #5043 from livarcocc/d_for_diagnostics 
Changing the host verbosity flag to -d|--diagnostics
 2016-12-16 16:05:02 -08:00
Justin Goshi
e94748f172 Update tests for non-windows platforms 2016-12-16 15:25:07 -08:00
Justin Goshi
45264edcd7 Merge branch 'rel/1.0.0' into dev/jgoshi/removeProj 2016-12-16 14:53:33 -08:00
Livar Cunha
2336cd7aa0 Fixing the help message. 2016-12-16 14:31:53 -08:00
Livar
af3cab66f4 Merge pull request #5034 from livarcocc/duplicate_resource_migration 
Adding a Exclude @(EmbeddedResource) during migration to EmbeddedResources
 2016-12-16 14:26:07 -08:00
Livar Cunha
d6d6fc612b Added a unit test for cleaning empty targets. 
Added a clean empty targets method to CleanOutputProjectRule that removes any targets without content inside of them from the csproj.
 2016-12-16 13:31:42 -08:00
Livar Cunha
9fd4903bf3 Addressing code review comments and adding a test for dotnet --help. 2016-12-16 12:58:34 -08:00
Livar Cunha
5558e5f728 Changing the host verbosity flag to -d|--diagnostics from -v|--verbosity so that it is not confused with the verbs verbosity flag. 2016-12-16 12:58:34 -08:00
Justin Goshi
ae1e183e41 Complete the refactor and test improvements 2016-12-16 10:23:26 -08:00
Justin Goshi
82f5278d8a Merge branch 'rel/1.0.0' into dev/jgoshi/removeProj 2016-12-16 08:44:38 -08:00
Justin Goshi
806d5a2589 Implement dotnet list projects (#5027) 
* Implement dotnet list projects

* Address PR comments

* Fix build breaks
 2016-12-16 06:41:47 -10:00
Arun Mahapatra
f3a74f1162 Return non-zero exit code for test failure in multitargeted test project. 
Treat the errors from vstest task as errors (instead of warnings) before continuing further.
Add asserts for exit code in tests for dotnet-test and dotnet-vstest.
 2016-12-16 15:39:52 +05:30
Justin Goshi
023a899db0 WIP Refactor and improve tests 2016-12-16 01:04:09 -08:00
Justin Goshi
20f2242947 Adding dotnet remove project tests 2016-12-15 15:48:04 -08:00
Livar Cunha
e710958b79 Adding a Exclude @(EmbeddedResource) during migration so that we don't get duplicate resources when building migrated apps. 2016-12-15 11:17:20 -08:00
Justin Goshi
441277ccfa Implement dotnet add project (#5022) 
* Implement dotnet add project

* Addressed PR comments
 2016-12-14 13:53:11 -10:00
Livar Cunha
56dd76bdb0 Adding Update under Content for BuildOptions as well, but limiting this change only to Web Apps at the moment, because regular SDK does not have Content Include=**/* in place yet. 2016-12-13 16:45:40 -08:00
Livar Cunha
a22f4be938 Adding a UpdateContextTransform that generates items with the Update attribute set instead of Include. Also, removed the Exists condition for published content, because now that we are using Update, that check is not needed. I left the option to set a condition on the metadata though. 2016-12-13 16:45:39 -08:00
Livar Cunha
84682562bf Adding a condition to Content CopyToPublishDirectory to validate that the file exists before trying to copy it to output, to keep the same functionality as it existed in PJ. In MSBuild world, without this condition, CopyToPublishDirectory will fail. 2016-12-13 16:45:39 -08:00
Justin Goshi
76722fd403 Improve the help text (#5002) 
* WIP Improve help text

* Improve help text

* Address PR comments

* Address PR comments

* Address PR comments
 2016-12-13 14:31:35 -10:00
Piotr Puszkiewicz
2fbafe6f3f Remove StreamForwarder from CLI tests (#4936) 
* WiP

* Replace StreamForwarder with OutputDataReceived

* Add build logging around test execution

* add newlines

* Add handling for the null terminator while maintaining empty lines

* Extra Diag

* Verbose logging for VS Test Console

* Fix asset file locking tests

* Add testcommand timeout + improve dotnet-new tests

* WiP

* Welcome, JoSequ!

* Fix failing tests

* Clean out diagnostics writelines

* self-PR1
 2016-12-13 14:15:35 -08:00
Justin Goshi
2b7e9b6524 Clean up sln reader/writer (#5005) 2016-12-13 06:45:00 -10:00
Zlatko Knezevic
d335b5de40 Changing dotnet-test options (#4987) 
In Preview 3, the `dotnet test` options were not aligned with the CLI's
adopted format. This PR changes the options to be aligned. Where
possible/applicable, I have shortened the long options to a meaningful
mnemonic short version.

Fixes #4960
 2016-12-12 23:29:29 -08:00
Livar
1a49787a1f Merge pull request #4993 from livarcocc/cyclic_dependency_test 
Adding a test that validates CLI templates don't depend on CLI packages.
 2016-12-12 15:48:41 -08:00
Livar Cunha
e1965327e0 Adding a test that restores all c# templates and checks that none of them depend on a package produced by the CLI. I had to write this as a single test for all templates because it cuts the test time in about half to restore all the packages at once to the same folder than to clean and restore again everytime per template. 2016-12-09 16:11:57 -08:00
Livar
bd590f51e6 Emitting PackageId whenever we emit AssemblyName. We need to do this to preserve the behavior from PJ where the package id matched the containing PJ folder name. In MSBuild, PackageId will match AssemblyName, unless it is explicitly specified. (#4990) 2016-12-09 16:10:16 -08:00
Krzysztof Wicher
8eaec8715b Merge pull request #4972 from krwq/p2p-compat-check 
add compat checks to dotnet add
 2016-12-09 15:32:15 -08:00
Krzysztof Wicher
524fe3cb6b apply review feedback 2016-12-09 12:11:11 -08:00
Piotr Puszkiewicz
70c8ecbf16 Merge branch 'rel/1.0.0' into migrate_pj_without_frameworks 2016-12-09 00:30:36 -08:00
Livar
1fd99f1588 Merge rel/1.0.0-preview4 back into rel/1.0.0 (#4974) 
* Updating the preview4 channel to rel-1.0.0-preview4

* Add more xlf files for new strings

* bundle fsharp sdk, only Sdk directory is required

* align f# console proj

* align f# lib template

* align f# mstest template

* align f# xunit template

* align f# web template

* fix mstest package version, aligned to c#

* remove unused directories from bundled sdks

* Adding a SdkNugetVersion property when invoking dotnet pack on test packages so that test packages can reference exact packages. We need that because of https://github.com/NuGet/Home/issues/4063. Without it, pack creates the nuspec with a version like 1.0.0-version-, instead of 1.0.0-version-<version_used_in_build>, which leads to problems when restoring the tool. Like, it ends up restoring to the closest version of the package (oldest), instead of the latest.

* Update web template for Web SDK 154 (#4948)

* Update WebSDK version

* Update web template to get rid of globs

https://github.com/aspnet/Templates/pull/735

* MSBuild to 15.1.458 (#4950)

* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet (#4963)

* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet and adding a E2E test to cover it.

* Do not migrate compile and EmbeddedResources for web application, because those are included in the Web Sdk already.

* Addressing code review comments
 2016-12-09 00:30:02 -08:00
Livar Cunha
9bddb5bac7 Addressing code review comments. 2016-12-08 20:06:55 -08:00
Livar Cunha
bb1bceb8bb When we had a project.json without frameworks, we were failing to show the appropriate error message because when we were generating the error message itself we tried to access the project context (which requires a framework in the PJ). This fix makes the ProjectContext optional to add the migration error. 2016-12-08 19:53:35 -08:00
Krzysztof Wicher
9a8d158e09 add test coverage 2016-12-08 16:23:21 -08:00
Krzysztof Wicher
21993e0129 fix dotnet-remove-p2p tests 2016-12-08 15:04:32 -08:00
Krzysztof Wicher
2d38aaa6e1 fix dotnet-add-p2p tests 2016-12-08 14:56:31 -08:00
Justin Goshi
0831316321 Allow migration of sln files (#4949) 
* WIP Migrate sln files

* WIP add reference to redist

* Adding tests and fixing a few bugs

* Fix some tests

* Remove use of DeepClone

* Fix test build errors

* Fix more tests
 2016-12-07 11:49:15 -10:00
Krzysztof Wicher
79e6126b2a add dotnet list p2ps (#4929) 
* add stub for dotnet list p2ps

* apply review feedback

* PR feedback: consistent method modifiers

* apply missed review feedback

* add test coverage and do not treat no p2ps as error

* move private methods to the bottom, rename weird res name
 2016-12-07 12:56:27 -08:00
Livar Cunha
c94934dfc5 Replacing snake casing with Camel casing for GivenThatIWantToMigrateBuildOptions. At some point, I will be able to change them all. 2016-12-05 20:34:11 -08:00
Livar Cunha
9d96bf8c20 Adding GenerateRuntimeConfigurationFiles when migrating a test project. 2016-12-05 18:23:34 -08:00
Piotr Puszkiewicz
7eb87f3397 Remove tests affected by https://github.com/dotnet/cli/issues/4381 2016-12-05 12:23:29 -08:00
Piotr Puszkiewicz
d6cab4af58 use Sdks attribute in dotnet new templates (#4916) 
* Move dotnet-new templates to Sdk attribute

* Update to MSBuild 15.1.0-preview-000454-01

To pick up a fix for Microsoft/msbuild#1431.

* Fix template newlines

* Fix casing on Microsoft.Net.Sdk

* Move migration test csproj's to Sdk attribute

* Disable parallel sdk restore

Each SDK restore operation will try to manipulate the same assets.json file since the dependency name&version are injected into a common csproj file. This can cause runtime failures when two NuGets try to restore the project at once.

* Make casing of SDK 'NET' and not 'Net'

* Remove redundatn imports

* Fix test string

* Additional race

* Replacing the SDK with the Web.Sdk when it is a Web project.

* Fixing the test by writting the csproj before running the migration rule.
 2016-12-04 22:31:58 -08:00
Scott Carlton
dc3d88c587 Localize changes for dotnet-remove (#4900) 
* Rename centralized LocalizableStrings file

* Added RemoveDefinition

* Rebase

* rebase, remove localizablestrings for help

* loc for help command

* remove localizablestrings

* Localization changes for dotnet-remove

* Slight refactoring
 2016-12-04 21:33:43 -08:00
Piotr Puszkiewicz
caad95491a Fix output race (#4911) 
* Fix output race

TestCommand starts the test process before wiring up stderr & stdout. This change delays process start until after the wireup is finished so that the test process cannot shut down before we have wired up output redirection.

* Bypass stream forwarder when it fails to attach to a process

CLI has tests failing errenously when, due to timing issues, the StreamForwarders fail to attach to a process because it managed to exit before attachment occurs. 

We tried attaching the forwarders prior to Process Start but this proved impossible because the OUT and ERR streams are not available to attach before the process starts. 

This exposes a fundamental flaw in our output redirection mechanisms. We should probably move to using https://msdn.microsoft.com/en-us/library/system.diagnostics.process.outputdatareceived.aspx or a similar mechanism. However, I don't know that @brthor hadn't considered and discarded this approach.

For the time being I am attempting to make tests more deterministic by capturing the associated exceptions and moving to a different mechanism when StreamForwarders are not available.

Opened https://github.com/dotnet/cli/issues/4913 to track the broader issue.

* File.Copy is not atomic...
 2016-12-04 11:54:29 -08:00
Livar
ac4f903731 Merge pull request #4897 from livarcocc/no_publish_iis 
Skipping dotnet publish-iis when migrating scripts as it is now part of the web.sdk
 2016-12-04 09:36:52 -08:00
Piotr Puszkiewicz
d2d0353e60 Include Microsoft.Net.Sdk in CLI layout (#4895) 
* WiP

* Update test

* Working version of Net SDK

* Latest SDK doesn't work as packageref

* DCR + PR

* Harden CLI tests against #4884
 2016-12-03 14:19:54 -08:00
Rohit Agrawal
4311926366 update nuget to 4.0.0-rc2 (dev build 2067) (#4904) 2016-12-02 19:19:54 -08:00
Livar Cunha
7583bcb2fd Skipping dotnet publish-iis when migrating scripts as it is now part of the web.sdk 2016-12-02 10:41:25 -08:00
Piotr Puszkiewicz
da82bdb05d Centralize Microsoft.Net.SDK Version (#4890) 
* Centralize Microsoft.Net.Sdk package version

Note: Templates were omitted as their version needs to be static.

* Unifying additional missmatched versions

* prefercliruntime

whitespace threw off ReplaceAll

* Additional missed globs

* Revert SDK version for performance tests

* PR Feedback

* Roll back VSTestXunitDesktopAndNetCore.csproj SDK version
 2016-12-02 09:34:03 -08:00
Piotr Puszkiewicz
f18967e39a Update CLI's MSBuild Version to 15.1.0-preview-000451-02 (#4889) 
* Centralize definition of MSBuild Version in CLI

* MSBuild --> 15.1.0-preview-000451-02
 2016-12-01 20:10:42 -08:00
Piotr Puszkiewicz
ecfd970045 Extra strings for localization (#4880) 
* Update strings for localization

* re-align strings
 2016-12-01 16:01:29 -08:00
Piotr Puszkiewicz
e82ed6799d Enable overriding MSBuildSDKsPath with env var (#4885) 2016-12-01 14:45:55 -08:00
Martin Andreas Ullrich
4af30914c9 Show meaningful error when failing to migrate invalid scripts (#4842) 2016-11-30 20:36:13 -08:00
Krzysztof Wicher
7312e1cb3a Merge pull request #4868 from krwq/i4746-dotnet-remove 
Add dotnet-remove-p2p
 2016-11-30 16:14:47 -08:00
Justin Goshi
8afb8ebf31 sln reader/writer (#4870) 
* Snap of sln reader/writer from https://github.com/mono/monodevelop

* Remove unnecessary code

* Create a new test asset with an sln file because adding an sln to an existing one broke other tests

* Remove commented out line

* Removing unneeded PropertyGroup per PR comments

* Update the license

* Fixing the license
 2016-11-30 14:08:28 -10:00
Krzysztof Wicher
0349aed9a7 complete tests 2016-11-30 12:07:13 -08:00
Krzysztof Wicher
23b46490a3 add some test cases stubs 2016-11-29 16:14:05 -08:00
Krzysztof Wicher
65f699f1cc Prepare test project for dotnet-remove-p2p 2016-11-29 15:47:30 -08:00
Krzysztof Wicher
f49e29711f Merge pull request #4758 from krwq/i4521 
Fix 4521: Add dotnet-add-p2p
 2016-11-28 13:51:08 -08:00
Piotr Puszkiewicz
b47d728516 Hide restore output of first-run experience (#4740) 
* Fix 4066

* Merge Conflict

* Move fix to the DotNetCommandFactory

* More normalization

The `\r\n` issue is oddly non-deterministic. This change did not affect the message endings and yet CI started failing. Normalizing both string should have the desired result...
 2016-11-28 00:46:26 -08:00
Enrico Sada
7b0117ac85 Update fsharp templates for preview4 with latest msbuild style (#4836) 
* update web template

* add test build of fsharp/web template

* align fsharp/xunittest template

* add test for all template projects

* align fsharp/console template to #4821

* align fsharp/lib template to #4821

* align fsharp/mstest template to #4821

* align fsharp/xunittest template to #4821

* fix shortened test directory path (was same for c# test)

* try fix ci failure
 2016-11-28 00:45:38 -08:00
Enrico Sada
a0060ac321 Fix for current ci fails (#4838) 
* test ci

* try fix ci failure
 2016-11-28 00:45:17 -08:00
Livar
325b849858 Merge pull request #4814 from livarcocc/invoke_tool_cli_fx 
Making Project Tools use the CLI shared runtime
 2016-11-25 16:12:38 -08:00
Faizan2304
eb8e0cfa40 Bug fixes (#4810) 
* Bug fixes

* Nitpick

* -Fixed failed tests
-Added test to cover trx logger scenario.

* Fix for issue https://github.com/Microsoft/vstest/issues/241

* Fix for failed test. We have taken fix where dotnet test will return nonzero if test fails. In multi TFM scenario if test fails it termates the whole process as dotnet test is returning 1. As a fix of this we should continue if some test fails for next TFM

* Bump Microsoft.Testplatform.CLI and Microsoft.NET.Test.Sdk version
 2016-11-24 00:48:54 -08:00
Piotr Puszkiewicz
3a3ab7e0b0 MSBuildSDKsPath (#4824) 
* Tests in place

* Implementation
 2016-11-23 23:54:44 -08:00
Livar
9862fbb4d7 Checking that the lock file exists before trying to acquire the lock for it. (#4797) 
* Checking that the lock file exists before trying to acquire a lock for it, which takes up to 30 seconds.

* Adding a test for failing when reading the lock file and it does not exists.
 2016-11-23 22:59:54 -08:00
Enrico Sada
2cf0675270 add F# templates to dotnet new (#4789) 
* add F# templates to `dotnet new`

* add dotnet new tests

* avoid conflict with cs test dir

* fix test
 2016-11-23 22:57:54 -08:00
Krzysztof Wicher
8b565616a0 Strings->LocalizableStrings, Extensions->ProjectRootElementExtensions, fix long lines, remove empty line 2016-11-23 15:35:48 -08:00
Livar
923320b66b Merge pull request #4829 from jeffkl/4753 
Move project.lock.json during migration
 2016-11-23 14:02:35 -08:00
Krzysztof Wicher
93c30898e4 fix non-windows failures 2016-11-23 14:02:19 -08:00
Krzysztof Wicher
2bd020d015 attempt to fix broken linux build 2016-11-23 13:46:44 -08:00
Livar Cunha
9e9d7f1d52 Turns out I had missed one code review comment. Fixing the string validation for one of the tests. 2016-11-23 12:56:37 -08:00
Krzysztof Wicher
b22276a4a6 add fake msbuild.exe to workaround the msbuild issue 2016-11-23 11:03:39 -08:00
Livar Cunha
d5f7efbe86 Addressing code review comments. 2016-11-23 10:19:00 -08:00
Jeff Kluge
2205a8577c Move project.lock.json during migration 
Closes #4753
 2016-11-23 09:46:36 -08:00
Livar Cunha
dc87680337 Making Project Tools use the CLI shared runtime if they have the prefercliruntime in the root of their package. This allows for project tools to not have to change when a new runtime comes up as long as they are compatible with the runtime that the CLI is using. 2016-11-23 09:25:47 -08:00
Livar
da0e7b744b Revert "update NuGet to 4.0.0-rc2 build (#4802)" (#4818) 
This reverts commit 0bafbd061e.
 2016-11-23 09:01:32 -08:00
Krzysztof Wicher
b8b7d98256 last touches 2016-11-22 14:46:33 -08:00
Krzysztof Wicher
58fe57e315 Lock on spec - all tests passing on Windows 2016-11-22 14:46:32 -08:00
Krzysztof Wicher
19dde128ba detect non-existing references and tiny refactor of tests 2016-11-22 14:46:32 -08:00
Krzysztof Wicher
8e5ffaf176 fix some of the stuff in the feedback 2016-11-22 14:46:32 -08:00
Krzysztof Wicher
5d1deeeea1 test project - almost finished - not all review changes included 2016-11-22 14:46:32 -08:00
Rob Relyea
0bafbd061e update NuGet to 4.0.0-rc2 build (#4802) 2016-11-22 00:51:12 -08:00
Livar
09f62cdd7e Merge pull request #4741 from piotrpMSFT/piotrpMSFT/issues/4739-xprojUser 
add *.xproj.user to backup file types
 2016-11-16 09:30:17 -08:00
Livar
9847196c95 Merge pull request #4737 from livarcocc/migrate_authors 
Adding Authors migration.
 2016-11-16 09:29:13 -08:00
Livar
11f871b715 Merge pull request #4733 from livarcocc/migrate_adds_rids_for_desktop 
Emitting runtime identifiers if the source project has any full framework TFMs
 2016-11-16 09:29:01 -08:00
Piotr Puszkiewicz
d39ee4a463 add *.xproj.user to backup file types 2016-11-16 01:10:55 -08:00
Justin Goshi
be61afcfa5 Remove unused project.json and .xproj files (#4735) 
* Remove unused project.json and .xproj files

* Update the test msi script
 2016-11-15 16:12:19 -10:00
Livar Cunha
c364f27346 Adding Authors migration. 2016-11-15 16:36:04 -08:00
Livar Cunha
9513428013 Emitting runtime identifiers if the source project has any full framework TFMs. 2016-11-15 14:07:35 -08:00
Krzysztof Wicher
7a3bc96f75 Fix 4508: CLI verbs that call into msbuild should control their output (#4719) 
* Fix 4508: CLI verbs that call into msbuild should control their output

* fix failing tests + tiny bufix in dotnet test
 2016-11-15 11:56:39 -08:00
Krzysztof Wicher
43df9a170d Fix 4655: Migrate errors are not getting put in formatted output (#4718) 
* Fix 4655: Migrate errors are not getting put in formatted output

* Move test asset to NonRestoredTestProjects

* use group test asset manager: NonRestoredTestProjects
 2016-11-15 09:39:58 -08:00
Piotr Puszkiewicz
bf425a6f0a Removing dotnet-test-mstest when migrating because that package is no longer needed. (#4690) 2016-11-14 14:59:59 -08:00
Krzysztof Wicher
9212605e89 binding redirects tests: Simplify and get ready for enabling (#4692) 
* binding redirects tests: Simplify and get ready for enabling

* fix targets broken during cleanup

* fix non-windows build

* apply pr feedback: remove some not needed code

* remigrate BindingRedirects samples, add x64 to bind redir proj
 2016-11-14 14:26:03 -08:00
Justin Goshi
6d57ca7e14 Migrating all test projects (#4668) 
* WIP migrate tests

* WIP fixing more tests

* WIP fix test build break

* Test results files are now trx

* Get CI to pass until we get an xunit xml logger

* Added DotNetTestPJ since that was needed for one test

* Fix build break

* Forgot to add DotNetTestPJ as a build task

* Need to restore project.json for the project used in ubuntu test

* Restore PJ for ubuntu test

* Switch the Ubuntu test to csproj based
 2016-11-11 21:46:29 -10:00
Livar Cunha
df755b5554 Removing dotnet-test-mstest when migrating because that package is no longer needed. 2016-11-11 10:52:33 -08:00
Livar
43dfa6b8ba Updating script migration to use the correct BeforeTargets. (#4680) 2016-11-10 18:24:35 -08:00
Livar
9869b82412 Merge pull request #4662 from livarcocc/remove_dotnet_test_xunit_migration 
Removing dotnet-test-xunit when migration from project.json to csproj
 2016-11-09 11:11:17 -08:00
Livar Cunha
7f549314ff Removing dotnet-test-xunit when migration from project.json to csproj, as that package is no longer needed. 2016-11-09 09:52:52 -08:00
Piotr Puszkiewicz
b918b2a6b6 Invoking a command waits up to 30s for NuGet or another process (#4657) 
* Invoking a command waits up to 30s for NuGet or another process

* PR Feedback
 2016-11-08 23:23:13 -08:00
Livar
312559ccdc Merge pull request #4636 from Faizan2304/xunitTemplateFix 
Update version of xunit adapter in test assets and xunit template
 2016-11-08 14:42:47 -08:00
Faizan Ahmad
c9a5c95cd6 Updated test to reflect xunit version change 2016-11-09 01:23:46 +05:30
Livar Cunha
ef90667375 Hoisting FrameworkAssemblies for desktop frameworks during migration. 2016-11-07 16:16:48 -08:00
Parallels
7edea7e23e Fixing pack tests that were looking for the nupkg under bin/debug/TFM instead of bin/Debug. This was a change in pack that needed to be reflected in the tests. 2016-11-04 12:56:21 -07:00
seancpeters
40c34f891a Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions (#4585) 
* Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions

* Fixed merge conflicts. Had to re-update the Sdk version in one place.

* re-migrate dotnet.dll

* Revert Performance Test Projects

* Fix test test

* Add missing WithRuntime

* Disable failing test test
 2016-11-03 22:12:33 -07:00
Rob Relyea
f961fef8e0 update NuGet in CLI to 4.0.0.2048 (#4614) 
* update NuGet in CLI to 4.0.0.2047

* update NuGet in CLI to 4.0.0.2048
 2016-11-03 22:11:44 -07:00
Livar
d6eef01015 Adding a tool migration for BundleMinifier.Core to move all version of the tool to 2.2.301 during migration. (#4613) 2016-11-03 19:55:52 -07:00
Livar
de5da5870f Marking hoisted P2P projects with a FromP2P attribute. (#4598) 2016-11-03 10:27:51 -07:00
Piotr Puszkiewicz
fd9cb55f1a Add msbuild-based stage0 where possible (#4597) 
* Add msbuild-based stage0 where possible

* Fix bash initialization script

* Windows Fixes

* Fix dotnet deb tool
 2016-11-02 23:01:57 -07:00
Livar
14c285db1c Merge pull request #4583 from NTaylorMullen/nimullen/removert 
Remove Razor.Tools/Razor.Design from migration logic.
 2016-11-02 21:21:20 -07:00
Livar
d84c89be15 Merge pull request #4589 from livarcocc/cleanup_migration 
Cleanup migration
 2016-11-02 17:03:29 -07:00
Livar
14ad04a400 Merge pull request #4580 from jeffkl/telemetry 
Some unit tests for MSBuild telemetry
 2016-11-02 16:05:43 -07:00
Jeff Kluge
6a4d49e227 Remove quotes from /Logger argument because the argument escaper will do it for me 2016-11-02 15:19:21 -07:00
N. Taylor Mullen
411dd02923 Remove Razor.Tools/Razor.Design from migration logic. 
- Razor.Tools/Razor.Design will not be shipping with MSBuild support for the upcoming release.
 2016-11-02 15:16:57 -07:00
Livar Cunha
4e1f2f2b20 Removing TFM specific defines for migrated projects, since they are not being set in the SDK itself. 2016-11-02 15:05:45 -07:00
Livar
f84ce89e30 Merge pull request #4558 from Faizan2304/enablevstest 
Enable disabled vstest and test verb test.
 2016-11-02 13:59:45 -07:00
Jeff Kluge
a2d438288e Reduce line lengths 2016-11-02 13:06:44 -07:00
Faizan Ahmad
fa4fad1ba0 Update vstest test to use short name test asset 2016-11-03 00:49:49 +05:30
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
Faizan Ahmad
734afe84cf Update test to point new short name test assets 2016-11-03 00:14:03 +05:30
Faizan Ahmad
5c5f593449 Merge branch 'rel/1.0.0' into enablevstest 2016-11-02 23:50:44 +05:30
Faizan Ahmad
111499899d Reduced the test name to overcome 256 character file length limit in windows 2016-11-02 23:38:20 +05:30
Livar Cunha
0c833f5349 Making the default exclude option empty, so that by default, we don't set any excludes for compile or embed during migration. 2016-11-02 10:11:37 -07:00
Faizan Ahmad
dc249a94e9 Logging 2016-11-02 21:34:35 +05:30
Jeff Kluge
9c10867194 Unit tests for the logger command-line argument when telemetry is enabled or disabled 2016-11-02 08:04:02 -07:00
Faizan Ahmad
4af8d52a23 Updated the version of microsoft.testplatform.cli package 2016-11-02 18:11:36 +05:30
Faizan Ahmad
9b92fe2336 Adding try catch for xunit test to get logs 2016-11-02 15:07:13 +05:30
Krzysztof Wicher
d520160ce3 Merge pull request #4554 from krwq/fix_lib_wo_netstandard 
When Library add reference to NETStandardLib if not present
 2016-11-01 16:50:47 -07:00
Livar
aaa343a1c8 Merge pull request #4566 from livarcocc/migrate_unqualified_references 
Migrating unqualifing references as projects
 2016-11-01 15:54:45 -07:00
Krzysztof Wicher
e3bc102b06 When Library add reference to NETStandardLib if not present 2016-11-01 15:52:24 -07:00
Krzysztof Wicher
875e275e38 Revert "When Library add reference to NETStandardLib if not present" 
This reverts commit 57d79bb2d3.
 2016-11-01 15:45:14 -07:00
Krzysztof Wicher
57d79bb2d3 When Library add reference to NETStandardLib if not present 2016-11-01 15:34:17 -07:00
Justin Goshi
155ef033f2 Migrate: auto-inject test dependency version (#4565) 
* Migrate: auto-injected dependencies should overwrite existing dependency version if present

* Address PR comments
 2016-11-01 12:10:51 -10:00
Livar Cunha
23a44f192f Fixing the test on windows. We need to use path.combine because of the forward/backward slashes for directory separation. 2016-11-01 14:58:11 -07:00
Faizan Ahmad
061722d4ad Enable some more test 2016-11-02 03:01:13 +05:30
Livar Cunha
82ff6397f5 Migrating unqualifing references as projects if we find a matching project. Without this, we have project references being migrated as package references. 2016-11-01 14:17:12 -07:00
Faizan Ahmad
0995daf83e 1) Added test to cover xunit scenario 
2) Added log in multi tfm test to root cause the issue where it is failing for net46
 2016-11-02 01:45:44 +05:30
Livar Cunha
c7858afc48 Attempting to actually fix the build this time. We were not pointing to the right packages cache before. 2016-11-01 12:46:29 -07:00
Faizan Ahmad
5c5ce3d336 Enable test verb tests 2016-11-01 22:01:30 +05:30
Faizan Ahmad
b13a7cee50 Enable Vstest test 2016-11-01 17:17:45 +05:30
Faizan Ahmad
1b5497afda Enale disabled vstest test. It was failing in restore. 
Going with increamental approach. In this commit i am trying to enable restore. In next commit will enable vstest
 2016-11-01 16:18:33 +05:30
Livar Cunha
9139c4006b Fixing full framework tests 2016-11-01 00:31:21 -07:00
Justin Goshi
f9493545dc Address PR comments to improve test readability and reliability 2016-10-31 20:50:52 -07:00
Justin Goshi
45ccc74ace Merge from rel/1.0.0 2016-10-31 20:00:15 -07:00
Livar
3c52adf53d Merge pull request #4537 from livarcocc/rename_tools_packages 
Rename tools packages
 2016-10-31 18:39:32 -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
Piotr Puszkiewicz
d804502a8a Remove deprecated test assets (#4546) 
* Remove deprecated test assets

* Add missing nuget configs and fix poorly named test folder

* Test Cleanup
 2016-10-31 16:16:07 -07:00
Justin Goshi
4cd74bff88 Only add the xunit references if the test running is xunit 2016-10-31 15:55:22 -07:00
Justin Goshi
4ea37c91a8 Migrate: add package dependencies to test projects 2016-10-31 13:59:47 -07:00
Livar Cunha
be2ab211f1 Addressing code review comments. 2016-10-31 12:39:03 -07:00
Livar Cunha
b16c9018b6 Adding a map of asp tools packages that tells which versions we need to migrate and to what. Any package in that list, will also have its version updated. 2016-10-31 12:33:01 -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
c3b57f2e72 Changing the Sdk.Web version to match the current SDK version so that we can update them together. Also added the dotnet-web to the migrated tests. 2016-10-30 21:32:11 -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
3ec5279491 Merge pull request #4516 from dagood/disable-parallel 
Use --disable-parallel during xplat restores
 2016-10-29 00:49:09 -07:00
Livar Cunha
9e88b811a0 Refactoring the ProjectTypeDetector to use the Project in the MigrationInputs. 2016-10-29 00:33:22 -07:00
Mike Lorbetske
2d27092513 Fix the test for web project migration 2016-10-29 00:33:22 -07:00
Mike Lorbetske
e847389fc2 Update migration to use the web template as a base for web projects 2016-10-29 00:33:22 -07:00
Livar
22a5a15ba9 Merge pull request #4536 from krwq/outputNameIssue 
Migrating project with OutputName
 2016-10-28 20:55:18 -07:00
Livar Cunha
6c1dd226ec Fixing windows failure due to path length. 2016-10-28 19:03:03 -07:00
Livar Cunha
9cbc563b55 Fixing tests in Windows. 2016-10-28 18:19:42 -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
Bryan Thornbury
c9f9421b93 preserve whitespace 2016-10-28 18:19:39 -07:00
Krzysztof Wicher
e9e05006da Migrating project with OutputName 2016-10-28 17:27:42 -07:00
Justin Emgarten
54cad0b7a6 Updating nuget to 4.0.0-rc-2037 2016-10-28 17:13:29 -07:00
Livar
cbed94dbef Merge pull request #4517 from livarcocc/promote_project_dependencies 
Promote project dependencies
 2016-10-28 15:17:47 -07:00
Arun Mahapatra
45a05417aa Update GivenDotnetTest3BuildsAndRunsTestFromCsprojForMultipleTFM.cs 2016-10-29 03:03:14 +05:30
Arun Mahapatra
43d27b843b Add issue to track vstest break 2016-10-29 01:30:49 +05:30
Arun Mahapatra
9ba8f816df Disable vstest tests temporarily to unblock PR build 2016-10-29 01:05:18 +05:30
Davis Goodin
6b361b8dad --disable-parallel in tests. 2016-10-28 11:06:37 -05: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
Faizan Ahmad
63a14fd3ab Merge from rel/1.0.0 2016-10-28 17:56:24 +05:30
Livar Cunha
29bd1e12e6 Fixing a merge with a new test that I added. No more restore3, hooray. 2016-10-27 20:56:36 -07:00
Livar Cunha
83350434bc Adding a E2E test and a indirect dependency to TestAppDependencyGraph. 2016-10-27 20:08:53 -07:00
Livar Cunha
fa6aa749bd Doing a tree traversal of all dependencies and creating a list that is then added to the project dependencies of the project. 2016-10-27 20:08:53 -07:00
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
Livar
53dc665e9b Merge pull request #4505 from livarcocc/assembly_info_migration 
Assembly info migration
 2016-10-26 17:00:22 -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
Livar Cunha
017fe529c1 Adding a E2E test for migrating an app with AssemblyInfo. 2016-10-26 15:13:39 -07:00
Livar Cunha
f863630fd8 Adding a rule that turns off assembly info generation for attributes already defined when migrating. 2016-10-26 13:55:15 -07:00
Faizan Ahmad
c7200f1599 Merge branch 'rel/1.0.0' into test3formultipletfm 2016-10-26 23:42:53 +05:30
Livar
4aa1c1bfb4 Merge pull request #4499 from eerhardt/FixRun3Project 
Fix dotnet run3 --project to pass the project to msbuild.
 2016-10-26 10:57:06 -07:00
Faizan Ahmad
679ea57acf Merge branch 'rel/1.0.0' into test3formultipletfm 2016-10-26 21:46:55 +05:30
Faizan Ahmad
aea25b1fc5 Addressed PR comment 2016-10-26 16:53:34 +05:30
Livar
7149c722b1 Merge pull request #4496 from livarcocc/issue_4486 
Merging metadata with different values
 2016-10-25 22:26:21 -07:00
Livar
8befd890d8 Merge pull request #4494 from livarcocc/migrate_target_package 
When determining the P2P dependencies, only use dependencies of type project
 2016-10-25 22:25:28 -07: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 Cunha
71aa93b164 Merging metadata with different values by setting the metadata values to be string joined and semi-column separated. This fixes the problem of having multiple mappings for the same file in a include/mappings. 2016-10-25 15:26:04 -07:00
Livar Cunha
175eaeb5c1 When determining the P2P dependencies, only use dependencies of type project. This prevents us from migrating a package dependency as a project dependency because of a project with the same name being present. 2016-10-25 13:09:06 -07:00
Faizan Ahmad
763e6bc946 nitpick 2016-10-26 00:10:25 +05:30
Faizan Ahmad
cb42c594ab Test fix 2016-10-25 22:22:00 +05:30
Faizan Ahmad
8379feacdf Updated test to handle configuration. 2016-10-25 20:57:59 +05:30
Faizan Ahmad
33caa408a1 1) Added support to run test from test3 verb for the project targeting multiple TFM 
2) Added test to address above change
3) Crossgen were creating problem for full CLR built assemblies. Removed All those assembly from Crossgen list.
4) Removed the line of code which were deleting Extensions folder under sdk folder as this folder contain trx logger dlls
 2016-10-25 20:10:18 +05:30
Livar
2cc007520d Merge pull request #4479 from livarcocc/projectdependencies_full_framework 
Making OutputPathCommandResolver work with MSBuild.
 2016-10-24 16:18:15 -07:00
Livar Cunha
d61ebd3087 Making OutputPathCommandResolver work with MSBuild. 2016-10-24 12:41:27 -07:00
Livar Cunha
be419e3b70 Fixing project dependencies migration so that they are only conditioned when they where under a TFM in the project.json to begin with. 2016-10-21 18:00:17 -07:00
Livar
caf072daeb Merge pull request #4463 from brthor/brthor/imports 
Turn on tests
 2016-10-21 14:22:21 -07:00
Livar
d8bf015d7c Merge pull request #4459 from livarcocc/package_files 
Package files
 2016-10-20 21:01:02 -07:00
Bryan Thornbury
5301f08423 turn on signing test (#4460) 
* turn on signing test

* fix the test

* test with xplat AssemblyOriginatorKeyFile

* tweak signassembly condition
 2016-10-20 20:15:42 -07:00
Livar Cunha
883eb2e82f Removing a test that is not necessary. 2016-10-20 15:53:31 -07:00
Bryan Thornbury
16ff3734a3 fix the multi tfm test to not build net20 2016-10-20 15:33:47 -07:00
Bryan Thornbury
1c1f4c462f turn on multi tfm test 2016-10-20 15:19:35 -07:00
Bryan Thornbury
481aebd18a turn on the web test 2016-10-20 15:04:53 -07:00
Livar Cunha
095105f2ec Addressing code review comments. 2016-10-20 14:35:45 -07:00
Livar Cunha
dc0d87c826 Adding an additional test to validate mappings to the root of the package. 2016-10-20 11:56:30 -07:00
Livar Cunha
ddef1fc424 Adding pack files migration. 2016-10-20 11:56:07 -07:00
Bryan Thornbury
ecbc45098d Add support for Migration defaults (#4242) 
* Add support for sdk props/targets defaults to Migration.

* fix the transform applicator

* remove transform applicator dependency on insertion order for item merges

* defaults constructor msbuild version change
 2016-10-20 11:00:41 -07:00
Livar Cunha
22bc479927 Updating msbuild to 15.1.319-preview5 2016-10-19 12:43:21 -07:00
Livar Cunha
e2e72a9662 Updating the msbuild templates in the CLI to use TargetFramework (singular). 2016-10-18 15:02:35 -07:00
Eric Erhardt
b32aedde5a Add /p:SkipInvalidConfigurations=true to fix the test 2016-10-17 21:03:08 -05:00
Eric Erhardt
469f7be5c3 Add test for dotnet run with multiple frameworks. 2016-10-17 21:03:08 -05:00
Justin Goshi
71666cc9b5 Auto add referenced assemblies for desktop migration 
* https://github.com/dotnet/cli/issues/4351

Auto add referenced assemblies for desktop migration. Adds the same ones
that the build for project.json does.

* Address PR comments

* Address CR comments

* Address CR comment

Use .ToList() instead of new List

* Fix a build break

Needed .noautobuild file in my test asset project

* Change the migrate test for desktop framework to windows only

* Reducing to 120 characters per line
 2016-10-18 01:02:10 +00:00
Livar Cunha
3798102035 Changing the API to create the MSBuild project to LoadProject and removing some non-existing paths from the RepoDirectoriesProvider. 2016-10-17 08:43:47 -07:00
Livar Cunha
391d04c67a Adding net46 to some of our libraries back, so that we can run binding-redirect tests again. We need those tests for tool and we need to keep them running. 2016-10-16 18:44:07 -07:00
Livar Cunha
7601f66328 Reducing the test method name sizes in an attempt to get it passing on Windows. 2016-10-16 18:42:57 -07:00
Livar Cunha
dab19ce57c Fixing msbuild.exe casing 2016-10-14 14:58:36 -07:00
Livar Cunha
8ad1982013 Handling configuration when the env variable is not set. 2016-10-14 14:36:09 -07:00
Livar Cunha
58bc3b5853 Making the tests aware of the Configuration used in the build. 2016-10-14 12:56:18 -07:00
Livar Cunha
99d6b1fd6d Adding some more tracing to tools command resolvers. 2016-10-14 12:56:18 -07:00
Livar Cunha
d8a10024e5 Addressing code review comments by removing unnecessary test artifacts. 2016-10-14 12:56:18 -07:00
Livar Cunha
318c9f3e44 Making ProjectDependenciesCommandResolver handle msbuild projects as well by using the ProjectFactory and IProject. 
Moving the CommandResolution classes that depend on msbuild back into Cli.Utils.

Updating the src projects to a netstandard compatible with Cli.Utils moving to netstandard1.5
 2016-10-14 12:56:18 -07: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
53b436c5d5 Updating NuGet to 3.6.0-rc-1984 2016-10-13 19:31:15 -07:00
Bryan Thornbury
1926d0e4a4 fix null ref when only one item (#4390) 2016-10-12 16:01:22 -07:00
Bryan Thornbury
f79d78703b remove autounify, fix langversion (#4387) 
* remove autounify, fix langversion

* PR feedback
 2016-10-12 14:59:36 -07:00
Faizan Ahmad
578edc9350 Rebase with rel/1.0.0 2016-10-12 22:53:43 +05:30
Faizan Ahmad
4dd685a45c Addressed livar PR comment 2016-10-12 15:20:07 +05:30
Justin Emgarten
f2eef338db Updating NuGet to 3.6.0-rc-1979 2016-10-12 00:49:44 -07:00
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
Eric Erhardt
ea092717ac Merge pull request #4369 from eerhardt/SingleTFM 
Move all CLI libraries to be single-TFM targeting netstandard1.3 where possible.
 2016-10-11 20:59:48 -05: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
742d48b596 Fix binding-redirects.Tests to work with net46. 2016-10-11 18:30:15 -05:00
Eric Erhardt
acbef441b1 fixup Cli.Utils.Tests for latest code from rel/1.0.0 2016-10-11 17:31:18 -05:00
Bryan Thornbury
924c2c2954 Fix Migration Imports (#4350) 
* Fix Migration Imports

* turn tests back on

* turn other tests back on

* test update

* update nuget version

* fix string join

* bump nuget version

* undo

* undo

* undo
 2016-10-11 15:22:18 -07:00
Eric Erhardt
b8dbdc29ae Merging Test.Utilties with the latest code from rel/1.0.0. 2016-10-11 17:20:15 -05:00
Eric Erhardt
b5329995d8 Merge branch 'rel' 2016-10-11 17:01:33 -05:00
Eric Erhardt
00f543d089 Fix dotnet-tests to run tests on net46, since we only support netstandard1.3 in ProjectModel. 2016-10-11 16:59:58 -05:00
Eric Erhardt
7618cce420 Remove GivenADesktopAppWhichUsesCommandCreateDotnet, since Cli.Utils will only support netstandard1.5 going forward. 2016-10-11 16:16:44 -05:00
Eric Erhardt
38753d42b0 Fix the tests for targeting netstandard1.3. 2016-10-11 16:01:03 -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
70a8872f45 Address CR comments for the new migration tests 
Changing the tests to also verify the error messages.
 2016-10-11 11:19:04 -07:00
Justin Goshi
5016aea90c Add tests 2016-10-10 18:01:59 -07:00
Bryan Thornbury
0bdd3bd59f type build, suppress parent, include, exclude working 2016-10-10 16:21:55 -07:00
Bryan Thornbury
c44e50dfc4 type build tests 2016-10-10 16:21:53 -07:00
Eric Erhardt
93166dd77c Merge pull request #4361 from eerhardt/RemoveFsc 
Remove dotnet-compile-fsc.
 2016-10-10 14:17:29 -05:00
Livar Cunha
c2bce2e2cc Moving the InferLegacyRestoreRuntime method to Test.Utilities, since it is needed only by tests. 2016-10-10 09:52:39 -07:00
dasMulli
148319a3c2 Added clean3 verb for msbuild based projects. 2016-10-10 18:31:30 +02:00
Eric Erhardt
6cf0327875 Remove dotnet-compile-fsc. 
It's new home is https://github.com/dotnet/netcorecli-fsc/
 2016-10-10 11:23:46 -05:00
Faizan Ahmad
23af21d7bb Merge with rel/1.0.0 2016-10-10 15:29:35 +05:30
Livar Cunha
09d811fdbd Adding an OverrideRid property used in the GetRuntimeInfo task to override the rid of the CLI. This allows us to build for osx.10.11 when building on osx.10.12. 2016-10-08 11:45:19 -07:00
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
5c6e3a05fb Merge pull request #4305 from dotnet/sridhar-ms/migrate-p2p-fix 
Fix P2P migration and migrate folders in global.json
 2016-10-05 20:59:39 -07:00
Sridhar Periyasamy
c6064677db Address PR feedback 2016-10-05 17:58:42 -07:00
Nate McMaster
b38f644347 Merge pull request #4326 from dotnet/namc/user-secrets 
Add migration rule for 'userSecretsId'
 2016-10-05 16:40:38 -07:00
Sridhar Periyasamy
1d85c241b1 Add support to migrate folders specified in global.json 2016-10-05 16:27:17 -07:00
Sridhar Periyasamy
a396630576 Fix P2P migration 
Fixes #4269 by deep cloning the MsbuildTemplateProject for each P2P reference. Add test which migrates and builds P2P references.
 2016-10-05 16:25:28 -07:00
Livar Cunha
bfc1f82d68 Fixing the tools item name in csproj. Nuget used a different one then was originally at the spec. 2016-10-05 15:27:30 -07:00
Nate McMaster
190f0fc756 Rename to MigrateJsonPropertiesRule 2016-10-05 15:15:13 -07:00
Nate McMaster
dd7a76e6f0 Add migration rule for 'userSecretsId' 2016-10-05 15:05:19 -07:00
Bryan Thornbury
50e83b9c65 Merge pull request #4320 from brthor/brthor/toolsrefmigration 
dotnet cli migrate tools ref
 2016-10-05 13:39:34 -07:00
Livar
7a0dff8a96 Merge pull request #4300 from livarcocc/support_for_toolsref 
Support for toolsref
 2016-10-05 13:18:12 -07:00
Livar Cunha
465b32dab4 Addressing code review comments. 2016-10-05 11:51:59 -07:00
Bryan Thornbury
310da80c3a remove write 2016-10-05 11:39:14 -07:00
Bryan Thornbury
1232a38e51 dotnet cli migrate tools ref 2016-10-05 11:36:23 -07:00
Livar Cunha
facbef52ff Changing the code to read tools from csproj because the tools section in assets.json is no longer being populated. 2016-10-04 18:59:44 -07:00
Livar Cunha
1570e0fde4 Moving the ProjectToolsCommandResolver to dotnet out of Cli.Utils because of the dependency on Microsoft.Build. Also added a EndToEnd test for tools ref using the MSBuildTestApp. 2016-10-04 18:59:44 -07:00
Livar Cunha
e5f6107d88 Fixing a test that needed the lock file now that that's what we use for tools. 2016-10-04 18:58:38 -07:00
Bryan Thornbury
bf5404373f add signed verification test 2016-10-04 16:48:14 -07:00
Bryan Thornbury
46b16d2de0 fix signing migration 2016-10-04 16:06:45 -07:00
Bryan Thornbury
7632cd3502 Merge pull request #4261 from brthor/brthor/packageref 
PackageReference Migration
 2016-10-04 14:42:43 -07:00
Bryan Thornbury
a078e8b845 dir 2016-10-04 10:13:01 -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
Bryan Thornbury
bf45ab19ca PackageReference 2016-10-03 17:12:57 -07:00
Eric Erhardt
5055935008 Merging rel/1.0.0-preview2 into rel/1.0.0. 2016-10-03 14:47:24 -05:00
Faizan Ahmad
b240b855c1 Update the new version of Microsoft.TestPlatform.cli which has fix related to testAdapterPath. 
Updated the test project to reflect the same.
 2016-10-04 00:17:35 +05:30
Eric Erhardt
79999f3798 Remove temporary test project. 2016-10-03 09:37:15 -05:00
Eric Erhardt
a7366f5864 Add support for publishing self-contained applications. 
Fix #4204
 2016-10-03 09:23:00 -05: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
68e1aae6cc Fixing tests. 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
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
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
Sridhar Periyasamy
ec7aa87576 Add xproj tests to test migrate command. 2016-09-23 17:33:35 -07:00
Livar Cunha
f5feed1abb Removing a test that won't work now. 2016-09-23 14:37:16 -07: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
Livar Cunha
09a369530c Adding tests for run3. 2016-09-23 12:49:24 -07:00
Eric Erhardt
eed29be806 Add dotnet publish3 command. 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
Livar
a0aa51777f Merge pull request #4233 from livarcocc/migrate_packOptions 
Adding migrate PackOptions capabilities.
 2016-09-22 17:57:08 -07:00
Bryan Thornbury
5523f24712 fix tests 2016-09-22 17:16:37 -07:00
Livar Cunha
768e289f0c Adding migrate PackOptions capabilities. 2016-09-22 16:14:27 -07:00
Bryan Thornbury
95e0ed3713 fix errors, enable tests 2016-09-22 14:30:56 -07:00
Eric Erhardt
5bd310bbd5 Add dotnet msbuild tests. 2016-09-22 15:56:36 -05:00
Bryan Thornbury
3e6e1ddcd0 add support for conditioned csproj references, add tests 2016-09-22 12:51:23 -07:00
Bryan Thornbury
a688885f21 remove nuget dependency in tests 2016-09-21 21:23:50 -07:00
Bryan Thornbury
8a420de736 Remove nuget dependency 2016-09-21 21:14:48 -07:00
Bryan Thornbury
5d2f0579d2 Migrate xproj to csproj dependencies 2016-09-21 17:27:02 -07:00
Bryan Thornbury
08fbe7f9d1 remove debug 2016-09-21 14:51:31 -07:00
Bryan Thornbury
2dd99ce015 improve finding encompassed items in a configuration 2016-09-21 14:41:16 -07:00
Bryan Thornbury
b03f4c282b remove some tests 2016-09-21 13:19:01 -07:00
Bryan Thornbury
fe676e7bc6 use c# boolean syntax 2016-09-21 11:51:13 -07:00
Bryan Thornbury
dc13951871 fix PublishWithContents test 2016-09-21 11:37:43 -07:00
Bryan Thornbury
875d91629e case insensitive msbuild metadata findng 2016-09-21 11:31:30 -07:00
Bryan Thornbury
362f71a94a Project Json mapping migration support 2016-09-20 21:18:11 -07:00
Bryan Thornbury
3a567e5957 Merge pull request #4185 from brthor/brthor/migrate-x-targetting 
Migration X-Targeting
 2016-09-19 16:01:04 -07:00
Bryan Thornbury
02495c07e0 Remove script extension inference test 2016-09-19 15:13:09 -07:00
Bryan Thornbury
448d9dc08b remove pathext workaround 2016-09-19 13:25:40 -07:00
Bryan Thornbury
67f292947d try again 2016-09-19 11:11:01 -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
Bryan Thornbury
2ddcbe449c kill script extension inference tests 2016-09-19 10:54:45 -07:00
Bryan Thornbury
9067bc9e45 Path ext hacks 2016-09-19 10:33:03 -07:00
Bryan Thornbury
9d46a19c59 TFM 2016-09-19 09:16:36 -07:00
Bryan Thornbury
fe20698d81 PR Feedback 2016-09-16 16:37:48 -07:00
Bryan Thornbury
3cdd994798 fix test 2016-09-15 16:30:39 -07:00
Bryan Thornbury
944eb1e787 Migration X-Targeting 2016-09-15 15:54:10 -07:00