Commit graph

7699 commits

Author SHA1 Message Date
Livar Cunha
36892f28e9 Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM. 2017-10-06 11:08:02 -07:00
Nick Guerrera
796b4a06e7 Use temporary path for fake deps.json in test 2017-10-06 10:53:21 -07:00
dotnet-bot
6066e1ce3a Update CoreSetup to preview1-25806-01 2017-10-06 17:40:13 +00:00
Nick Guerrera
46ef8581a6 Merge pull request #7768 from nguerrera/path-append
Append to existing PATH in build env scripts/cli-test-env.bat
2017-10-05 18:01:58 -07:00
Livar
bae42f23c5 Merge pull request #7766 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25805-02 (master)
2017-10-05 16:42:34 -07:00
Livar
c950f92462 Update the SDK to 2.1.0-preview1-20171006-4 2017-10-05 16:39:32 -07:00
Jan Vorlicek
68fed641a1 Update CentOS 6 Dockerfile
Replace the base image with an updated one that now contains
clang 3.9 with PGO support and also the new git. So we don't
need to build it here anymore.
2017-10-06 01:37:33 +02:00
dotnet-bot
ad0ecd6914 Update CoreSetup to preview1-25805-02 2017-10-05 21:39:21 +00:00
Nick Guerrera
241bf475f0 Append to existing PATH in build env scripts/cli-test-env.bat
We were clobbering the path down to just one directory
2017-10-05 13:27:49 -07:00
Nick Guerrera
d0013186c7 Merge pull request #7751 from nguerrera/fixup-roslyn-loc
Update satellite assemblies and fix up roslyn satellite handling
2017-10-05 11:25:07 -07:00
Livar Cunha
e6c0c6ef15 Merge branch 'release/2.0.0' into merge_release200_into_release200MSRC
* release/2.0.0: (49 commits)
  Keeping the branding for release/2.0.0 at 2.0.3.
  Moving the runtime version to 2.0.0 for the SDK.
  MSBuild 15.5.113
  Update F# compiler
  Remove CscToolPath
  Improve the way Roslyn is pulled in
  MSBuild 15.5.110
  Update XLFs
  Update the string that is displayed when there's a typo in the profile name or it's not a valid JSON object
  Updating the branding to 15.5.
  Updating the CLI branding to 2.0.3
  Fixing merges.
  Removing the trailing '\r' for bash shells; commit hash.
  Removing the trailing '\r' for bash shells. https://github.com/dotnet/cli/issues/7392
  Changing ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile to expect 2.0.0 as the runtime version.
  Fixing 'librarypath'
  Update the installation scripts in release/2.0.0 branch.
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  ...
2017-10-05 10:27:38 -07:00
Livar
7f4095eeb1 Merge pull request #7762 from livarcocc/merge_release155_into_release200
Merge release/15.5 into release/2.0.0
2017-10-05 10:25:58 -07:00
Livar
692ca89882 Merge pull request #7754 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25804-01 (master)
2017-10-05 10:12:21 -07:00
Livar Cunha
ed953f6d05 Keeping the branding for release/2.0.0 at 2.0.3. 2017-10-04 18:07:10 -07:00
Livar
19e631ea47 Merge pull request #7757 from livarcocc/revert_runtime_to_200
Moving the runtime version to 2.0.0 for the SDK.
2017-10-04 13:25:40 -07:00
David Ben Knoble
8d671caef4 Remove unnecessary quotes per review 2017-10-04 15:33:45 -04:00
dotnet-bot
58c76ff1ce Update CoreSetup to preview1-25804-01 2017-10-04 17:28:30 +00:00
David Ben Knoble
0ee5b46cd7 Remove copy logging; unquote override_switch
The copy logging is no longer needed (cf. 191ffece6)

The quotes around the override switch caused cp to see "" as a target
2017-10-04 12:06:29 -04:00
David Ben Knoble
191ffece69 Log copying during dotnet-install.sh
There's an issue copying some of the files and I can't identify it
specifically. I need to see it in the test output.

I will revert this when I have identified and fixed the problem.
2017-10-04 09:42:12 -04:00
Livar Cunha
e24b53dda7 Moving the runtime version to 2.0.0 for the SDK. 2017-10-03 16:46:15 -07:00
David Ben Knoble
b8e179501f Quote variable expansions in dotnet-install.sh
Fix #5281 to prevent paths with spaces from causing problems due to word
splitting.
2017-10-03 19:24:02 -04:00
Nick Guerrera
cd68283018 Update cli-deps-satellites 2017-10-03 16:01:08 -07:00
Nick Guerrera
4a2d3fae16 Fix up roslyn satellite assembly handling to match new insertion mechanism
1. Publish satellites with a separate project and merge the resulting .deps.json
   into (csc|vbc).deps.json

2. Move the build tasks satellites to the correct location next to main assembly
   (one level higher than bincore\)
2017-10-03 16:00:56 -07:00
Livar
e2c89f3d61 Merge pull request #7753 from dotnet/livarcocc-patch-2
Update the known issues location
2017-10-03 14:42:27 -07:00
John Beisner
d498ab677e Merge pull request #7747 from johnbeisner/RedHat6Stuff
Missing value for 'PublishNativeInstallers' and Updating the README
2017-10-03 10:17:32 -07:00
Livar
c43b2b8267 Update the known issues location 2017-10-03 10:13:22 -07:00
Livar
2d3b8da0b0 Merge pull request #7748 from AndyGerlicher/MSBuild.15.5.113
MSBuild 15.5.113
2017-10-03 09:55:17 -07:00
John Beisner
659c672411 Missing value for 'PublishNativeInstallers' 2017-10-03 08:58:52 -07:00
Livar
72f42f9463 Merge pull request #7735 from brettfo/update-fsharp-15.5
Update FSharp compiler
2017-10-02 20:43:11 -07:00
Andy Gerlicher
cd9260f467 MSBuild 15.5.113 2017-10-02 19:03:59 -07:00
John Beisner
ddae35eadf Updating the README 2017-10-02 16:47:17 -07:00
William Lee
85ce73dfb5 Use Newtonsoft.Json for UploadToLinuxPackageRepository (#7745) 2017-10-02 16:39:37 -07:00
Brett V. Forsgren
6ccff28e0a Update F# compiler 2017-10-02 16:37:31 -07:00
Livar
3cebbb4ea3 Merge pull request #7746 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25802-02 (master)
2017-10-02 16:37:24 -07:00
Livar
d797f2de2c Merge pull request #7311 from khyperia/improve_roslyn
Improve the way Roslyn is pulled in
2017-10-02 16:33:56 -07:00
dotnet-bot
ee76f981b4 Update CoreSetup to preview1-25802-02 2017-10-02 22:30:41 +00:00
Livar
32c0f44129 Merge branch 'release/15.5' into improve_roslyn 2017-10-02 15:13:34 -07:00
Livar
72b3867943 Merge pull request #7743 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25802-01 (master)
2017-10-02 13:50:12 -07:00
Livar
fa9ae3de02 Merge pull request #7731 from AndyGerlicher/MSBuild.15.5.110
MSBuild 15.5.110
2017-10-02 13:49:55 -07:00
Ashley Hauck
97b027b232 Remove CscToolPath 2017-10-02 12:26:52 -07:00
dotnet-bot
1bf3b681e2 Update CoreSetup to preview1-25802-01 2017-10-02 17:27:49 +00:00
John Beisner
22cd85daf6 Merge pull request #7732 from johnbeisner/RedHat6Stuff
The publish logic needs to change with the addition of RedHat 6.
2017-10-02 10:14:18 -07:00
Eric Erhardt
a6dceb17b5 Merge pull request #7738 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25801-01 (master)
2017-10-02 10:09:38 -05:00
khyperia
04c8a68539 Improve the way Roslyn is pulled in 2017-10-02 08:01:44 -07:00
dotnet-bot
49794cf29b Update CoreSetup to preview1-25801-01 2017-10-01 18:39:18 +00:00
John Beisner
1dd0e45c91 Merge pull request #7730 from johnbeisner/UploadToLinuxPackageRepositoryError
Fixing a publish break in master: "UploadToLinuxPackageRepository"
2017-09-29 17:11:08 -07:00
Livar
0444016d45 Merge pull request #7733 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25729-02 (master)
2017-09-29 15:57:05 -07:00
Livar
f4f0aeae63 Merge pull request #7729 from mlorbetske/dev/mlorbe/UpdateErrorStringForMisspelledOrCorruptedLaunchProfile
Update the string that is displayed when there's a typo in the profile name or it's not a valid JSON object
2017-09-29 15:35:31 -07:00
dotnet-bot
ce08614bf7 Update CoreSetup to preview1-25729-02 2017-09-29 21:49:46 +00:00
John Beisner
3b7f13e179 The publish logic needs to change with the addition of RedHat 6.
"IsLinuxDistroSpecific" was used only to decide whether to publish zip/tar files - changes to "PublishArchives" & includes RedHat 6 per 'DerivedHostMachineInfo.props'

"IslinuxPortable" was used to decide, among other things, whether to publish the installer packages - changes to "PublishNativeInstallers" & excludes RedHat 6 per 'DerivedHostMachineInfo.props'
2017-09-29 13:58:08 -07:00