Commit graph

2169 commits

Author SHA1 Message Date
Daniel Plaisted
53c37522fc
Merge branch 'master' into Updates 2018-07-11 17:53:57 -07:00
Daniel Plaisted
cf4a81a583 Temporarily disable creating Debian packages
https://github.com/dotnet/core-sdk/issues/27
2018-07-11 17:27:46 -07:00
Daniel Plaisted
73ec338775 Remove -upgrade suffix from deb and rpm installer filenames 2018-07-11 14:37:39 -07:00
jbeisner
f2039c9139 Update 'CLI' and 'Toolset' versions; update 'Toolset' blob location; update build tools package references. 2018-07-11 18:46:24 +00:00
Daniel Plaisted
b44a2bb723 Insert ASP.NET Core 3.0 2018-07-11 02:13:06 -07:00
Daniel Plaisted
905d4d442d Address code review feedback 2018-07-09 14:12:11 -07:00
Daniel Plaisted
c431d58b72 Set maximum .NET Core version to 3.0 in BundledVersions.props 2018-07-09 13:46:04 -07:00
Daniel Plaisted
ec9914424c Refactor tests to use CliTargetFramework variable instead of hard-coding target framework 2018-07-09 13:46:04 -07:00
Daniel Plaisted
c6925a5388 Add dotnet-buildtools feed for Microsoft.DotNet.VersionTools 2018-07-09 13:46:03 -07:00
Daniel Plaisted
3e2a16d5db Insert .NET Core 3.0 runtime builds 2018-07-09 13:46:03 -07:00
jbeisner
692987b919 Disabling publishing for all 'MSBuildExtensions' artifacts. 2018-07-03 22:58:40 +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 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
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
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
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 Cunha
625b9d4963 Updating signing project to use new intermediate directory (int). 2018-06-04 13:06:02 -07: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
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
John Beisner
dae5099ffb
Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362) 2018-05-29 13:46:07 -07:00
Daniel Plaisted
d17b088022 Insert updated SDK from 2.1.4xx branch 2018-05-24 16:29:10 -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
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
Andy Gerlicher
5e794a064c Add reference to Microsoft.Build.NuGetSdkResolver 2018-05-21 15:29:37 -07:00
Andy Gerlicher
6bed6e1943 MSBuild 15.8.61 2018-05-21 15:29:37 -07:00
John Beisner
6f185432d4
Merge pull request #9317 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-21 09:24:20 -07:00
Livar
7adbeb3928
Merge pull request #9259 from dotnet/nuget.client.release-4.8.0.5196-1-1
Insert NuGet Build 4.8.0-preview1.5196 into cli
2018-05-19 08:59:59 -07:00
John Beisner
da34f7eaab
Merge pull request #9312 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-17 20:25:26 -07:00
Livar
c921ea92b8
Merge pull request #9309 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-17 15:17:50 -07:00
Livar
a45bba7eb9
Merge pull request #9308 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-17 15:17:08 -07:00
Livar
e338e46e10
Merge pull request #9306 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-17 13:41:23 -07:00
Livar
d57435bfcd
Merge pull request #9305 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-17 11:53:21 -07:00
Livar
8829b9690e
Maintain MSBuild version at 15.7.179 2018-05-17 11:51:36 -07:00
Livar
ded465c666
Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies 2018-05-17 10:37:00 -07:00
Livar
f23377b19f
Merge pull request #9299 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-17 10:35:31 -07:00
Livar
484a1f6743
Merge pull request #9298 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-05-17 10:34:38 -07:00
Livar Cunha
491ec16307 Add the NoWarn option when producing Cli.Utils for full framework as well. 2018-05-16 15:33:19 -07:00
John Beisner
508f902ed0
Merge pull request #9296 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-16 14:52:29 -07:00
John Beisner
d7892663ea
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-05-16 14:50:13 -07:00
Livar Cunha
2531e3a136 Add NoWarn for the stable package depending on non-stable package when packaging Cli.Utils for tests. 2018-05-16 12:44:23 -07:00
Jared Parsons
4d3b649efc
Fix version number 2018-05-16 11:04:16 -07:00
John Beisner
b78d591c97
Merge pull request #9284 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-16 09:04:53 -07:00
John Beisner
baeb21728d
Merge pull request #9285 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-16 09:00:04 -07:00