Commit graph

8687 commits

Author SHA1 Message Date
Yanchen Wu
5b5d69c95d Adds Microsoft.Docker.Sdk to CLI
This change is to add Sdk.props and Sdk.targets of Microsoft.Docker.Sdk
into CLI. This unblocks the scenario where a VS solution contains a few
.NET Core projects as well as a docker-compose.dcproj project and people
want to build the solution from command line with .NET Core CLI. With
the Sdk.props and Sdk.targets being present in CLI, building
docker-compose.dcproj becomes no-op so it won't block building the other
.NET Core projects.
2018-01-17 11:12:19 -08:00
John Beisner
be6f56425f
Merge pull request #8412 from johnbeisner/OrchestratedBuild
Orchestrated build publishing; CLI:master
2018-01-17 10:22:43 -08:00
Nick Guerrera
840acee074
Defend against forthcoming breaking change in SDK (#8409) 2018-01-17 10:13:41 -08:00
jbeisner
ab97a076f2 Putting back 'docker' and 'stage0' parameters in the usage. 2018-01-17 17:56:34 +00:00
Livar
2efe8f8360
Merge pull request #8410 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26116-04 (master)
2018-01-17 09:23:43 -08:00
jbeisner
4f2ac3eae5 Setting 'IsNotOrchestratedPublish' explictly to false; conditional clean-up. 2018-01-17 17:17:08 +00:00
jbeisner
60b1795d90 Adding publish URL in a comment. 2018-01-17 16:46:30 +00:00
jbeisner
cd4b06c30d Adding ManifestArtifactData; changes per code review... 2018-01-17 16:37:33 +00:00
Livar
0140420d06
Merge pull request #8413 from livarcocc/update_msbuild
MSBuild 15.6.54
2018-01-16 22:05:34 -08:00
Andy Gerlicher
b1b70292ce MSBuild 15.6.54 2018-01-16 21:31:49 -08:00
Livar
1a3460575e
Merge pull request #8407 from wli3/update-sdk-version-011618
Updating the Microsoft.NET.SDK version to 2.1.0-preview1-62516-03
2018-01-16 21:26:26 -08:00
jbeisner
0c754d92fa Formatting only... 2018-01-17 02:58:01 +00:00
jbeisner
d04e8c84e1 Don't use 'ParseBlobUrl'; use the original values. 2018-01-17 02:52:59 +00:00
jbeisner
3386db7bed Create a manifest if performing an orchestrated build publish. 2018-01-17 02:36:50 +00:00
Peter Huene
ba248c25cb Merged PR 101715: Merge release/2.1 to release/2.1-MSRC 2018-01-17 01:11:07 +00:00
Peter Huene
933cb1f669
Merge branch 'release/2.1' into pehuene/merge-release-2.1-to-msrc
* release/2.1: (36 commits)
  Adding aspnet dev feed.
  Fixing redist to use the new way to consume roslyn. I merged it wrong before.
  Fix tool_roslyn_satellite by making it use the new dependency version properties.
  Update wix version (#8313)
  Update the support package on the CLI to fix binding redirects on 4.7.1
  Use explict and non-preview versions for the build DLL
  Fixing a typo...
  The 15.4.8 version of the Microsoft.Build.Runtime nuget package is currupt; use the replacement 15.4.8.1
  Fix dotnet-install to check the right path for no-op installs when --shared-runtime is specified
  Fixed a typo...
  Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
  Even more package dependency re-names...
  Third pass clean-up of package names.
  Second pass clean-up of package names; resequencing download.
  Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
  The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
  Fixed another typo...
  Fixed typo...
  The first pass will need the extra args [same as run-build.ps1].
  Dependency Uptake: download and import a package version props file.
  ...
2018-01-16 17:04:17 -08:00
Peter Huene
5b696e4831
Update help description for install command.
Replace the word `add` with the word `install` to match the verb of the
tool.
2018-01-16 15:01:57 -08:00
dotnet-bot
fef6d9bcd5 Update CoreSetup to preview1-26116-04 2018-01-16 22:56:00 +00:00
William Li
6d73caa31a Updating the Microsoft.NET.SDK version to 2.1.0-preview1-62516-03 2018-01-16 14:28:17 -08:00
jbeisner
1acb93f15a Merge remote-tracking branch 'upstream/master' into OrchestratedBuild 2018-01-16 22:19:58 +00:00
jbeisner
9dc9f4c87b Use "PushToBlobFeed" instead of "UploadToAzure" 2018-01-16 22:16:56 +00:00
Peter Huene
2f26f10ed2
Fix missing package id error message for install tool command.
This commit fixes the error message that is displayed when the `install
tool` command is not given a package id to install.  Previously, only
`packageId` was output, which was confusing.

Fixes #8381.
2018-01-16 13:57:26 -08:00
Peter Huene
2c03ff9bcf
Refactor install command localizable strings.
This commit moves the `tool` subcommand strings into its own resource
file, rather than putting them into the `install` command's resource
file.

This better follows the patterns of other commands, such as `add`, and
enables subcommands to isolate their string resources from one another.

As part of this commit, the `install tool` string resources were cleaned
up.
2018-01-16 12:59:34 -08:00
Livar
9881b8d745
Merge pull request #8396 from AndyGerlicher/MSBuild15.6.54
MSBuild 15.6.54
2018-01-16 12:13:57 -08:00
Livar
596f489414
Merge pull request #8390 from dotnet/livarcocc-patch-1
Updates the TestPlatform to 15.6.0-preview-20180109-01
2018-01-16 12:12:30 -08:00
Livar
25de7693fe
Merge pull request #8389 from livarcocc/update_branding_for_2_1_100
Updating the branding of the CLI to 2.1.100
2018-01-16 11:54:23 -08:00
Peter Huene
f6695f7e6b
Fix build environment script.
Script was missing a `/` for setting the `PATH` environment variable correctly.
2018-01-16 11:48:26 -08:00
John Beisner
501e11d928
Merge pull request #8406 from johnbeisner/OrchestratedBuild
Ensure that the 'SetAzureProps' target runs before 'BlobStoragePartialRelativePath' is used.
2018-01-16 11:35:44 -08:00
jbeisner
552129db0d Fixed a typo... 2018-01-16 18:25:18 +00:00
jbeisner
95a5bc7e16 Ensure that the 'SetAzureProps' target runs before 'BlobStoragePartialRelativePath' is used. 2018-01-16 18:15:28 +00:00
Livar
290c66829b
Merge pull request #8392 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26115-03 (master)
2018-01-16 10:09:57 -08:00
Livar Cunha
e7625eba69 Merge branch 'update_branding_for_2_1_100' of github.com:livarcocc/cli-1 into update_branding_for_2_1_100
* 'update_branding_for_2_1_100' of github.com:livarcocc/cli-1:
  MSBuild 15.6.44
2018-01-16 09:38:22 -08:00
Livar Cunha
8caa7b9f0d Updating the channel to release/2.1.1xx. We can manually update release/2.0 if necessary, but LTS is always updated every time we release. 2018-01-16 09:37:59 -08:00
John Beisner
188e0d7190
Merge pull request #8404 from johnbeisner/OrchestratedBuild
Add "SDK" at the end of the orchestrated build blob drop point.
2018-01-16 09:36:53 -08:00
jbeisner
e7bd33b200 Add "SDK" at the end of the orchestrated build blob drop point. 2018-01-16 16:09:00 +00:00
dotnet-bot
a1a1c2b762 Update CoreSetup to preview1-26115-03 2018-01-15 18:51:25 +00:00
Andy Gerlicher
af8ea2ffb7 MSBuild 15.6.54 2018-01-13 23:22:34 -08:00
William Lee
e8f7ddd01b
Localization for tools work so far (#8251) 2018-01-13 09:40:48 -08:00
Matt Mitchell
2cfc65a0c4
Merge pull request #8388 from johnbeisner/OrchestratedBuildPublishing
Enabling the publish of CLI assets to 'orchestrated' blob storage.
2018-01-12 19:33:28 -08:00
jbeisner
429f2fde07 Found a version of 'microsoft.dotnet.build.tasks.feed' that supports both parsing of the URL and the currrent Nupkg upload method: 2.1.0-prerelease-02312-02 2018-01-13 02:46:14 +00:00
William Lee
a3aa6dc1c2
Merge pull request #8379 from peterhuene/install-tool-source-option
Add source option to install tool command.
2018-01-12 17:46:08 -08:00
Livar
1c380b3114
Merge branch 'release/2.1.1xx' into update_branding_for_2_1_100 2018-01-12 16:41:41 -08:00
Peter Huene
fe89456f2a
Add source option to install tool command.
This commit adds the `--source` option to the `install tool` command.  This
option is equivalent to the option of the same name for the `restore` command.

The option is forwarded to the underlying restore operation.

Fixes #8226.
2018-01-12 16:08:13 -08:00
jbeisner
6d9130dc61 Simplify the 'index.json' removal. 2018-01-13 00:07:01 +00:00
Livar
a4afbc9f1f
Updates the TestPlatform to 15.6.0-preview-20180109-01 2018-01-12 15:47:42 -08:00
Livar
da40320229
Merge pull request #8346 from rainersigwald/msbuild-15.6.44
MSBuild 15.6.44
2018-01-12 15:45:35 -08:00
Livar
d79c40e294
Merge pull request #8383 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26112-04 (master)
2018-01-12 15:44:41 -08:00
Livar Cunha
d6d3b451d6 Updating the branding of the CLI to 2.1.100 2018-01-12 15:37:54 -08:00
jbeisner
aa458eca82 Strip off "index.json" before appending "assets" 2018-01-12 23:34:38 +00:00
jbeisner
cbcd4fd3c3 Fixing a typo... 2018-01-12 22:46:25 +00:00