mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6114 commits 41 branches 190 tags 95 MiB
Commit graph

6114 commits

This branch
This branch
All branches
Author SHA1 Message Date
Livar
25bcbb65d3 Merge branch 'master' into fix_vso_build 2017-05-10 17:17:00 -07:00
Livar
b6b45e570f Merge pull request #6559 from livarcocc/merge_release_200_into_master 
Merge release/2.0.0 into master
 2017-05-10 17:13:36 -07:00
Livar Cunha
dd01dbf4ce Bringing down MicroBuild.Core props and targets separately from build_tools. 2017-05-10 15:58:46 -07:00
William Lee
ae63db7bde Merge pull request #6568 from wli3/remove-migrate-tests 
Including migrate test assets. They are in cli-migrate repo now.

Keep only one of them to make sure migrate is correctly inserted

Build get 10 minutes faster!
 2017-05-10 14:43:19 -07:00
Livar
5bae544721 Merge pull request #6565 from dotnet/update_debian_references 
Updating the debian references in the landing page
 2017-05-10 14:39:22 -07:00
Livar Cunha
477f0f42d0 Fixes a few inconsistencies in the display for the dotnet restore -help command. 
Fixing tests based on the new strings.
 2017-05-10 13:25:59 -07:00
William Li
f9f8c7feba Remove the test migrate assets 
which is used only in migrate tests
 2017-05-10 12:49:50 -07:00
Livar
f40e85283d Merge branch 'master' into merge_release_200_into_master 2017-05-10 12:49:25 -07:00
William Li
9392561fd5 Remove migrate tests 
They are in cli-migrate repo now.

Keep only one of them to make sure migrate is correctly inserted
 2017-05-10 12:48:53 -07:00
Livar
23aae1bf0b Updating the debian references in the landing page 
Updating the debian references in the landing page from Debian 8.2 to Debian 8.
 2017-05-10 09:19:19 -07:00
James Lanng
497d048b1c Support corporate proxy servers 2017-05-10 10:44:40 +01:00
Eric Erhardt
3037fdd688 Merge pull request #6493 from chcosta/version-25303-01 
Update Core-setup to 2.0.0-preview2-25303-01
 2017-05-09 23:20:22 -05:00
Livar Cunha
b51920d212 Merge branch 'release/2.0.0' into merge_release_200_into_master 
* release/2.0.0:
  Fixing tests to look for 1.1.2.
  Updating the backwards compatible runtime to 1.1.2.
  Updating the SDK to one that carries updated versions of the implicit 1.0 versions.
  Update to SetupCrossgen 92 - Coherence 24937
  Update to SetupCrossgen 86 - Coherence 24920
  Fix date on package version
  Update templates to 222
  Update SetupCrossgen to build 82
  Update SetupCrossgen to build 80
  Update SetupCrossgen to build 77
 2017-05-09 20:51:32 -07:00
Eric Erhardt
4670323694 Remove unused property. 2017-05-09 21:51:32 -05:00
Livar
bbf235e333 Merge pull request #6548 from livarcocc/remove_newtonsoft_from_test_asset 
Remove newtonsoft.json dependency from AutoAddDesktopReferencesDuringMigrate
 2017-05-09 14:23:09 -07:00
Livar
976c997855 Merge pull request #6546 from livarcocc/fix_publish_help_output 
Changing the order of the help text for dotnet publish
 2017-05-09 14:22:52 -07:00
Eric Erhardt
3aba7b8a55 Update Core-Setup to 2.0.0-preview2-25309-07 2017-05-09 15:58:03 -05:00
Livar
414cab8a0b Merge pull request #6552 from livarcocc/update_sdk_to_get_msrc_implicit_versions 
Updating the SDK to one that carries updated versions of the implicit 1.0 versions.
 2017-05-09 12:56:33 -07:00
Livar Cunha
c25fdd833e Fixing tests to look for 1.1.2. 2017-05-09 12:12:47 -07:00
Livar Cunha
359a9d2f36 Updating the backwards compatible runtime to 1.1.2. 2017-05-09 11:40:24 -07:00
Livar Cunha
af453e3a6b Updating the SDK to one that carries updated versions of the implicit 1.0 versions. 2017-05-09 11:09:38 -07:00
Mike Lorbetske
5436217013 Update to SetupCrossgen 92 - Coherence 24937 2017-05-08 17:54:10 -07:00
Livar Cunha
eb7b759fec Remove newtonsoft.json dependency from TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json 2017-05-08 16:22:03 -07:00
Eric Erhardt
6df51ceb3b Fix CLI's reference to core-setup's installer files to use $(RID) instead of a moniker. 2017-05-08 17:39:14 -05:00
Livar
444d75c0cd Merge pull request #6526 from mikkelbu/fail-gracefully-when-multiple-project-exist 
Fail gracefully when multiple projects exist
 2017-05-08 15:33:22 -07:00
Livar Cunha
ad76052cb4 Changing the order of the help text for dotnet publish so that it matches the order from dotnet build as well. 2017-05-08 15:30:31 -07:00
Livar
760bdf8f75 Merge pull request #6530 from mikkelbu/gracefully-report-invalid-projects 
Gracefully report invalid project when added via sln-add
 2017-05-08 11:39:17 -07:00
Livar
97da2a03b5 Merge pull request #6539 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen86 
Update to SetupCrossgen 86 - Coherence 24920
 2017-05-06 21:27:41 -07:00
Mike Lorbetske
b3204bedb8 Update to SetupCrossgen 86 - Coherence 24920 2017-05-06 19:21:17 -07:00
Christopher Costa
cc2cbd4d7f Undo back dependencymodel / platformabstractions change 2017-05-06 13:16:56 -07:00
Christopher Costa
f9cebfda09 update versions to 25306-06 2017-05-06 12:18:35 -07:00
Christopher Costa
49636ea608 Merge branch 'master' of https://github.com/dotnet/cli into version-25305-19 2017-05-06 12:17:03 -07:00
Livar
6ecc1fc6c3 Merge pull request #6531 from nguerrera/merge-release-2.0 
Merge release/2.0.0 to master
 2017-05-05 21:54:33 -07:00
Livar
4c5978dad9 Merge pull request #6532 from mlorbetske/dev/mlorbe/UpdateTemplatesTo222 
Update templates to 222
 2017-05-05 21:43:36 -07:00
Livar
1337bb8f83 Merge pull request #6529 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen77 
Update SetupCrossgen to build 77
 2017-05-05 21:22:53 -07:00
Mike Lorbetske
546c29361c Fix date on package version 2017-05-05 20:28:03 -07:00
Mike Lorbetske
a44e52abb3 Update templates to 222 2017-05-05 20:09:27 -07:00
Mike Lorbetske
f0e8a4f21b Update SetupCrossgen to build 82 2017-05-05 18:34:47 -07:00
Mike Lorbetske
f403c6a836 Update SetupCrossgen to build 80 2017-05-05 17:43:18 -07:00
Mike Lorbetske
835fe1dba0 Update SetupCrossgen to build 77 2017-05-05 17:29:29 -07:00
Nick Guerrera
fe14c72226 Update dotnet/sdk version 2017-05-05 17:08:57 -07:00
Mikkel Nylander Bundgaard
7a824fe737 Gracefully report invalid project in sln-add 
Fixes #5900
 2017-05-06 02:08:00 +02:00
Christopher Costa
9e9f17a3e2 Reset platformabstraction and dependencymodel versions while issue is 
being investigated
 2017-05-05 17:05:35 -07:00
Nick Guerrera
ee16de3f7b Fix bad merges 2017-05-05 16:38:10 -07:00
Nick Guerrera
071789b33f Merge branch 'release/2.0.0' into merge-release-2.0 2017-05-05 16:21:15 -07:00
Livar
75af8b479e Merge pull request #6525 from dsplaisted/tool-tfm-fallback 
Fall back to tools restored for .NET Core 1.x if they haven't been restored for .NET Core 2.0
 2017-05-05 15:08:12 -07:00
Eric Erhardt
01c5f59bdb Fix test to use case-insensitive search on DependencyContext library name. 2017-05-05 16:41:46 -05:00
Daniel Plaisted
10dd67baa8 Clean up tool restore framework fallback logic so there aren't multiple call sites to GetToolLockFile 2017-05-05 14:23:33 -07:00
Mikkel Nylander Bundgaard
de10e0dd54 Fail gracefully when multiple projects exist 
Fixes #6267
 2017-05-05 23:07:46 +02:00
Christopher Costa
acc3d012ac Testing version 25305-19 2017-05-05 13:29:38 -07:00