Commit graph

9072 commits

Author SHA1 Message Date
jbeisner
6c793107b6 Unblocking Jenkins... 2018-07-03 19:48:04 +00:00
jbeisner
9ead28cb25 "Microsoft.DotNet.MSBuildSdkResolver" and "Microsoft.DotNet.Cli.Utils" are delivered/published via 'CLI' not 'Core-SDK'; use 'dotnet-install.sh' from 'dot.net' 2018-07-03 18:43:33 +00:00
jbeisner
c42e66d6ed The target "ComposeSdk" needs "Prepare" to have been run - make it dependent so we can run the single "ComposeSdk" target. 2018-07-03 15:38:10 +00:00
Livar
9c13bb4ea0
Merge pull request #15 from dotnet/fix_all_linux_distros
Replacing Compile with ComposeSdk in the build/BuildAndPublishAllLinuxDistrosNativeInstallers.targets
2018-06-28 16:48:08 -07:00
Livar
1fc378dad3
Merge pull request #17 from dotnet/add_download_table
Adding a download table to core-sdk README.
2018-06-28 16:09:20 -07:00
Livar Cunha
dea40e45b2 Adding knowledge of linux-musl rid to core-sdk. It was lost in the merge from the CLI. 2018-06-28 15:54:22 -07:00
Livar Cunha
46e0313f04 Add a work around to downloading an updated install script while it gets updated on the website. 2018-06-28 15:24:47 -07:00
Livar Cunha
2034aab2b9 Adding a download table to core-sdk README. 2018-06-28 15:19:51 -07:00
Livar Cunha
3408f785e8 Adding curl to a couple of linux distros that were missing it. 2018-06-27 22:40:58 -07:00
Livar Cunha
4d93f3a7a8 Replacing Compile with ComposeSdk in the build/BuildAndPublishAllLinuxDistrosNativeInstallers.targets. Compile no longer exists and ComposeSdk is the new target that puts the Sdk together. 2018-06-27 16:05:37 -07:00
Livar
47776ad0c6
Merge pull request #14 from dotnet/merge_master_cli
Merge master of the cli into dev/repo-refactoring
2018-06-26 15:21:59 -07:00
Parallels
4d9b015f8f Fixing a merge issue and crossgen issues. 2018-06-26 14:44:55 -07:00
Livar Cunha
e2b679c4bb Merge branch 'master' of /Users/livarcocc/Documents/git/cli into merge_master_cli
* 'master' of /Users/livarcocc/Documents/git/cli: (1063 commits)
  Updating signing project to use new intermediate directory (int).
  Update runtimeconfig.json doc for 2.1 (#9382)
  Shortening the path to the intermediate folder by renaming it to int.
  fix typo (#9364)
  Updating asp.net to 2.2.0 as well.
  Updating the build and tests to work with the 2.2.0 runtime.
  Simplified combining dictionaries in Telemetry
  Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362)
  Fix extraction of folders (#9335)
  Update Sha256Hasher.cs
  Fix relative path tool path (#9330)
  Insert updated SDK from 2.1.4xx branch
  MSBuild 15.8.60
  Fix crash when user home directory cannot be determined.
  Make `CliFolderPathCalculator` a static class.
  Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true.
  Add retry when Directory.Move (#9313)
  Override new SdkResult public properties
  Add reference to Microsoft.Build.NuGetSdkResolver
  Disable crossgen for MSBuild inline-task refs
  ...
2018-06-25 22:38:01 -07:00
Livar
0e346aa5ba
Merge pull request #9360 from SimonCropp/patch-1
Update Sha256Hasher.cs
2018-06-05 22:46:18 -07:00
Livar
670dcedba2
Merge pull request #9381 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-06-05 22:45:53 -07:00
Livar
49f4a0bf5b
Merge pull request #9417 from livarcocc/fix_signing
Updating signing project to use new intermediate directory (int).
2018-06-04 15:02:27 -07:00
William Li
48ee97fb42
Merge pull request #9371 from svick/patch-4
Simplified combining dictionaries in Telemetry
2018-06-04 13:43:13 -07:00
Livar Cunha
625b9d4963 Updating signing project to use new intermediate directory (int). 2018-06-04 13:06:02 -07:00
Steve Harter
f45acc5e10
Update runtimeconfig.json doc for 2.1 (#9382) 2018-06-04 14:46:13 -05:00
Livar
447bd91100
Merge branch 'master' into merges/release/2.1.4xx-to-master 2018-06-04 11:38:31 -07:00
Livar
77a0f99c94
Merge pull request #9392 from livarcocc/enable_2_2_runtime
Updating the build and tests to work with the 2.2.0 runtime.
2018-06-04 11:05:52 -07:00
Livar Cunha
78c7f5af5b Shortening the path to the intermediate folder by renaming it to int. 2018-06-01 15:46:22 -07:00
Maira Wenzel
7ce47778b4 fix typo (#9364)
* fix typo

* add loc files
2018-06-01 14:16:41 -07:00
Livar Cunha
33c3a26880 Updating asp.net to 2.2.0 as well. 2018-06-01 13:31:03 -07:00
Livar Cunha
2f0f270a73 Updating the build and tests to work with the 2.2.0 runtime. 2018-05-31 19:14:24 -07:00
Livar
80d542b8f4
Merge pull request #9332 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-31 10:22:00 -07:00
Petr Onderka
139fc86dbc
Simplified combining dictionaries in Telemetry 2018-05-31 01:03:27 +02:00
John Beisner
dae5099ffb
Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362) 2018-05-29 13:46:07 -07:00
Sebastian Karasek
c01e7c3e42 Fix extraction of folders (#9335) 2018-05-29 11:02:26 -07:00
Simon Cropp
ca8fefb1be
Update Sha256Hasher.cs 2018-05-29 23:00:23 +10:00
Livar
de407deff0
Merge pull request #9347 from dsplaisted/update-sdk
Insert updated SDK from 2.1.4xx branch
2018-05-24 21:21:41 -07:00
William Li
983612b95b
Fix relative path tool path (#9330)
Pass full path to Path.GetRelativePath
2018-05-24 18:15:23 -07:00
Daniel Plaisted
d17b088022 Insert updated SDK from 2.1.4xx branch 2018-05-24 16:29:10 -07:00
Livar
35a2c5d032
Merge pull request #9344 from rainersigwald/msbuild-15.8.74
MSBuild 15.8.60
2018-05-24 11:02:23 -07:00
Rainer Sigwald
48eab9c572 MSBuild 15.8.60 2018-05-24 12:05:52 -05:00
John Beisner
468116f9f2
Merge pull request #9331 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-24 09:30:28 -07:00
Peter Huene
81308488a7
Merge pull request #9327 from peterhuene/fix-home
Fix crash when user home directory cannot be determined.
2018-05-23 14:45:32 -07:00
Peter Huene
b1f8eb1d8d
Fix crash when user home directory cannot be determined.
Currently, dotnet will crash with an `ArgumentNullException` if `USERPROFILE`
(Windows) or `HOME` (macOS and Linux) is not set in the environment.  This
is because there is a missing null check after retrieving the environment
variable's value.  Additionally, if either variable is set to an empty string,
a `.dotnet` directory is created in the current directory where dotnet is being
run.

This commit fixes this by printing a graceful error informing the user the home
directory could not be determined and to set `DOTNET_CLI_HOME` to the directory
to use.  This variable will be respected before `USERPROFILE` or `HOME`. It is
likely that CI environments where `HOME` is not set can use `DOTNET_CLI_HOME`
to specify a local temporary location; by using this variable rather than
setting `HOME`, it is guaranteed to only affect dotnet.

It was discussed that we should perhaps fallback to some temporary location if
the home directory could not be determined, but NuGet currently requires `HOME`
to be set to work.  Because of this, it was decided that we should just handle
this case gracefully and provide a way for users to override the home directory
without relying on `USERPROFILE`/`HOME` entirely.

Closes #8053.
2018-05-22 17:34:39 -07:00
Peter Huene
3e962bc131
Make CliFolderPathCalculator a static class.
The `CliFolderPathCalculator` class implements no interface and has no instance
fields.

This commit therefore makes it a static class.
2018-05-22 17:34:39 -07:00
Livar
6f6f28dac6
Merge pull request #9323 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-22 13:28:50 -07:00
Livar
8f8770be8a
Merge pull request #9265 from livarcocc/first_run_native_intallers
Always execute cache expansion on native installers.
2018-05-22 13:17:55 -07:00
Livar
adab45bf0c
Merge pull request #9329 from livarcocc/fix_branding_drop_suffix
Don't add the ReleaseSuffix to the branding on the CLI
2018-05-22 13:15:31 -07:00
Livar Cunha
6dfa6af7d6 Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true. 2018-05-22 10:45:11 -07:00
William Li
ca8a109d1c
Add retry when Directory.Move (#9313) 2018-05-22 09:55:10 -07:00
John Beisner
6411d7b2e7
Merge pull request #9322 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-22 07:16:33 -07:00
Livar
21080db0eb
Merge pull request #9279 from AndyGerlicher/MSBuild-15.8.61
MSBuild 15.8.61
2018-05-21 17:44:18 -07:00
Andy Gerlicher
9967a1d81a Override new SdkResult public properties 2018-05-21 15:29:38 -07:00
Andy Gerlicher
5e794a064c Add reference to Microsoft.Build.NuGetSdkResolver 2018-05-21 15:29:37 -07:00
Andy Gerlicher
7bed83fc98 Disable crossgen for MSBuild inline-task refs 2018-05-21 15:29:37 -07:00
Andy Gerlicher
6bed6e1943 MSBuild 15.8.61 2018-05-21 15:29:37 -07:00