Commit graph

8920 commits

Author SHA1 Message Date
Livar
363ef36b70
Merge pull request #8429 from dotnet/nuget-insertbuild4825
Insert NuGet Build 4.6.0-rtm-4825 into cli
2018-01-19 21:25:12 -08:00
William Lee
02a98d4e63
[tools] Integrate NuGet (#8414)
* Integrate NuGet ask

* Update NuGet version. Rely on NuGet to filter TFM. And use asset.json to find entrypoint

* Update XML file to per TFM

* Add extra property to the fake project according to nuget

* Treat nuget fallback folder as offline cache for tool

* Require -g to install global tool

* Copy test asset during test project build

* Address code review on LockFileMatchChecker

* Get NETCorePlatformsImplicitPackageVersion from PackageDefinitions

* Edit and add missing loc

* Change LockFileMatchChecker to local function

* Adding comment

* Add to content instead of copy

* Download platform package instead

* disable SDK side implicit NuGetFallbackFolder

* merge loc

* Revert extra line

* use a prerelease platforms version that supports alpine
2018-01-19 17:15:34 -08:00
William Lee
c7d44beca7
Merge pull request #8433 from natemcmaster/simplify-win-shim
Simplify the tool_launcher to build for just one version of .NET Framework
2018-01-19 16:19:51 -08:00
William Lee
e317925977
Merge pull request #8435 from dotnet/nuget-insertbuild4846
Insert NuGet Build 4.7.0-preview1-4846 into cli
2018-01-19 15:25:28 -08:00
Livar
e224249f2c
Merge pull request #8432 from natemcmaster/aspnet-28124
Update to aspnetcore 2.1.0-preview1-28124
2018-01-19 15:21:08 -08:00
Nate McMaster
c8bae2ffda Simplify the tool_launcher to build for just one version of .NET Framework 2018-01-19 15:19:33 -08:00
NuGet Team Bot
47758a4ec2 Insert NuGet Build 4.7.0-preview1-4846 into cli 2018-01-19 14:32:57 -08:00
Nate McMaster
67f98be680 Update to aspnetcore 2.1.0-preview1-28124 2018-01-19 13:17:54 -08:00
John Beisner
e3a19395fb
Merge pull request #8333 from natemcmaster/dotnet-install
Update dotnet-install scripts to support installing the ASP.NET Core runtime
2018-01-19 12:01:16 -08:00
William Lee
8e58b54c05
Merge pull request #8430 from dotnet/nuget-insertbuild4839
Insert NuGet Build 4.7.0-preview1-4839 into cli
2018-01-18 20:52:16 -08:00
NuGet Team Bot
b0cfb18501 Insert NuGet Build 4.7.0-preview1-4839 into cli 2018-01-18 17:47:41 -08:00
NuGet Team Bot
d0cdc9c266 Insert NuGet Build 4.6.0-rtm-4825 into cli 2018-01-18 16:13:18 -08:00
Nate McMaster
fa47e95e90
Generate a .NET Framework shim app in dotnet-install-tools on Windows instead of a batch script (#8384)
Implement a simple launcher tool for running new processes on Windows

- This application takes two parameters via the .exe.config configuration file

 - entryPoint: required - the file path to the new process being launched
 - runner: optional - the executable or interpretter used to launch the
entryPoint

- Update dotnet-install-tool to generate an exe instead of a batch script file
2018-01-18 14:54:10 -08:00
Tanner Gooding
cda1fdffa5
Merge pull request #8427 from tannergooding/release/2.1
Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
2018-01-18 14:46:23 -08:00
Peter Huene
ab104fa26d Merged PR 102075: Update runtime and branding to 2.0.6.
Update runtime and branding to 2.0.6.
2018-01-18 22:13:27 +00:00
Tanner Gooding
603240f26d Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue 2018-01-18 14:03:25 -08:00
Livar
0ca4e2c47b
Merge pull request #8355 from dotnet/nuget-insertbuild4791
Insert NuGet Build 4.6.0-rtm-4791 into cli
2018-01-18 13:51:35 -08:00
Peter Huene
274beefb42
Merge pull request #8425 from tannergooding/release/2.1.1xx
Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
2018-01-18 13:31:45 -08:00
Livar
a9c4a1ccab
Fixing the prefercliruntime asset 2018-01-18 13:06:33 -08:00
Tanner Gooding
c5cf9994e2 Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue 2018-01-18 12:15:22 -08:00
Peter Huene
3c1911bd67
Update runtime and branding to 2.0.6. 2018-01-18 11:10:25 -08:00
Peter Huene
2170143a18 Merged PR 101962: Merge branch 'release/2.1' into 'release/2.1-MSRC' 2018-01-18 18:53:44 +00:00
Peter Huene
5c35438cfe
Merge pull request #8422 from peterhuene/fix-source-option
Fix source option for install command.
2018-01-17 21:42:26 -08:00
Peter Huene
a64da0129a
Fix source option for install command.
The original PR that implemented the source option was updated incorrectly
during review and the source option was accidentally not passed into the
package obtainer.  This resulted in the source option not being respected from
the install command.

The tests passed because the only test coverage is at the package obtainer
level; tests of the install command itself were waiting on additional changes
to enable (still not yet merged).

The fix is to properly pass the source option through when obtaining the
package.
2018-01-17 19:28:29 -08:00
Peter Huene
778e21c870
Merge branch 'release/2.1' into 'release/2.1-MSRC'
* release/2.1:
  Updating the branding of the CLI to 2.1.5
2018-01-17 18:40:57 -08:00
Peter Huene
7b913c8e53
Merge pull request #8420 from peterhuene/update-sdk-branding-2.1.5
Updating the branding of the CLI to 2.1.5
2018-01-17 18:31:00 -08:00
Peter Huene
d4a4424b77
Updating the branding of the CLI to 2.1.5 2018-01-17 16:41:02 -08:00
John Beisner
f5fce413e9
Merge pull request #8419 from johnbeisner/ScriptFixes
CLI Build Break: should use a trailing space instead of a leading space
2018-01-17 15:09:52 -08:00
jbeisner
331b58c8a2 Should use a trailing space instead of a leading space; MSBuild thinks the '$ExtraParametersNoTargets' variable a switch instead of a string. 2018-01-17 22:33:22 +00:00
Peter Huene
83609cef8a
Merge pull request #8408 from peterhuene/install-tool-strings
Fix missing package id error message for install tool command.
2018-01-17 13:49:05 -08:00
John Beisner
edc6697cc5
Merge pull request #8380 from johnbeisner/ScriptFixes
Run-Build.sh/ps1 does not behave correctly when passing in a target.
2018-01-17 13:31:55 -08:00
Matt Mitchell
632e9e762b
Merge pull request #8417 from johnbeisner/OrchestratedBuild
Orchestrated build publishing; CLI:master [follow-up]
2018-01-17 12:44:54 -08:00
jbeisner
96410974b9 Reintroducing: 'BlobStoragePartialRelativePath' as orchetrated build needs a prepended "assets" to the partial relative path. 2018-01-17 20:08:12 +00:00
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