Commit graph

8383 commits

Author SHA1 Message Date
Livar
26c0e81fe6
Merge pull request #8458 from KevinRansom/updatefsharp
update fsharp compiler to match vs2017.6 preview 3
2018-01-23 16:53:55 -08:00
jbeisner
954e2de29e Fix non-fatal null exception when no extra parameters are passed. 2018-01-23 23:59:31 +00:00
Kevin Ransom
b3c2414804 Update package reference 2018-01-23 15:42:57 -08:00
Kevin Ransom
d41b99205a update fsharp compiler to match vs2017.6 preview 3 2018-01-23 13:50:44 -08:00
Matt Mitchell
f4a0d2db0e
Merge pull request #8453 from johnbeisner/Revert8443
Revert PR:8443
2018-01-23 10:58:58 -08:00
jbeisner
338bdfb47c Revert "If 'OrchestratedPackageVersionsProps.props' is present, do not re-download the file every time 'Run-Build' or 'Build' is called."
This reverts commit d3e905997c.
2018-01-23 17:46:09 +00:00
jbeisner
94fc976ea5 Revert "If the Nuget.config has already been generated, do not re-generate the file every time 'Run-Build' or 'Build' is called."
This reverts commit 9d5bd8637e.
2018-01-23 17:45:14 +00:00
Matt Mitchell
80a5a829ea
Merge pull request #8448 from johnbeisner/OBuildFix
Use a unchanging version for 'Microsoft.NETCore.App'
2018-01-23 07:43:11 -08:00
jbeisner
579e84734a The orchestrated "PackageVersion" type variables should not be used in any of the 'proj' files of the built build tools under: "build_projects" 2018-01-22 21:39:47 -08:00
Livar
34748d5a12
Merge pull request #8447 from wli3/separate-toolpackage-shim
Separate tool package and shim file location
2018-01-22 18:09:23 -08:00
William Li
36c01137ad Separate tool package and shim file location 2018-01-22 16:30:52 -08:00
Livar
c9ac5c9c02
Merge pull request #7951 from wfurt/freebsd
add basic support for FreeBSD
2018-01-22 14:17:56 -08:00
Livar
c46ef46b09
Merge pull request #8444 from livarcocc/update_branding
Updating the CLI branding and version to 2.1.300.
2018-01-22 14:16:46 -08:00
Livar
8b0d66468c
Merge pull request #8446 from livarcocc/update_master_branding
Updating the branding to 2.1.3-preview2.
2018-01-22 14:16:16 -08:00
John Beisner
f6bc5d0ad9
Merge pull request #8443 from johnbeisner/WriteNugetConfigFileTargetModification
Generate a Nuget.config once
2018-01-22 14:11:27 -08:00
Zbyněk Sailer
8cb01e226c LOC CHECKIN | cli - master | 20180112 (#8385)
* LOC CHECKIN | cli - master | 20180112

* LOC CHECKIN | cli - master | 20180118 update

* LOC CHECKIN | cli - master | 20180119 update | DEU fix
2018-01-22 13:56:03 -08:00
Livar Cunha
df2bbb81b2 Updating the branding to 2.1.3-preview2. 2018-01-22 13:32:51 -08:00
Livar Cunha
6695936718 Updating the CLI branding and version to 2.1.300. 2018-01-22 13:26:57 -08:00
jbeisner
d3e905997c If 'OrchestratedPackageVersionsProps.props' is present, do not re-download the file every time 'Run-Build' or 'Build' is called. 2018-01-22 20:49:23 +00:00
jbeisner
9d5bd8637e If the Nuget.config has already been generated, do not re-generate the file every time 'Run-Build' or 'Build' is called. 2018-01-22 20:37:35 +00:00
William Lee
839eccbcaf
MacOs HighSierra Fallback (#8437)
walk around for https://github.com/dotnet/corefx/issues/26488
2018-01-22 10:45:35 -08:00
John Beisner
4dc001ca47
Merge pull request #8441 from dagood/dotnetchecksums
Fix "dotnet" typo in donetclichecksums manifest data
2018-01-22 08:40:51 -08:00
Davis Goodin
0e6586de49 Fix "dotnet" typo in donetclichecksums 2018-01-22 09:42:32 -06:00
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
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
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
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