Commit graph

859 commits

Author SHA1 Message Date
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
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
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
Krzysztof Wicher
9a8d158e09 add test coverage 2016-12-08 16:23:21 -08:00
Krzysztof Wicher
2d38aaa6e1 fix dotnet-add-p2p tests 2016-12-08 14:56:31 -08:00
Krzysztof Wicher
84e4da57cc add compat checks to dotnet add 2016-12-08 13:06:12 -08:00
Livar
355b6233cb Merge pull request #4944 from vsccarl/restoreLoc
Fixed a missing interpolation operator
2016-12-07 14:42:47 -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
Piotr Puszkiewicz
15e86d8c58 Merge branch 'rel/1.0.0' into restoreLoc 2016-12-07 00:51:53 -08:00
Scott Carlton
d29925a689 Fixed spacing for some strings (#4943)
Some strings lost a space before .NET for some reason. Fixed now.
2016-12-07 00:46:40 -08:00
Scott Carlton
3890acd8da Fixed a missing interpolation operator 2016-12-06 10:04:11 -08:00
Livar
23fb676f2a Merge pull request #4931 from livarcocc/change_to_preview5
Updating the branding of rel/1.0.0 to preview5.
2016-12-05 15:47:08 -08:00
Livar Cunha
de9ae38375 Updating the branding of rel/1.0.0 to preview5. 2016-12-05 14:47:16 -08:00
Nick Guerrera
a41b3d936b Add more xlf files for new strings 2016-12-05 13:12:48 -08:00
Livar
2e6cc71286 Merge pull request #4903 from vsccarl/LocAddCommand
Localization changes for dotnet-add and dotnet-add-p2p
2016-12-05 13:09:19 -08:00
Livar
7ee59f8b4d Merge pull request #4902 from vsccarl/LocNew
Localization for dotnet-new command
2016-12-05 12:38:01 -08:00
Scott Carlton
0804055422 Added back SpecifyAtLeastOneReferenceToAdd 2016-12-05 12:00:12 -08:00
Scott Carlton
e5954ca4f0 More string.Format fixes 2016-12-05 11:09:05 -08:00
Scott Carlton
11ea49dc7c added a string.Format 2016-12-05 11:04:19 -08:00
Scott Carlton
464f2d9a6c Updated wrong localizableStrings reference 2016-12-05 10:58:47 -08:00
Piotr Puszkiewicz
337becdefd Merge branch 'rel/1.0.0' into LocAddCommand 2016-12-05 10:53:52 -08:00
Scott Carlton
65a3d0e500 More string changes. 2016-12-05 10:47:10 -08:00
Scott Carlton
5935b9bea7 More string changes 2016-12-05 10:47:05 -08:00
Scott Carlton
2554aeda89 Fixed strings 2016-12-05 10:24:11 -08:00
Scott Carlton
c5955743d8 Fixed broken up strings 2016-12-05 10:23:34 -08:00
Piotr Puszkiewicz
ca8904ec3a Merge branch 'rel/1.0.0' into dev/mlorbe/UpdateCSharpWebTemplatesForSdkAttribute 2016-12-05 02:58:41 -08:00
Scott Carlton
6a38780f4e Localize dotnet-remove-p2p (#4901)
* Rename centralized LocalizableStrings file

* Merge

* Small fixes
2016-12-05 02:57:30 -08:00
Piotr Puszkiewicz
3566b9309d PR feedback 2016-12-05 01:07:15 -08:00
Piotr Puszkiewicz
e249d4a0bc Squash 2016-12-05 01:07:15 -08:00
Piotr Puszkiewicz
c4d5432e1a Merged branch rel/1.0.0 into dev/mlorbe/UpdateCSharpWebTemplatesForSdkAttribute 2016-12-04 23:38:09 -08:00
Piotr Puszkiewicz
82ec742d37 Squash 2016-12-04 23:36:02 -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
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
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
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