Commit graph

207 commits

Author SHA1 Message Date
Krzysztof Wicher
1a20d7f82c Merge remote-tracking branch 'github/rel/1.0.0-rc3' into rel/1.0.0 2017-01-18 12:38:11 -08:00
Piotr Puszkiewicz
964f0177d8 20170117-4 2017-01-17 16:33:36 -08:00
Piotr Puszkiewicz
61b7841087 bump core sdk to 1.0.0-alpha-20170117-1 (#5358) 2017-01-16 20:02:02 -08:00
Piotr Puszkiewicz
b312fbb176 Bump SDK to 20170114-3 (#5324)
* Bump SDK to 20170114-3

* bump to 20170115-2
2017-01-14 19:52:02 -08:00
Rainer Sigwald
7bc1bd4e7d Update msbuild to 15.1.0-preview-000523-01 (#5323) 2017-01-14 13:55:08 -08:00
Piotr Puszkiewicz
db2282a055 Update Microsoft.DotNet.Cli.DependencyVersions.props (#5322) 2017-01-13 23:53:08 -08:00
Piotr Puszkiewicz
20fa03e37f Bump SDK to 1.0.0-alpha-20170113-2 (#5313)
* Bump SDK to 1.0.0-alpha-20170113-2

* Updating the Web.SDK to 1.0.0-alpha-20170113-2-221

* Updating the web SDK to 1.0.0-alpha-20170114-1-223
2017-01-13 22:10:56 -08:00
Livar Cunha
8c2e7c9f01 Merge branch 'rel/1.0.0-rc3' into merge_rc3
* rel/1.0.0-rc3:
  Fixing an issue where packages with a filter but no match were not being migrated as is, instead they were being dropped.
  Add support for migrating Microsoft.AspNetCore.Mvc.ViewCompilation
  Switching to using a csv as the source of our lts packages. Also, this is a more comprehensive list.
  Adding a few more packages that were not in the manifest and moving some tests around.
  Migrating packages to LTS (1.0.3) versions if they have a smaller version than the LTS one.
  Adding ranges to the source mappings so that we can specify the origin should match this range and migrate to that version. We use this to handle LTS/FTS migration and will use that for the LTS uplift.
  Migration: do not inject built in compile includes that the SDK does
  Update msbuild to 15.1.0-preview-000522-02
  Migration: Do not add RIDs for Library projects (#5279)
  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.
  Fix the download of the LZMA archive on dev machines and in Jenkins CI.
2017-01-13 14:08:31 -08:00
Livar
a442449c55 Updating the branding on rel/1.0.0 to rc4. (#5267) 2017-01-12 13:14:57 -08:00
Piotr Puszkiewicz
7608f2d288 Update msbuild to 15.1.0-preview-000522-02 2017-01-11 23:58:51 -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
PiotrP
c008e85f6a revert rc3->preview5 2017-01-11 13:18:44 -08:00
PiotrP
9008aaff85 merge RC3 into rel/1.0.0 2017-01-11 13:03:09 -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
Piotr Puszkiewicz
203a28beb7 Merge branch 'rel/1.0.0' into NuGetDependencyVersions 2017-01-11 00:43:07 -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
Eric Erhardt
9d2976863b Merge branch 'rel/1.0.0' into NuGetDependencyVersions 2017-01-10 21:59:30 -06:00
Eric Erhardt
fd8f9b1bde Fix the download of the LZMA archive on dev machines and in Jenkins CI. 2017-01-10 21:10:40 -06:00
Krzysztof Wicher
0be2f7c1fa update msbuild version to 15.1.0-preview-000509-03 (#5249) 2017-01-10 17:46:05 -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 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
Eric Erhardt
5035320247 Add NuGet version to DependencyVersions.props. 2017-01-10 10:43:14 -06: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
Livar
87e9815a25 Merge pull request #5234 from harshjain2/tpv2update
Updated version of Test Platform
2017-01-07 14:44:01 -08:00
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
0222e8e850 merged to resolve conflicts 2017-01-07 20:40:50 +05:30
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
Eric Erhardt
0cfc54c377 First time experience populating the NuGet cache with 1.1 packages. 2017-01-06 17:45:34 -06: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
Harsh Jain
effee47d38 Version update for test platform. 2017-01-07 01:04:00 +05:30
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
Eric Erhardt
a211353e52 Fix TestSdkDeb by installing the AdditionalSharedHost installer. 2017-01-05 22:25:58 -06:00
Eric Erhardt
80919ddc12 Work around MSBuild issue with using %AD at the beginning of an Include. 2017-01-05 21:05:06 -06:00
Livar
80f2ef6533 Merge pull request #5181 from harshjain2/clirunsettings
Added ability to pass runsettings as commandline parameters after --
2017-01-05 16:22:08 -08:00
Eric Erhardt
48ec34e7b4 DEB support for installing shared fx 1.1. 2017-01-05 18:06:16 -06:00
Eric Erhardt
6106cae066 PKG support for installing shared fx 1.1. 2017-01-05 17:30:08 -06:00
Piotr Puszkiewicz
d14698f1f6 Bump MSBuild Version to 15.1.0-preview-000503-01 (#5199)
* Bump MSBuild Version to 15.1.0-preview-000503-01

* tool_csc->tool_roslyn

* pull some properties up to dir.props

* Move Roslyn to "Roslyn" subdirectory

* Fix relative paths in RunCsc.*

* Add removal of csc & vbc from deps.json

* Revert roslyn to 2.0.0-rc3-61212-03

* netcoreapp -> 1.0.3
2017-01-05 14:56:11 -08:00
Eric Erhardt
63669d5129 MSI support for installing shared fx 1.1. 2017-01-05 15:39:35 -06:00
Eric Erhardt
e5e11c19c2 Download and extract shared framework 1.1. This initial change gets 1.1 into the archive installers. Still need to bring it into the native installers as well. 2017-01-05 15:03:56 -06:00
Livar Cunha
72cd3d7c43 Pinning stage0 to latest and reverting build scripts to use stage0 for now. 2017-01-05 12:40:23 -08:00
Livar Cunha
3b69588db2 Picking up the latest SDK and adding back some named parameters to MigrateBuildOptionsRule for clarity.
Updating the tool project to use BuiltProjectOutputGroupOutput instead of content because of SDK issue https://github.com/dotnet/sdk/issues/588
2017-01-05 12:31:49 -08:00
Livar Cunha
3a4e23e373 Updating the SDK to an SDK that includes globing for source and resources implicitly. 2017-01-05 12:31:48 -08:00
Harsh Jain
f04930658d Merge branch 'rel/1.0.0' into clirunsettings 2017-01-06 01:15:49 +05:30