Commit graph

6843 commits

Author SHA1 Message Date
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
Livar
5f52644061 Merge pull request #7031 from mlorbetske/dev/mlorbe/UpdateToSetupCrossgen225Coherence25975
Update engine and templates, update to SetupCrossgen 224 - Coherence 25975
2017-06-29 14:35:33 -07:00
Livar
0b5d666bf0 Merge pull request #7029 from rainersigwald/msbuild-402-for-2
MSBuild 15.3.402 for 2.0
2017-06-29 14:35:17 -07:00
Livar
5b6ab874b4 Merge pull request #7028 from rainersigwald/msbuild-402-for-1.1
MSBuild 15.3.402 for 1.1
2017-06-29 14:34:58 -07:00
Nick Guerrera
59bbc5783f Fix test failures in local build due to environment variable filter 2017-06-29 13:45:01 -07:00
Kevin Ransom
7af5450716 feedback 2017-06-29 12:25:22 -07:00
Livar
57c0d17e7a Merge branch 'release/2.0.0' into dev/mlorbe/UpdateToSetupCrossgen225Coherence25975 2017-06-29 10:28:37 -07:00
Kevin Ransom
508ad89a44 Enable VB for dotnet cli 1.1 2017-06-29 10:27:06 -07:00
Livar
825dc4277d Merge branch 'release/2.0.0' into msbuild-402-for-2 2017-06-29 10:25:34 -07:00
Livar
68175e54d8 Merge pull request #7018 from dotnet-bot/release/2.0.0-UpdateDependencies
Update CoreSetup to preview3-25428-01 (release/2.0.0)
2017-06-29 10:23:15 -07:00
Mike Lorbetske
d8087d35d4 Update engine and templates, update to SetupCrossgen 224 - Coherence 25975 2017-06-29 10:16:02 -07:00
Livar Cunha
a396550ed0 Adding a installer for Downlevel (Dev14) to install .NET Framework props and targets to enable it to reference netstandard 2.0. 2017-06-29 09:55:26 -07:00
Rainer Sigwald
2746e5cc2d MSBuild 15.3.402 2017-06-29 09:33:54 -07:00
Rainer Sigwald
b6931ab0c5 MSBuild 15.3.402 2017-06-29 09:32:52 -07:00
Kevin Ransom
db7ebc9100 Add F# to dotnet cli 1..1.0 2017-06-28 21:18:39 -07:00
Nick Guerrera
3a3825dfa4 Merge pull request #7012 from nguerrera/command-line-loc
Localize parser validation messages
2017-06-28 10:39:46 -07:00
dotnet-bot
9c913674c9 Update CoreSetup to preview3-25428-01 2017-06-28 17:35:53 +00:00
Arun Mahapatra
29db52a40d Update test platform to 15.3.0-preview-20170628-02 2017-06-28 15:59:19 +05:30
Livar
81dd304f72 Merge pull request #7011 from dotnet/livarcocc-patch-1
Update Microsoft.NET.SDK to 2.0.0-preview3-20170622-1
2017-06-27 16:20:16 -07:00
Nick Guerrera
9b77dc50f1 Redirect parser to localized validation messages 2017-06-27 15:49:00 -07:00
Nick Guerrera
0353374f10 Merge pull request #7006 from nguerrera/command-line-parser
Use latest command line parser
2017-06-27 15:46:43 -07:00
Livar
7c928a9f18 Update Microsoft.NET.SDK to 2.0.0-preview3-20170622-1 2017-06-27 14:27:20 -07:00
Nick Guerrera
a115df9543 Adjust help message test expectations to match new parser 2017-06-27 10:03:54 -07:00
Nick Guerrera
34d0900a34 Use latest command line parser 2017-06-27 10:03:53 -07:00
Livar
91ae618d6c Merge pull request #6983 from livarcocc/pay_for_play_loc
Pay for play loc
2017-06-27 08:48:39 -07:00
Livar
017e3e7c91 Merge branch 'release/2.0.0' into pay_for_play_loc 2017-06-26 21:41:52 -07:00
Livar
6fc24fca4f Updating the runtime to pick up the satellite assembly host fix. 2017-06-26 17:00:35 -07:00
Livar
262c9d9a12 Merge pull request #7005 from livarcocc/merge_release200_preview2_into_release_200
Merge release200 preview2 into release 200
2017-06-26 16:31:05 -07:00
Livar Cunha
8dc9ff1ad6 Fixing some merges from release/2.0.0-preview2. 2017-06-26 15:40:26 -07:00
Livar Cunha
2f75cc2517 Merge remote-tracking branch 'dotnet/release/2.0.0-preview2' into merge_release200_preview2_into_release_200
* dotnet/release/2.0.0-preview2:
  Update SPA templates version to 1.0.0-preview-000321
  Fix dotnet/sdk#1364
  Add rhel and Debian download link
  Remove failed workaround for Microsoft.Composition warning
  Update templates to add missing BrowserLink package
  Update to SetupCrossgen 215 - Coherence 25794
  Update templates to suppress the warning for Microsoft.Composition and AssetTargetFallback
  Add explicit dependency for pakcage smoke test
  Update templates to remove the package NETStandard.Library.NETFramework
  Update F# compiler to latest
  Update to SetupCrossgen 213 - Coherence 25769
  Pinning to the dotnet-install to version '2.0.0-preview2-006470'
  Updating branch/channel information.
  Update SpaTemplateVersion to 1.0.0-preview-000312
  Update to SetupCrossgen 210 - Coherence 25756
  Absorb F# and B2C template fixes
  The links at blob storage will change from "release/2.0.0" to "release/2.0.0-preview2"
  Changing two links from explicit to relative.
  Updating the links in the README; fixing the installation script.
  Update to SetupCrossgen 201 - Coherence 25722
2017-06-26 15:33:56 -07:00
Livar
7af62e423e Merge pull request #6999 from livarcocc/first_run_sentinel_when_no_dotnet_folder_exists
Create the Dotnet User Profile folder when running the first experience
2017-06-26 12:53:02 -07:00
Nick Guerrera
b8a2ce4e8c Merge pull request #6997 from nguerrera/loc-compilers
Add F# and Roslyn satellites
2017-06-26 11:10:49 -07:00
Livar
c7959b942c Merge pull request #6990 from dotnet/merges/rel/1.1.0-to-release/2.0.0-20170623-070039
Merge rel/1.1.0 to release/2.0.0
2017-06-24 23:01:06 -07:00