Commit graph

6901 commits

Author SHA1 Message Date
Livar
b69aaceb65 Merge branch 'master' into merges/release/2.0.0-to-master-20170705-070028 2017-07-05 10:53:23 -07:00
Livar Cunha
ba5e56c3fe Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170705-070026
* dotnet/rel/1.1.0:
  Copy Paste error
  chmod .sh files
  Update the SDK to 1.1.0-alpha-20170630-2
  Update Template Engine and templates for 1.x
2017-07-05 10:51:30 -07:00
Livar Cunha
2b15cb43cf Adding a Minimum VS Defined SDK version to the resolver. If it set to 1.0.4 if the minimum SDK version file is not found. 2017-07-05 09:54:46 -07:00
jbeisner
fc936a73ee Merge pull request #7047 from johnbeisner/CoherentBadgePublish
Publishing a 'coherent' badge.
2017-07-05 08:34:53 -07:00
Mike Lorbetske
a6a7c11916 Update to SetupCrossgen 249 - Coherence 26071 2017-07-03 22:37:02 -07:00
Livar
9e5a995ba9 Merge branch 'rel/1.1.0' into zhi/updateRel1.1.0NuGetTo4.3.0-preview4-4258 2017-07-03 19:02:52 -07:00
Livar
7d605497d9 Merge branch 'release/2.0.0' into CoherentBadgePublish 2017-07-03 17:58:25 -07:00
Livar
370771c076 Merge branch 'rel/1.1.0' into rel/1.1.0 2017-07-03 17:55:57 -07:00
Livar
19a90c79ce Merge pull request #7066 from dotnet/livarcocc-patch-1
Update runtime to 2.0.0-preview3-25502-01
2017-07-03 17:54:31 -07:00
Livar
dc17ca9675 Update runtime to 2.0.0-preview3-25502-01 2017-07-03 16:47:57 -07:00
John Beisner
af660e5a76 Conserving code-lines. 2017-07-03 14:34:04 -07:00
Livar
ae39d652e4 Merge pull request #7061 from dotnet/livarcocc-patch-1
Update SDK to 2.0.0-preview3-20170703-2
2017-07-03 12:20:28 -07:00
Livar
658f1d736c Merge pull request #7059 from dotnet/merges/rel/1.1.0-to-release/2.0.0-20170703-070029
Merge rel/1.1.0 to release/2.0.0
2017-07-03 12:11:06 -07:00
Livar
fe49b772ce Merge pull request #7060 from dotnet/merges/release/2.0.0-to-master-20170703-070031
Merge release/2.0.0 to master
2017-07-03 12:10:12 -07:00
Livar
24c9e5604f Merge pull request #7046 from KevinRansom/mlorbetske-dev/mlorbe/UpdateTemplateEngineFor1x
Mlorbetske dev/mlorbe/update template engine for1x
2017-07-03 12:09:31 -07:00
Kevin Ransom
6363063076 Update compiler 2017-07-03 11:04:01 -07:00
Livar
c7d9dba0d2 Update SDK to 2.0.0-preview3-20170703-2 2017-07-03 10:12:04 -07:00
Livar Cunha
2b148aec90 Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170703-070029
* dotnet/rel/1.1.0:
  feedback
  Enable VB for dotnet cli 1.1
  MSBuild 15.3.402
  Add F# to dotnet cli 1..1.0
2017-07-03 09:49:51 -07:00
Livar
f5c677c37a Merge branch 'master' into merges/release/2.0.0-to-master-20170703-070031 2017-07-03 09:39:32 -07:00
Livar
0578b62490 Merge pull request #7057 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen229Coherence26027
Update to SetupCrossgen 229 - Coherence 26027
2017-07-03 09:33:16 -07:00
Livar
7411667400 Merge pull request #7055 from wli3/unpinning-SDK-version
Revert "Pinning the SDK version to: "2.0.0-preview3-006628""
2017-07-03 09:32:29 -07:00
Kevin Ransom
c819188efb Update F# to latest 2017-07-01 13:07:02 -07:00
Mike Lorbetske
557dd8d376 Update to SetupCrossgen 229 - Coherence 26027 2017-07-01 11:26:48 -07:00
William Li
dd137f6b42 Revert "Pinning the SDK version to: "2.0.0-preview3-006628""
This reverts commit 0dd17b6330.
2017-06-30 22:42:00 -07:00
William Li
bf496a9b12 Update bages to aligan with linux buid definition 2017-06-30 19:33:37 -07:00
John Beisner
0dd17b6330 Pinning the SDK version to: "2.0.0-preview3-006628" 2017-06-30 17:42:42 -07:00
Livar
277741b55c Merge pull request #7049 from billwert/fixinstallblock
Installation block does not work
2017-06-30 15:55:19 -07:00
Livar
caddc68e6f Merge pull request #7017 from codito/patch-1
Update test platform to 15.3.0-preview-20170628-02
2017-06-30 15:55:06 -07:00
Livar
20023717b5 Merge pull request #7048 from livarcocc/fix_help_message
Fixing help text for version, info and diagnostics and also removing …
2017-06-30 15:54:40 -07:00
Zhi Li
207a7e4307 update nuget to 4.3.0-preview4-4258 2017-06-30 14:25:46 -07:00
William Lee
f0f66df034 Add indication for first time experience (#7044) 2017-06-30 14:13:29 -07:00
Bill Wert
e9be9fda07 Installation block does not work
The product should block installing below 10.12 but does not. Fixing
typo.
2017-06-30 13:59:03 -07:00
Livar
40932e8314 Merge pull request #7045 from dotnet/zhi/updateNuGetTo4.3.0-preview4-4258
update to NuGet 4.3.0-preview4-4258
2017-06-30 13:58:26 -07:00
Livar Cunha
3ec572f824 Fixing help text for version, info and diagnostics and also removing runtime options that are only available for dotnet exec. 2017-06-30 13:19:52 -07:00
John Beisner
502c082846 Publishing a 'coherent' badge. 2017-06-30 12:17:20 -07:00
Livar
4e91869c1c Merge pull request #7038 from livarcocc/fix_tools_from_fallback_folder
Changing to use FileStream constructor with FileAccess.Read.
2017-06-30 12:06:13 -07:00
Kevin Ransom
3d9bcf4490 Copy Paste error 2017-06-30 12:03:04 -07:00
Kevin Ransom
47ef990e66 chmod .sh files 2017-06-30 11:58:16 -07:00
Zhi Li
759ac544d4 update to NuGet 4.3.0-preview4-4258 2017-06-30 11:11:04 -07:00
Livar
4454c4e191 Update the SDK to 1.1.0-alpha-20170630-2
This SDK contains the F# targets.
2017-06-30 10:15:07 -07:00
Livar
f64b772f7f Merge branch 'release/2.0.0' into patch-1 2017-06-30 10:12:51 -07:00
Livar
1d52b1e75a Merge pull request #7040 from dotnet/UpdateWebSdk_6_29
Updating the WebSdk version to 2.0.0-rel-20170629-588
2017-06-30 10:11:56 -07:00
Vijay Ramakrishnan
fa852d3059 Updating the WebSdk version to 2.0.0-rel-20170629-588 2017-06-29 21:27:22 -07:00
Livar Cunha
859058ba7b Changing to use File.OpenRead. This is required because when access readonly files, you must pass FileAccess.Read, otherwise, we get a UnauthorizedFileAccess exception. 2017-06-29 20:24:51 -07:00
Livar
425850697b Merge pull request #7019 from livarcocc/framework_downlevel_msi
Adding a installer for Downlevel (Dev14) to install .NET Framework pr…
2017-06-29 20:07:13 -07:00
Mike Lorbetske
0dd4f123d2 Update Template Engine and templates for 1.x 2017-06-29 19:09:54 -07:00
Livar Cunha
c920b3c747 Fixing a missing variable in the downlevel installer. 2017-06-29 18:30:21 -07:00
Livar
13e84f7cbd Merge pull request #7033 from KevinRansom/rel/1.1.0
Add F# to dotnet cli 1.1.0
2017-06-29 18:25:59 -07:00
Livar
7d25028834 Merge pull request #7032 from KevinRansom/vb
Enable VB for dotnet cli 1.1
2017-06-29 18:25:46 -07:00
Nick Guerrera
cad156947d Merge pull request #7036 from nguerrera/fix-local-tests
Fix test failures in local build due to environment variable filter
2017-06-29 16:47:20 -07:00