Commit graph

4194 commits

Author SHA1 Message Date
Piotr Puszkiewicz
d5f7af1604 Update WebSDK version 2016-12-05 00:54:30 -08:00
Piotr Puszkiewicz
c4d5432e1a Merged branch rel/1.0.0 into dev/mlorbe/UpdateCSharpWebTemplatesForSdkAttribute 2016-12-04 23:38:09 -08:00
Scott Carlton
29b824a6ff Fix formatting of string litteral, squash. (#4899) 2016-12-04 22:54:42 -08:00
Piotr Puszkiewicz
0e55a41f69 Merge branch 'rel/1.0.0' into dev/mlorbe/UpdateCSharpWebTemplatesForSdkAttribute 2016-12-04 22:32:38 -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
Scott Carlton
e3cfe1d13d Localization for the Help Command (#4891)
* Localization for the Help Command

* Updated ProjModificationCommands

* Added RemoveDefinition

* Make UsageText `static readonly`
2016-12-04 20:24:02 -08:00
Piotr Puszkiewicz
53ba8070e4 Merge branch 'rel/1.0.0' into dev/mlorbe/UpdateCSharpWebTemplatesForSdkAttribute 2016-12-04 15:17:33 -08:00
Jürgen Pfeifer
957ff3981f - Never check agains username, that's bad practice. Always use effective UID (#4894)
- Never write error messages and tracing info to stdout, that's bad practice too.
2016-12-04 12:17:03 -08:00
Nick Guerrera
5195aad7d1 Initial commit of xlf files for localization (#4898)
* Initial commit of xlf files for localization

* Update xlf with converter tool bug fix
2016-12-04 12:16:08 -08:00
Mike Lorbetske
382c3438f9 Add missing SDKs (#4912)
* Add missing SDKs

NuGet.BuildTasks.Pack 4.0.0-rc2
Microsoft.NET.Sdk.Publish (parameterized version)
Microsoft.NET.Sdk.Web.ProjectSystem (parameterized version)

* Fix version number for Microsoft.NET.Sdk
2016-12-04 12:15:07 -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
Mike Lorbetske
b2932f5511 Adjust the C# web template for the SDK attribute
Use the attribute
Remove the initial and final imports
Extend GlobalExclude
Update the include patterns
Remove the PackageReference for the SDK
2016-12-03 22:57:33 -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
Scott Carlton
0622068cc9 Localization for the Test command (#4886) 2016-12-01 17:15:25 -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
Scott Carlton
8083a68944 Localized strings for the dotnet-pack command. (#4879)
* Localized strings for the dotnet-pack command.

* Moved parameters of options to a new line

* Moved the other option parameters
2016-12-01 13:19:34 -08:00
Scott Carlton
1aa562d97f Localization for dotnet-clean command. (#4878)
* Localization for dotnet-clean command.

* Modified spacing to keep under the 120 char limit

Moved the parameters of each option to a new line.

* Moved projectArgument parameter to a new line
2016-12-01 11:20:44 -08:00
Livar
15d278a07f Merge pull request #4877 from vsccarl/InterpolationFix
Interpolation fix for run, restore, and build commands
2016-11-30 21:44:44 -08:00
Alex Barney
58b0566d9a Add InstallDir to path if SDK version is already installed (#4843)
* Add InstallDir to path if SDK version is already installed

* Make changes based on feedback

* Rename "Append" to "Prepend"
* Remove check if directory is already in path
2016-11-30 20:36:24 -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
33529b567e fix build by not running tests on a test helper library 2016-11-30 15:14:57 -08:00
Justin Goshi
14152207f6 Update our sln file to reference our csproj files (#4876) 2016-11-30 12:44:23 -10:00
Krzysztof Wicher
1f56e84b7e Remove P2PHelpers and simplify constructors in MsbuildProject 2016-11-30 13:43:43 -08:00
vsccarl
93d5dca470 Added interpolation operator for strings in run command 2016-11-30 13:06:21 -08:00
vsccarl
f93a5d3d83 Fixed Interpolation for restore and run commands 2016-11-30 13:03:24 -08:00
Krzysztof Wicher
26442c8769 revert line endings in dotnet.csproj 2016-11-30 12:11:12 -08:00
Krzysztof Wicher
0349aed9a7 complete tests 2016-11-30 12:07:13 -08:00
Scott Carlton
879ae39f35 Extract localizable strings from dotnet-publish (#4801)
* Extract localizable strings from dotnet-publish

* Added $ to interpolated strings

* Update Program.cs
2016-11-30 09:04:04 -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
78d95b423e dotnet-remove-p2p implementation complete - no tests 2016-11-29 14:00:44 -08:00
Krzysztof Wicher
6a703ffa73 normalize slashes and casing when comparing includes 2016-11-29 12:49:38 -08:00
Krzysztof Wicher
4e3c73e778 extract logic for opening project and preserving directory and path to separate class 2016-11-29 10:23:04 -08:00
Krzysztof Wicher
1edda43dd1 reorg of code so that sharing is easier + stub for dotnet-remove-p2p 2016-11-29 09:44:39 -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