Commit graph

4490 commits

Author SHA1 Message Date
Piotr Puszkiewicz
97d4c8b24f Merge branch 'rel/1.0.0-rc3' into dev/jgoshi/issue5253 2017-01-12 11:47:46 -08:00
Justin Goshi
71da7f6a45 Migration: do not inject built in compile includes that the SDK does 2017-01-12 11:22:41 -08:00
Piotr Puszkiewicz
4319668111 Merge pull request #5291 from piotrpMSFT/piotrpMSFT/issues/5283-UpdateMsbuild
Update msbuild to 15.1.0-preview-000522-02
2017-01-12 01:29:34 -08:00
Piotr Puszkiewicz
7608f2d288 Update msbuild to 15.1.0-preview-000522-02 2017-01-11 23:58:51 -08:00
Livar
e734d5c15c Merge pull request #5270 from livarcocc/fix_lzma
Cherry pick the lzma fix from rel/1.0.0 into rel/1.0.0-rc3
2017-01-11 19:18:15 -08:00
Justin Goshi
03be0e56d4 Migration: Do not add RIDs for Library projects (#5279)
* WIP

* Do not add runtime identifiers for libraries

* Reusing an existing test project

* Fix up tests
2017-01-11 17:05:12 -08:00
Livar Cunha
420a6e9a66 Use a separate env variable to control uploading the lzma archive. We only want OSX to publish the archive, because turns out that windows published archives are not used by unix based oses. 2017-01-11 14:45:25 -08:00
Eric Erhardt
408b36f509 Fix the download of the LZMA archive on dev machines and in Jenkins CI. 2017-01-11 14:45:24 -08:00
Piotr Puszkiewicz
0bd6303f47 Restore debian test before running it (#5272) 2017-01-11 10:53:26 -08:00
Livar
4b82852d56 Updating the version of msbuild to 15.1.0-preview-000516-03 (#5266)
* Updating the version of msbuild to 15.1.0-preview-000516-03

* Remove test that assumes props/targets imports

The test ItAddsRefBetweenImports validated that the MSBuild XML model contained new project references between the props and targets imports. While useful be fore the SDK attribute, the test no longer adds value since the SDK is added implicitly, guaranteeing it wraps the remaining project contents.

* Move MSBuild to 15.1.0-preview-000509-03

This is the last msbuild version prior to the change of MSBuild's dependencies to include .NET 1.1 components.

* Move MSBuild invocations to use dirs.props/dirs.tasks

* Put back the test targets. We'll unify later.

* Remove dirs.props props from templates msbuild invocation
2017-01-11 01:49:22 -08:00
Mike Lorbetske
ad6fab0a15 Synchronize templates with new3, add global.json (#5244)
* Synchronize templates with new3, add global.json

* Add runtimeconfig.template.json for web

Removes global.json write during template creation

* Remove global.json check from the test

* making templates the same as new3 templates

* Fix broken PrivateAssets, content update

Sets OutputType as appropriate
Alphabetizes package references

* Rollback browserlink version to 1.0.0

* Downgrade 1.1.0 of browserlink to 1.0.0 as well

* Add newline to the end of the console project
2017-01-10 22:58:30 -08:00
Livar
8f3e00f620 Merge pull request #5260 from dotnet/updatenugetrc3
update nuget rc3 dependencies and update sdk
2017-01-10 18:17:09 -08:00
Rohit Agrawal
00425c3d34 Update Microsoft.DotNet.Cli.DependencyVersions.props 2017-01-10 16:46:32 -08:00
Livar
16e87076a6 Merge branch 'rel/1.0.0-rc3' into updatenugetrc3 2017-01-10 16:08:49 -08:00
Livar
839810a390 Merge pull request #5250 from livarcocc/update_brand_to_rc3
Updating the branding of the CLI to 1.0.0-rc3
2017-01-10 15:36:22 -08:00
Livar Cunha
daba5cf499 Updating additional values of branchinfo.txt. 2017-01-10 14:16:15 -08:00
Livar Cunha
8a6faa2dca Fixing windows test. 2017-01-10 14:12:04 -08:00
Rohit Agrawal (NUGET)
3ecdc62089 update nuget rc3 dependencies and update sdk 2017-01-10 11:24:27 -08:00
Livar Cunha
e795e12a16 Addressing code review comments. 2017-01-10 10:47:10 -08:00
Livar Cunha
e71c58c156 Fixing nuget API calls and fixing the nuget test package directory creation, so that nuget can restore using it. 2017-01-10 10:43:05 -08:00
Livar Cunha
c691f6d7fe Fixing the test packages preparation. First, allows it to run independently. Second, it actually points to packages produced by the repo. 2017-01-09 16:49:57 -08:00
Livar Cunha
3220b14248 Updating the branding of the CLI to 1.0.0-rc3 2017-01-09 13:59:03 -08:00
Nick Guerrera
006fd49e5c Merge pull request #5246 from nguerrera/xlf-update
Update xlf files
2017-01-09 10:03:46 -08:00
Nick Guerrera
ea2908504c Update xlf files 2017-01-09 08:58:13 -08:00
Livar
87e9815a25 Merge pull request #5234 from harshjain2/tpv2update
Updated version of Test Platform
2017-01-07 14:44:01 -08:00
Harsh Jain
ce64bee309 updated veersion of Microsoft.NET.Test.sdk for failing tests. 2017-01-08 03:01:58 +05:30
Livar
f2f37729b8 Merge pull request #5235 from eerhardt/PopulateNuGetCache11
Populate nuget cache for shared fx and asp.net 1.1
2017-01-07 11:31:54 -08:00
Harsh Jain
d8a323f146 Removed output type as it is handled through Microsoft.NET.Test.Sdk 2017-01-07 20:51:36 +05:30
Harsh Jain
0222e8e850 merged to resolve conflicts 2017-01-07 20:40:50 +05:30
Eric Erhardt
10f70dd034 Add a test to ensure 1.0 and 1.1 packages are available in the nuget cache on first run. 2017-01-07 08:43:28 -06:00
Rohit Agrawal
5bbfbfeeed update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5 (#5214)
* update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5

* Modifying restore project.json to use the project.json stage0 CLI instead of restore-projectjson command.

* add a nuget dependency so migrated project has packageref and generates an assets file on restore
2017-01-06 16:28:04 -08:00
Krzysztof Wicher
5044c76be4 Merge pull request #5237 from krwq/5103
Rename (dotnet add|list|remove) p2p(s?) ->$1 reference
2017-01-06 16:12:12 -08:00
Eric Erhardt
0cfc54c377 First time experience populating the NuGet cache with 1.1 packages. 2017-01-06 17:45:34 -06:00
Krzysztof Wicher
7042e85292 dotnet list p2ps -> dotnet list reference 2017-01-06 14:58:38 -08:00
Krzysztof Wicher
528d37bda5 dotnet remove p2p -> dotnet remove reference 2017-01-06 14:58:38 -08:00
Krzysztof Wicher
3ad9b72664 dotnet add p2p -> dotnet add reference 2017-01-06 14:58:38 -08:00
Livar
5bdbe354b2 Merge pull request #5226 from livarcocc/migrate_full_framework
Migration will now pick win7-x86 as the RuntimeIdentifier to be used by Full Framework TFMs
2017-01-06 14:48:35 -08:00
Mike Lorbetske
decec5f8da First step to ingest template engine (#5065)
* First step to ingest template engine

Please do not merge yet
@piotrp @seancpeters @livarocc

* Localization

* Attempt to get a build going

Rename program.cs to New3Command.cs
Move TableFormatter into its own file
Consume template engine packages version 1.0.0-beta1-20161218-24
Temporarily add MyGet templating feed so that package restore will work

* Update ExtendedCommandParser

Make short form args prefer longer runs of characters in the source
parameter before falling back to p:shortname syntax
Change scoping for a few methods to get rid of inconsistent visiblity
errors

* Fix package installation wildcards

* Cleanup New3Command, fix review issue, bump version, sorting for template list

* Installation, loc fix, help formatting

* Use latest TemplateEngine packages

* New3 unit tests

* Fixed formatting on csproj files

* Add the build steps to add templates to the layout

* Change tests slightly to make comparisons easier

Also fixes the wrong flag getting passed to set language

* Fixes for 127, 128, 130, 131 - help display

* Sync to latest TemplateEngine version

Absorbs new search logic

* All tests passing

Cleaner New3Command
Support for project/item template contexts

* Try to make tests more durable

* Disable test parallelization for dotnet-new tests

* Update web SDK and template engine versions

* Remove AI package feed

* Simplify CLI interface to Template Engine

* Fix host identifier and update to latest packages

* Update template engine & Web SDK versions

* Fix template engine version

* Remove UsingTask and redeclaration of property
2017-01-06 14:48:27 -08:00
Livar
5e7b946ad7 Merge pull request #5231 from v-zbsail/localization
LOC CHECKIN | dotnet/cli | 20170106
2017-01-06 14:48:14 -08:00
Justin Goshi
e109a9be47 dotnet sln command (#5233)
* Add dotnet sln command

* Use new names for localizable strings

* Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
Livar
f0d6b20dd7 Merge branch 'rel/1.0.0' into localization 2017-01-06 12:30:58 -08:00
Harsh Jain
043418e931 removed myget feed which was added for verification 2017-01-07 01:48:29 +05:30
Livar Cunha
0ebb92f3c4 Renaming a test asset to avoid running into long path issues on Windows. 2017-01-06 11:34:37 -08:00
Harsh Jain
effee47d38 Version update for test platform. 2017-01-07 01:04:00 +05:30
Eric Erhardt
dcbfa16380 Add SharedFx 1.1 templates for C# console and web. 2017-01-06 13:02:00 -06:00
Livar
dbdbde5bcc Merge pull request #5229 from livarcocc/another_xlf_update
Another update to the xlf files.
2017-01-06 10:20:08 -08:00
Zbyněk Sailer
bf7a0845b7 LOC CHECKIN | dotnet/cli | 20170106 2017-01-06 19:07:21 +01:00
Eric Erhardt
12f28a6019 Merge pull request #5225 from eerhardt/AddSharedFx11
Install Shared Framework 1.1 when installing the CLI
2017-01-06 11:21:14 -06:00
Piotr Puszkiewicz
bf4588b6fc Add PJ support to TestAssets (#5109)
* Add PJ support to TestAssets

* Cleaning the test assets is hard, so throwing instead

* better assets filter

* PR feedback

* PR Feedback

* Fix NullRef

* Move lock to surround action + file read/write
2017-01-06 01:40:26 -08:00
Livar
839bc2394e Merge pull request #5228 from eerhardt/FixBuild
Fix official build break by referencing WindowsAzure.Storage 7.2.1 everywhere
2017-01-05 23:26:40 -08:00