Commit graph

1969 commits

Author SHA1 Message Date
Livar
05670d6d7f Workaround for empty restore.txt file under .tam (#4771)
* For some reason, specially in CI, the restore.txt file under .tam is ending up empty. As a workaround for it, I am going to retry the restore if that happens.

* Change how we diff the existing files in the TAM by using the explicit list from the .txt file.

* Using Nuget ReplaceWithLock utility to get around a concurrency issue on windows.
2016-11-18 19:28:38 -08:00
Livar
dd2fe2fac5 Merge pull request #4777 from dasMulli/bugfix/assembly-attributes-migration
Migration: Handle different variations of specifying assembly attributes.
2016-11-18 13:56:30 -08:00
Piotr Puszkiewicz
5fb561ee50 Merge pull request #4750 from mattscheffer/locWork
Extract Localizable strings from dotnet-build
2016-11-18 12:49:14 -08:00
dasMulli
acb4d64c07
Migration: Handle different variations of specifying assembly attributes. 2016-11-18 18:05:00 +01:00
dasMulli
09cb9bf607
Show migrate, nuget and msbuild commands in dotnet-help.
Also split the help text into commands and advanced commands sections
2016-11-17 19:11:41 +01:00
v-masche
b205bfdc02 Fixing the namespace to match the Program.cs in the same folder 2016-11-16 16:39:44 -08:00
v-masche
b0077f4f25 Adjusted ProjectArgumentDescription to be a single string rather than divided into two strings. 2016-11-16 14:57:57 -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
v-masche
3b8567248a Extract localizable strings from dotnet-build 2016-11-15 17:12:26 -08: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
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
Piotr Puszkiewicz
b354e1a3c6 Eliminate imports from CLI, where possible (#4673)
* Remove imports from dotnet.dll

* Add back dotnet5.4 to dotnet.dll due to AppInsights

* dotnet-cli-build.csproj: OData
redist.csproj: AppInsights
2016-11-10 10:19:37 -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
a700604b93 Merge pull request #4654 from 333fred/fix-help-text
Cleaned up dotnet migrate help text
2016-11-08 21:05:21 -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
Fredric Silberberg
660417aaed
Cleaned up help text. Fixes #4653. 2016-11-08 14:39:19 -08:00
Faizan Ahmad
cc450ed8ce Update the version for migration project 2016-11-08 23:05:43 +05:30
Livar Cunha
ef90667375 Hoisting FrameworkAssemblies for desktop frameworks during migration. 2016-11-07 16:16:48 -08:00
Livar Cunha
c7841909fd Updating the CLI versino to preview4. 2016-11-07 10:39:59 -08:00
Faizan Ahmad
91708c4d89 Updated new version of Microsoft.TestPlatform.Build 2016-11-07 18:11:43 +05:30
Faizan Ahmad
f3cffa0bf4 Update version of xunit adapter and runner 2016-11-07 14:50:08 +05:30
Parallels
d68341b92d Removing DocumentationFile path from migration and one test asset. 2016-11-04 11:51:43 -07:00
Piotr Puszkiewicz
cb7c9360b7 Bump mstest template 2016-11-04 10:35:54 -07:00
Piotr Puszkiewicz
24596b23ae 02->2 2016-11-04 10:30:00 -07:00
Piotr Puszkiewicz
6e5527ba4c Final Version Numbers 2016-11-04 10:09:22 -07:00
seancpeters
d1e0d2bde3 Removed Project_Readme from CSharp_Web (#4617)
* Removed Project_Readme from CSharp_Web
Added the package fallback target to CSharp_Web

* Added the $if$ i missed when I copy-pasted.

* Removed the if-else
2016-11-03 23:03:29 -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
Piotr Puszkiewicz
51cb0ab4d5 Remove deprecated nupkgs, pack in-place to enable signing (#4615)
* Remove deprecated nupkgs, pack in-place

* Add back target specifiers.

* fix suffix
2016-11-03 22:11:58 -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
28ba817dc1 Merge pull request #4602 from NTaylorMullen/nimullen/versionchange
Change ASP.NET tool version to reflect project format.
2016-11-03 18:39:55 -07:00
Livar Cunha
336e29075f Adding MSTest to the exclusion list of project.json because some test projects still depend on it and they are build with pj stage0. 2016-11-03 17:05:20 -07:00
N. Taylor Mullen
07c2e0ced0 Change ASP.NET tool version to reflect project format. 2016-11-03 11:46:43 -07:00
Livar
de5da5870f Marking hoisted P2P projects with a FromP2P attribute. (#4598) 2016-11-03 10:27:51 -07:00
Faizan Ahmad
ef8e59231a Fix for issue https://github.com/Microsoft/vstest/issues/175 2016-11-03 19:20:56 +05:30
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
Justin Goshi
499579ddb8 Rename test templates for casing consistency (#4587) 2016-11-02 13:44:28 -10:00