Commit graph

9786 commits

Author SHA1 Message Date
Nick Guerrera
87268c57ad Use fixed RTM build of PlatformAbstractions from build project
(cherry picked from commit 0a1be24e2f)
2017-09-27 13:26:47 -07:00
Nick Guerrera
43a3c54a09 Port #7352 (Update solution to reflect current state) from master to 2.0.x 2017-09-27 13:21:58 -07:00
David Kean
92f727c736 Move projects to virtual foldes
Move tool_fsc to src
Move dotnet-help.Tests to test

(cherry picked from commit f00adb1057)
2017-09-27 13:19:01 -07:00
David Kean
88ceffec30 Add MSBuildSdkResolver to the sln
Fixes: https://github.com/dotnet/cli/issues/7351.
(cherry picked from commit 369b893152)
2017-09-27 13:19:01 -07:00
David Kean
8d8fb5112c Remove non-existent projects
(cherry picked from commit 3c81474cac)
2017-09-27 13:19:01 -07:00
David Kean
14e4ff50f5 Let VS update solution with current state
(cherry picked from commit 4c8c137a6c)
2017-09-27 13:19:01 -07:00
Andy Gerlicher
79077b5ea2 MSBuild 15.4.8 2017-09-27 09:52:43 -07:00
Daniel Plaisted
1c0eb38c83 Merge pull request #7712 from dsplaisted/insert-sdk
Insert SDK 2.0.2-vspre-20170927-1
2017-09-26 20:03:43 -07:00
Livar
1bcee43995 Merge pull request #7705 from livarcocc/merge_release20_vs
Merge release/2.0-vs into release/2.0.0
2017-09-26 19:02:05 -07:00
Daniel Plaisted
0d233cd9d0 Insert SDK 2.0.2-vspre-20170927-1 2017-09-26 18:13:03 -07:00
Livar Cunha
84c56a8a92 Updating the CLI branding to 2.0.3 2017-09-26 15:39:02 -07:00
Livar Cunha
2669306319 Fixing merges. 2017-09-26 15:33:17 -07:00
Jan Vorlicek
28a1f7e9d6 Merge pull request #7711 from janvorli/add-rhel6-dockerfile
Add Dockerfile for RHEL 6 builds
2017-09-26 23:20:31 +02:00
Jan Vorlicek
277789bf16 Add Dockerfile for RHEL 6 builds
This change enables building CLI for RHEL 6 in docker container.
2017-09-26 11:50:50 -07:00
John Beisner
d26d6b4014 Merge pull request #7703 from johnbeisner/InstallScriptsPort
Update the installation scripts in release/2.0.0 branch.
2017-09-26 09:33:55 -07:00
John Beisner
38b88c99f1 Removing the trailing '\r' for bash shells; commit hash. 2017-09-26 08:32:11 -07:00
Harsh Jain
fa876f5b90 Updated version of TestPlatform to 15.5.0-preview-20170923-02 2017-09-26 19:19:16 +05:30
John Beisner
572d2367df Removing the trailing '\r' for bash shells.
https://github.com/dotnet/cli/issues/7392
2017-09-25 19:41:58 -07:00
Livar
ff1beebfdb Merge pull request #7679 from rogersachan/patch-1
Update Mac OS X to macOS to reflect name on site (README.md only)
2017-09-25 16:30:44 -07:00
Livar Cunha
442011ea64 Changing ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile to expect 2.0.0 as the runtime version. 2017-09-25 09:49:46 -07:00
Livar Cunha
c7fa050645 Merge branch 'release/2.0-vs' into merge_release20_vs
* release/2.0-vs: (22 commits)
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  Updating the websdk version to 2.0.0-rel-20170908-653
  Insert NuGet Build 4.4.0-preview3-4475 into cli
  Remove out of support ubuntu1610
  Removing extra line feeds...
  Turning on the NuPkg publishing from Win x86
  The enumeration of the nupkg packages depends on that the creation of packages has already occurred.
  Trivial change to start a VSO build
  Push the 'VS.Redist.Common.Net.Core.SDK*.nupkg' packages to blob storage.
  Remove EOL openSuSE 42.1
  Trigger build
  Trigger build
  Sign additional files
  Update CLI_NETSDK_Version SDK to 2.0.2-vspre-20170825-1
  Dummy commit to trigger CI due to 20170824.1 publish nuget time out 20170824.1
  Insert NuGet Build 4.4.0-preview1-4434 into cli
  Update to SDK build which includes NuGet 4.4.0-preview1-4365
  Insert NuGet Build 4.4.0-preview1-4365 into cli
  ...
2017-09-22 15:36:27 -07:00
John Beisner
44326a0a64 Fixing 'librarypath' 2017-09-22 14:16:08 -07:00
Jan Vorlicek
2c2a9f0a6e Merge pull request #7702 from janvorli/rhel6-support-fixes-2
Fix issues caused by adding RHEL6 support
2017-09-22 21:06:39 +02:00
John Beisner
0722cce590 Update the installation scripts in release/2.0.0 branch. 2017-09-22 11:25:15 -07:00
Jan Vorlicek
41ae8a0f3c Fix issues caused by adding RHEL6 support
There were two issues. One was that additional arguments that are not
recognized by the build.sh script were incorrectly passed as a single
argument in single-quotes to msbuild.
The second issue was that when LD_LIBRARY_PATH was not set, the
dotnet-install.sh script was failing due to its using of the "set -u"
option that prevents usage of unset variables.
2017-09-22 17:51:30 +00:00
Daniel Plaisted
8cbabea8f3 Merge pull request #7697 from dsplaisted/insert-sdk
Insert SDK 2.0.2-vspre-20170921-5
2017-09-21 18:46:48 -07:00
Jan Vorlicek
5aff58b8b9 Merge pull request #7694 from janvorli/rhel6-support-fixes
Fix issue and minor cleanup of the RHEL 6 support
2017-09-22 00:40:51 +02:00
Daniel Plaisted
ce885f76c4 Insert SDK 2.0.2-vspre-20170921-5 2017-09-21 15:21:29 -07:00
Livar
fb90ac7298 Merge pull request #7693 from AndyGerlicher/MSBuild.15.5.90
MSBuild 15.5.90
2017-09-21 13:53:29 -07:00
Jan Vorlicek
6630c8292b Fix issue and minor cleanup of the RHEL 6 support
This change fixes extraction of the unprocessed args and also implements
few minor changes that @eerhardt has asked for, like renaming the new argument
and changing usage of HostRid to Rid in build/BuildDefaults.props.
2017-09-21 20:38:34 +00:00
Andy Gerlicher
9e06395ed7 MSBuild 15.5.90 2017-09-21 12:45:07 -07:00
Jan Vorlicek
2af264d70b Merge pull request #7688 from janvorli/enable-rhel6
Enable RHEL 6 support
2017-09-21 20:32:09 +02:00
Jan Vorlicek
90e217831b Enable RHEL 6 support
This change enables RHEL 6 support. It also adds a new command line option to the
run-build.sh script that enables passing in a folder containing a bootstrap CLI.
This helps in bringup of new target platforms.
2017-09-21 15:20:55 +00:00
Eric Erhardt
f3932fab2d Merge pull request #7606 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25719-04 (master)
2017-09-20 07:30:01 -05:00
dotnet-bot
7287790200 Update CoreSetup to preview1-25719-04 2017-09-20 00:14:50 +00:00
Roger
653ed5493f Reflect naming of Mac on dot.net site. 2017-09-19 18:59:00 -04:00
John Beisner
2956c548b9 Merge pull request #7676 from johnbeisner/master
Skip DefaultProxy resolution code if an exception is thrown
2017-09-19 14:26:22 -07:00
John Beisner
a5c2cf4faa Logic error...fixing. 2017-09-18 13:05:43 -07:00
John Beisner
5c620978c1 https://github.com/dotnet/cli/issues/6747 2017-09-18 11:54:20 -07:00
William Li
1a9bad1fd1 Revert "pin stage0 due to build failure"
This reverts commit 4fe4c4d28a.
2017-09-18 11:19:07 -07:00
William Li
f0ae4db663 Checkin corefx editorconfig 2017-09-18 10:23:06 -07:00
Livar
d624a96a1f Merge pull request #7663 from livarcocc/move_testframework_from_output
Removing Microsoft.DotNet.TestFramework from the product code
2017-09-15 15:31:31 -07:00
William Li
ad56d3759e fix missing windows package
Put back the dependency of package. Duplicate a publish step with package and use that one in all linux distro specific
2017-09-15 15:28:57 -07:00
Daniel Plaisted
091d82e9f8 Merge pull request #7668 from dsplaisted/insert-sdk
Insert SDK 2.0.2-vspre-20170915-1
2017-09-15 15:09:56 -07:00
Daniel Plaisted
ba1c8eda24 Insert SDK 2.0.2-vspre-20170915-1 2017-09-15 14:14:25 -07:00
Livar
b70923512c Merge pull request #7647 from dotnet/nuget-insertbuild4475
Insert NuGet Build 4.4.0-preview3-4475 into cli
2017-09-15 13:56:21 -07:00
William Li
4fe4c4d28a pin stage0 due to build failure 2017-09-15 13:28:01 -07:00
Livar
baa49ef4c1 Merge pull request #7653 from AndyGerlicher/MSBuild.15.4.7
MSBuild 15.4.7
2017-09-15 10:04:37 -07:00
Livar
81454108d8 Merge pull request #7652 from dotnet/vramak/websdk_9_14_Update
Updating the websdk version to 2.0.0-rel-20170908-653
2017-09-15 10:03:14 -07:00
Livar
0a482954ae Merge pull request #7645 from livarcocc/remove_archiver_code
Removing Microsoft.DotNet.Archive from the CLI
2017-09-15 09:58:03 -07:00