Commit graph

1108 commits

Author SHA1 Message Date
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