Commit graph

681 commits

Author SHA1 Message Date
Christopher Costa
acc3d012ac Testing version 25305-19 2017-05-05 13:29:38 -07:00
William Li
7154330432 Address code review
Use one version for cli migrate packages

as well as Nuget component packages

Rename CreateWithWith...
2017-05-02 13:26:46 -07:00
William Li
2ab4ac5454 Adjust for using cli-migrate package reference
Remove ProjectJsonMigration and its test from solution file

Change dependecy by package reference instead of project 2 project

Construct the sln and dotnet new with wrapper that is used in migrate
package

Add reference to Nuget ProjectModel etc since CrossGen need it and it
cannot automatically get the reference
2017-05-01 10:50:37 -07:00
Matt Ellis
b6a2c01cf6 Remove dependency on run.exe
Our build scripts were pulling down all of buildtools and run.exe in
service of "clean.{cmd|sh}". While having consisent commands across
the repos is a good thing to strive for, we are pulling down a bunch
of additional stuff we don't need for simple commands that have well
known analogs (e.g. git clean).

If we had been all in on run.exe, this might have made sense, but we
aren't, so it feels like something we should clean up.

By doing this, we can stop downloading bootstrap from github when we
build (super dangerous anyway because changes in buildtools could have
broken us).

In addition, I changed the way we install dotnet to just invoke the
script in `scripts/obtain/` instead of downloading a version from
GitHub. This makes local development of changes to obtain easier and
removes yet another place we had to download a script.
2017-04-29 14:00:02 -07:00
Livar
2cc5612fec Merge pull request #6287 from dotnet/dev-ragrawal-updatenuget2484
update nuget version to 4.3.0-preview1-2500
2017-04-27 12:59:19 -07:00
Livar
b4214c8b18 Merge branch 'master' into dev-ragrawal-updatenuget2484 2017-04-26 16:35:18 -07:00
dotnet-bot
221e32d28c Update CoreSetup to preview2-002093 2017-04-26 23:24:46 +00:00
Livar Cunha
2e164f8f0a Merge branch 'release/2.0.0' into merge_release_200_again
* release/2.0.0:
  Adding a work around for a test failure.
  Generating the Microsoft.NETCoreSdk.BundledVersions.props file in the CLI folder, so that it can be picked up by the SDK.
2017-04-26 14:09:45 -07:00
Livar Cunha
51ce43cf5d Reverting some files that we don't want integrated back to master. 2017-04-26 11:45:26 -07:00
Livar Cunha
e6354edb81 Merge branch 'release/2.0.0' into merge_release_200
* release/2.0.0:
  Temporarily remove tools
  Update to latest ASP.NET package versions & fix feed entry in NuGet.config
  Fixing crossgen to use the correct RID for OSX and Win now that only portable packages are being produced.
  Update core-setup channel to release/2.0.0
  Update CoreSetup to preview1-002088
  Update templates and add 'baseline' feature
  Remove accidental debug line
  Localization for CommonOptions
  Merge pull request #6380 from livarcocc/update_channel
  Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
2017-04-26 10:59:47 -07:00
Livar
6c8fa9dddd Merge branch 'master' into dev-ragrawal-updatenuget2484 2017-04-26 10:38:02 -07:00
Livar
8207b865f4 Merge branch 'release/2.0.0' into move_bundled_versions 2017-04-26 10:30:34 -07:00
Livar Cunha
339bfe0168 Adding a work around for a test failure. 2017-04-26 10:30:04 -07:00
Eric Erhardt
bb1c3df558 Merge remote-tracking branch 'upstream/release/2.0.0' into release/2.0.0-UpdateDependencies 2017-04-26 11:45:24 -05:00
Mike Lorbetske
80c23d53d3 Temporarily remove tools 2017-04-25 21:52:43 -07:00
Mike Lorbetske
dde0cee897 Update to latest ASP.NET package versions & fix feed entry in NuGet.config 2017-04-25 21:31:12 -07:00
Eric Erhardt
126c42050d Fixing crossgen to use the correct RID for OSX and Win now that only portable packages are being produced. 2017-04-25 23:00:20 -05:00
Eric Erhardt
de139a3bf8 Update core-setup channel to release/2.0.0 2017-04-25 22:29:50 -05:00
dotnet-bot
fd112f45a0 Update CoreSetup to preview1-002088 2017-04-26 03:16:03 +00:00
Zhi Li
ab0a68d32f update nuget version to 4.3.0-preview1-2500 2017-04-25 16:48:12 -07:00
Mike Lorbetske
9014b1b163 Update templates and add 'baseline' feature 2017-04-25 16:25:27 -07:00
Livar Cunha
7ebd363ca2 Generating the Microsoft.NETCoreSdk.BundledVersions.props file in the CLI folder, so that it can be picked up by the SDK. 2017-04-25 13:10:15 -07:00
dotnet-bot
195d11ceb5 Update CoreSetup to preview2-002081 2017-04-25 19:30:57 +00:00
Eric Erhardt
65662ea385 Merge branch 'master' into master-UpdateDependencies 2017-04-24 10:19:27 -05:00
Livar
63832070dd Merge pull request #6388 from livarcocc/bring_over_template_changes
Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
2017-04-22 13:18:16 -07:00
Livar
6464e0152d Merge pull request #6380 from livarcocc/update_channel
Updating the release/2.0.0 channel and the README to point to this new channel
2017-04-22 12:03:22 -07:00
Livar Cunha
d78823c019 Revert "Merge pull request #6380 from livarcocc/update_channel"
This reverts commit 14cede7909, reversing
changes made to 8f2fcef544.
2017-04-22 12:01:57 -07:00
Livar
4f6fbc4a7f Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
Update templates and engine, pin ASP.NET package versions, add web item templates
2017-04-22 12:00:08 -07:00
Livar
4992296d12 Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
Update templates and engine, pin ASP.NET package versions, add web item templates
2017-04-22 11:52:54 -07:00
Livar
14cede7909 Merge pull request #6380 from livarcocc/update_channel
Updating the release/2.0.0 channel and the README to point to this new channel
2017-04-22 11:52:13 -07:00
Mike Lorbetske
8227a6edac Update templates, remove browserlink from checked packages 2017-04-21 22:10:57 -07:00
Mike Lorbetske
38e467e990 Fix build warning for web projects, add gracefull fallback for framework reference add attempts 2017-04-21 20:51:52 -07:00
Mike Lorbetske
2cbbea5b48 Put 195 engine version back 2017-04-21 20:51:52 -07:00
Mike Lorbetske
90cdb07cbc Try slightly earlier engine version 2017-04-21 20:51:52 -07:00
Mike Lorbetske
4dd1be1978 Respond to review feedback 2017-04-21 20:51:52 -07:00
Mike Lorbetske
9ea9cbc8a6 Update templates and engine, pin ASP.NET package versions, add web item templates 2017-04-21 20:51:52 -07:00
Eric Erhardt
88b99847e0 Fixing crossgen to use the correct RID for OSX and Win now that only portable packages are being produced. 2017-04-21 21:54:35 -05:00
dotnet-bot
31dbdfa197 Update CoreSetup to preview2-002066 2017-04-22 02:06:37 +00:00
Livar Cunha
41a2e46ca0 Updating the release/2.0.0 channel and the README to point to this new channel. 2017-04-21 16:11:14 -07:00
Livar Cunha
6df9bc3055 Moving master branch to preview2 branding. 2017-04-21 14:26:45 -07:00
Eric Erhardt
12eff39992 Update Core-setup to 2.0.0-preview1-002061-00 2017-04-21 12:47:56 -05:00
Livar
63efcc5a0f Merge pull request #6366 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-002057 (master)
2017-04-21 09:54:18 -07:00
dotnet-bot
bb60a32737 Update CoreSetup to preview1-002057 2017-04-21 00:13:14 +00:00
Livar Cunha
31eeaa4744 Enable HighEntropyVA in our builds by default. 2017-04-20 14:01:34 -07:00
Livar Cunha
61a934229e Updating SDK version to 2.0.0-alpha-20170420-1 2017-04-19 17:12:07 -07:00
Livar
12dbed613a Merge pull request #6319 from smadala/tp-insert-0414
TestPlatform 15.1.0-preview-20170414-04 insertion
2017-04-19 10:08:46 -07:00
Eric Erhardt
33b83ee1c7 Merge pull request #6343 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-002028 (master)
2017-04-19 09:15:26 -05:00
Rama krishnan Raghupathy
a150055dfb Merge pull request #6342 from ramarag/updateDependency
Updating Microsoft.Extensions.DependencyModel to 002022
2017-04-18 22:16:14 -07:00
Livar
3f82e11a91 Merge branch 'master' into tp-insert-0414 2017-04-18 21:06:17 -07:00
Livar
3269475562 Merge pull request #6341 from dotnet/websdkversionupdate0417
Updating the websdk version to 1.0.0-rel-20170413-451
2017-04-18 21:05:31 -07:00