Commit graph

8991 commits

Author SHA1 Message Date
Jan Vorlicek
4d615db634 Fix incorrect condition in SkipBuildingInstallers 2017-12-13 18:18:25 +01:00
Jan Vorlicek
1a22c5cb58 Cleanup the Dockerfile
Setting a user with admin rights is not needed for Alpine
2017-12-13 12:10:44 +01:00
Jan Vorlicek
1abd2d9209 Enable Alpine 3.6 CLI build
This change enables CLI build for Alpine 3.6 and also adds CI job for
it. It is mostly based on changes that were necessary to
enable building of rhel.6 CLI
2017-12-13 12:10:44 +01:00
Eric Erhardt
411b38b36d
Merge pull request #8223 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26012-06 (master)
2017-12-12 18:23:21 -06:00
Eric Erhardt
abc48496ee
Merge pull request #8225 from eerhardt/UnpinStage0
Bump stage0 to 2.2.0-preview1-007799.
2017-12-12 17:49:37 -06:00
John Luo
b3d565da56 Update to consume aspnetcore 2.0.5-142 2017-12-12 15:36:41 -08:00
Livar Cunha
0bc62bf6aa Merged PR 98143: Merge merge_release_21 to release/2.1-MSRC 2017-12-12 23:34:33 +00:00
Livar Cunha
a27354ba57 Merge branch 'release/2.1' into merge_release_21
* release/2.1:
  Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated
  Updating the branding of the CLI to 2.1.4
  Updating the msbuild version for Microsoft.Build.Runtime.
  Updating the websdk version to 2.0.0-rel-20171110-671

	build/DependencyVersions.props
2017-12-12 15:24:09 -08:00
Eric Erhardt
52a59dd56e Bump stage0 to 2.2.0-preview1-007799.
Need to remove some unnecessary dependencies in dotnet-cli-build.csproj because the NuGet.CommandLine.XPlat reference was bringing in an old MSBuild version, which was breaking restore. I didn't see any usages of this reference, so I'm removing it since it is not needed.
2017-12-12 17:16:25 -06:00
Livar
c335c4e3c8
Merge pull request #8220 from AndyGerlicher/MSBuild.15.6.22
MSBuild 15.6.22
2017-12-12 15:07:32 -08:00
dotnet-bot
3bdce29d27 Update CoreSetup to preview1-26012-06 2017-12-12 22:07:06 +00:00
Peter Huene
dcc99d6e33
Make restore performed by run command default to nologo and quiet.
This commit changes the run command such that it will now be `/nologo` and
`/verbosity:quiet` (by default) for the restore operation even if a target
framework is specified.

When a target framework is specified, a separate restore operation is performed
that does not pass `/nologo` and the default verbosity is used.  The fix is to
ensure that the arguments used for the restore operation match those that are
used for the build operation.

Fixes #8118.
2017-12-12 10:41:50 -08:00
Andy Gerlicher
d2985289fa MSBuild 15.6.22 2017-12-12 10:30:15 -08:00
Livar
d38c6000c1
Merge pull request #8199 from peterhuene/sln-write-bom
Write UTF-8 BOM for solution files.
2017-12-11 20:21:41 -08:00
John Beisner
94e43afa68 Use explict and non-preview versions for the build DLL 2017-12-11 16:54:35 -08:00
John Beisner
1772b81170
Merge pull request #8212 from johnbeisner/FixUpdateDependenciesScript
Fixing "update-dependencies" script
2017-12-11 16:40:49 -08:00
John Beisner
004d00b91e Formatting... 2017-12-11 14:45:06 -08:00
John Beisner
fd0e131ca0
Merge pull request #8210 from natemcmaster/dotnet-install
Correctly check for existence of shared runtime in dotnet-install scripts
2017-12-11 13:34:48 -08:00
John Beisner
b253a772f0 NuGet.Config is no longer present - therefore, explicitly state where to get this script's dependencies. 2017-12-11 13:04:41 -08:00
John Beisner
61bc1d82b4
Merge pull request #8211 from johnbeisner/FixMicrosoftBuildRuntime
Fixing NuGet reference to Microsoft.Build.Runtime
2017-12-11 12:31:56 -08:00
John Beisner
ed4413b9fb Fixing a typo... 2017-12-11 11:25:52 -08:00
John Beisner
3ac579997c
Merge pull request #8204 from johnbeisner/FixTheMerge
Fixing CLI:master - parameterizing 'GenerateInstallersAndCopyOutOfSandBox'
2017-12-11 11:21:39 -08:00
John Beisner
6313f4fc7a The 15.4.8 version of the Microsoft.Build.Runtime nuget package is currupt; use the replacement 15.4.8.1 2017-12-11 11:01:24 -08:00
Nate McMaster
2c931b810d Fix dotnet-install to check the right path for no-op installs when --shared-runtime is specified 2017-12-11 10:10:08 -08:00
Livar
80dda1955f
Merge pull request #8207 from mayankbansal018/updatetestsdk
Update preview of TestPlatform SDK
2017-12-11 09:52:21 -08:00
John Beisner
7a3dcee2aa Updated usage comments. 2017-12-11 08:12:45 -08:00
Mayank Bansal
ececae3ecd update preview of TestPlatform SDK 2017-12-11 19:40:10 +05:30
John Beisner
b06f6b1954 The target: 'GenerateInstallersAndCopyOutOfSandBox' should be parameterized in run-build.sh. 2017-12-10 18:12:20 -08:00
John Beisner
7726565e09
Merge pull request #8201 from johnbeisner/FixTheMerge
Fixing CLI:master - parameterizing the 'BuildAndPublishAllLinuxDistrosNativeInstallers'
2017-12-08 20:37:48 -08:00
John Beisner
02b1cc6aa7 'channel' parameter is superfluous if also using a 'version' parameter. 2017-12-08 17:49:38 -08:00
John Beisner
e69159a335 Fixing the comment. 2017-12-08 17:18:08 -08:00
John Beisner
21e9e7277a The first 'dotnet msbuild ' pass should not run 2 targets: /'WriteDynamicPropsToStaticPropsFiles' and 'BuildAndPublishAllLinuxDistrosNativeInstallers' 2017-12-08 17:06:36 -08:00
Livar
8b4773e1d3
Merge pull request #8196 from livarcocc/port_engine_fix
Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated
2017-12-08 14:38:55 -08:00
Peter Huene
9671ba1de0
Write UTF-8 BOM for solution files.
Currently the solution file written out by the `sln` command uses a
UTF-8 encoding without a BOM.  This causes problems when the solution
file contains non-ASCII code points because Visual Studio and MSBuild
will not use a UTF-8 encoding when reading the solution file if the
BOM is omitted.

This commit causes the BOM to always be written when writing the
solution files.

Fixes #8184.
2017-12-08 14:34:26 -08:00
John Beisner
a1d1006b46
Merge pull request #8195 from johnbeisner/FixTheMerge
Fixing CLI:master - bash script argument handling
2017-12-08 13:19:58 -08:00
Mike Lorbetske
5fb2b271a8 Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated 2017-12-08 12:52:48 -08:00
Livar
3fe29161af
Merge pull request #8142 from peterhuene/sln-add-directory
Support directories for `sln add`, `sln remove`, `add reference`, and `remove reference` commands.
2017-12-08 11:42:56 -08:00
John Beisner
3bea47e1fe "${args[@]}" should be: $args
Reference: Jan Vorlicek did some work to enable RedHat6 and part of that work was to change the argument passing in bash.
2017-12-08 11:27:12 -08:00
Peter Huene
1ddf5c87c7
Add support for accepting directories to add and remove reference commands.
This commit adds support for specifying directories containing a single
project to both the `add reference` and `remove reference` commands.

Fixes issue #7343.
2017-12-07 17:23:31 -08:00
Peter Huene
bcf13b93cc
Add support for accepting directories to sln add and remove commands.
This commit adds support for specifying directories containing a single
project to both the `sln add` and `sln remove` commands.

Additionally, the output from `sln remove` has been improved to not
mention "project references".

Fixes issue #7343.
2017-12-07 17:22:29 -08:00
Nick Guerrera
e9706a98cd Treat xlf as text 2017-12-07 16:00:07 -08:00
Livar
977a6ec321
Merge pull request #8006 from javiercn/javiercn/aspnetcore-httpscertificate
ASP.NET Core HTTPS development certificate support
2017-12-07 15:52:47 -08:00
Livar
9c5843d071
Merge pull request #8165 from dotnet/vramak/UpdateWebSdk_12_4
Updating the websdk version to 2.0.0-rel-20171110-671
2017-12-07 14:35:01 -08:00
Livar
0e9cd65efc
Merge pull request #8186 from livarcocc/fix_msbuild_version
Fix msbuild version
2017-12-07 14:34:42 -08:00
Javier Calvarro Nelson
ad8f3da826 ASP.NET Core HTTPS development certificate support
* Added support for generating the HTTPS development certificate on the
CLI first run experience.
* On first run, an HTTPS certificate will be set up on the current user
local store.
* The environment variable DOTNET_GENERATE_ASPNET_CERTIFICATE can be used
to turn the feature off.
2017-12-07 14:31:00 -08:00
Nick Guerrera
9e6e737519
Merge pull request #8146 from v-zbsail/localization
LOC CHECKIN | dotnet/cli-master | 20171201
2017-12-07 14:29:15 -08:00
Livar
661f004b16
Merge pull request #8173 from dotnet/merges/release/15.5-to-master-20171206-080040
Merge release/15.5 to master
2017-12-07 14:24:52 -08:00
Livar Cunha
f5a93d57da Fixing the expected fx-version. 2017-12-07 13:41:36 -08:00
Livar Cunha
90e254b9ed More fixes that were missing from the merge. 2017-12-07 13:23:27 -08:00
Livar Cunha
c768b01523 Updating the branding of the CLI to 2.1.4 2017-12-07 13:15:46 -08:00