Commit graph

9095 commits

Author SHA1 Message Date
Peter Huene
789423b469
Merge branch 'release/2.1.4xx' into release/2.1.401
* release/2.1.4xx:
  Add XSLT Transform for apphost (#9609)
  Update date test according to MicrosoftNETSdkPackageVersion update
  Update MicrosoftNETCoreAppPackageVersion
  Update SDK to 2.1.400-preview-63110-09
  Revert implementation of the --mode option for the publish command.
  Updating the WebSdk from aspnet/websdk/2.1.4xx
  Removing 'Locked-file' test; CLI:release/2.1.3xx (#9604)
  Log a verbose message when DOTNET_CLI_HOME is being used.
2018-07-12 10:32:16 -07:00
William Li
0ef0b3296b
Add XSLT Transform for apphost (#9609)
To avoid sign check whitelist apphost.exe name changes very build. Sign check uses File Id in MSI as whitelist name. Template apphost.exe get a new "File Id" in msi different every time (since File Id is generated according to file path, and file path has version number). Use XSLT tranform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time.
2018-07-10 16:24:50 -07:00
John Beisner
8cccc2c329
Merge pull request #9621 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-07-10 16:21:42 -07:00
Daniel Plaisted
b8b7396c62
Merge pull request #9636 from wli3/update-sdk-version3
Update SDK to 2.1.400-preview-63110-09 and MicrosoftNETCoreAppPackageVersion to 2.1.2
2018-07-10 15:39:08 -07:00
William Li
eff7b49e33 Update date test according to MicrosoftNETSdkPackageVersion update 2018-07-10 14:41:53 -07:00
William Li
461fd82844 Update MicrosoftNETCoreAppPackageVersion 2018-07-10 14:13:29 -07:00
William Li
eadd6ead8c Update SDK to 2.1.400-preview-63110-09 2018-07-10 12:53:09 -07:00
Peter Huene
74c4e279e9
Merge pull request #9608 from peterhuene/fx-dep-apphost
Revert implementation of the --mode option for the publish command.
2018-07-09 16:29:37 -07:00
Nick Guerrera
1ddc303cf9
Merge pull request #9612 from dotnet/vramak/WebSdkUpdate75
Updating the WebSdk from aspnet/websdk/2.1.4xx
2018-07-09 16:20:25 -07:00
Peter Huene
d9e8947ff4
Revert implementation of the --mode option for the publish command.
This commit reverts the implementation of the `--mode` option for the `dotnet
publish` command.  A bug in the apphost prevents this feature from working
properly in some cases and there currently is not a mechanism to service it
with this feature.

The team has decided to move this feature to 2.2.1xx for the .NET Core SDK.

Fixes dotnet/sdk#2380.
2018-07-09 12:46:13 -07:00
Peter Huene
5aa6fe1ca7
Merge pull request #9566 from peterhuene/warn-on-cli-home-set
Log a verbose message when DOTNET_CLI_HOME is being used.
2018-07-06 14:46:41 -07:00
vramak
85e29304a6 Updating the WebSdk from aspnet/websdk/2.1.4xx 2018-07-05 18:22:54 -07:00
John Beisner
460788c91a
Removing 'Locked-file' test; CLI:release/2.1.3xx (#9604)
* Removing 'Locked-file' test: ItFailsInLessThanOneSecondWhenTheProjectAssetsJsonDoesNotExist
2018-07-03 16:23:35 +00:00
Nick Guerrera
a75f825aec
Merge pull request #9598 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-06-29 20:19:24 -04:00
Nick Guerrera
502ed82cc5
Merge pull request #9590 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-06-29 19:36:07 -04:00
Nick Guerrera
b2c39bc524
Merge pull request #9574 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-06-29 17:45:00 -04:00
John Beisner
fce129fa9f
Merge pull request #9592 from johnbeisner/FixProdConTestFailures
Fixing recent ProdCon test failures.
2018-06-29 21:43:06 +00:00
Nick Guerrera
21014a5060
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-29 17:41:11 -04:00
jbeisner
ce5493b7d6 Fixing recent ProCon test failures. 2018-06-29 20:10:19 +00:00
John Beisner
dbca58f8b7
Merge pull request #9588 from johnbeisner/UpdateMicrosoftDotNetArchiveVersion
Update the 'Microsoft.DotNet.Archive' version.
2018-06-29 18:43:07 +00:00
jbeisner
1bcb4f8865 Update the 'Microsoft.DotNet.Archive' version. 2018-06-29 17:11:07 +00:00
William Li
fcfcfcdaea
Merge pull request #9467 from nkolev92/restoreInteractiveFlag
Add a restore and add pkg commands interactive flag
2018-06-27 14:55:32 -07:00
Livar
dd0179a67c
Merge pull request #9568 from dotnet/update_sdk
Update SDK to 2.1.400-preview-63027-01
2018-06-26 18:36:25 -07:00
Livar
b29e49e26e
Merge pull request #9567 from livarcocc/update_branding
Updating branding to 401.
2018-06-26 17:51:07 -07:00
Livar
57597e8511
Update SDK to 2.1.400-preview-63027-01 2018-06-26 17:50:41 -07:00
Livar Cunha
b3ad7d3c8b Updating branding to 401. 2018-06-26 17:10:42 -07:00
Peter Huene
92507184bd
Log a verbose message when DOTNET_CLI_HOME is being used.
This commit logs a diagnostic message when the `DOTNET_CLI_HOME` variable is
used.  This enables users to determine where first-run-experience and global
tool files are being written to.

Fixes #9510.
2018-06-26 16:34:00 -07:00
Livar
b5de134c49
Merge pull request #9552 from AndyGerlicher/MSBuild-15.8.136
MSBuild 15.8.138
2018-06-26 14:24:13 -07:00
Livar
8cffe4a578
Merge pull request #9555 from halex2005/merges/release/2.1.4xx-to-master
Add nunit project and item templates to bundle
2018-06-26 13:50:12 -07:00
Andy Gerlicher
58a4fd0285 MSBuild 15.8.138-preview 2018-06-26 12:24:42 -07:00
akharlov
a5abacf155 add tests for dotnet new nunit 2018-06-26 12:34:13 +05:00
akharlov
dc3835df84 add nunit project and item templates to bundle 2018-06-26 12:34:13 +05:00
Livar
ec8fcf3707
Merge pull request #9554 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-06-25 22:14:28 -07:00
William Li
de7c73016e
Merge pull request #9549 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-06-25 17:33:53 -07:00
William Li
3af835044d
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-25 15:59:41 -07:00
Livar
2a1f1c6d30
Merge pull request #9551 from dotnet/update_asp_net_versions
Updates asp.net versions to match prodcon
2018-06-25 15:55:06 -07:00
Nikolche Kolev
c7cf8a55b8 Add DOTNET_HOST_PATH for dotnet nuget commands 2018-06-25 14:15:24 -07:00
Livar
2fed1c07ba Updates asp.net versions to match prodcon
Fixes https://github.com/dotnet/cli/issues/9550
2018-06-25 13:34:59 -07:00
Livar
b8735c396c
Merge pull request #9543 from AndyGerlicher/MSBuild-15.8.125
MSBuild 15.8.125
2018-06-25 12:00:29 -07:00
William Li
34fd28a3ba
Use blob feed instead of myget (#9546) 2018-06-25 10:37:19 -07:00
John Beisner
741512d065
Merge pull request #9540 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-06-25 09:23:51 -07:00
William Li
5218c4bcf5
Pass BaseIntermediateOutputPath via xml (#9509)
Instead of command line to avoid escaping problem.

It can support most of the character including surrogate char. It cannot
support semicolon. However, semicolon is not allow to be part of the
user name.

Port 2.1.4xx fix 0251f677ede571b61a47ca24f38df8e09038277d while keep
BaseIntermediateOutputPath instead of MsBuildProjectExtensionsPath to
minimize the change.
2018-06-24 11:32:44 -07:00
jbeisner
befc400ba8 Merge remote-tracking branch 'origin/release/2.1.3xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-22 20:48:42 +00:00
John Beisner
dc2443ca74
Fix the CI legs; CLI:release/2.1.3xx (#9535)
* Linux-musl command should be derived from "baseShellBuildCommand" not "buildCommand"; setting 'DropSuffix' in the environment.
2018-06-22 13:45:53 -07:00
Andy Gerlicher
50c5a5e110 MSBuild 15.8.125-preview 2018-06-22 10:45:22 -07:00
William Li
488edfad3f
Use correct nuget version normalized format (#9525)
* Use correct nuget version normalized format

* Change test accordingly

This matches nuget behavior
if restore with  `<PackageReference Include="global.tool.console.demo" Version="1.0.*" />` there is no warning
and if restore with `<PackageReference Include="global.tool.console.demo" Version="1.0.0" />` there is warning due to no exact 1.0.0 find
2018-06-21 13:00:49 -07:00
John Beisner
f882376933
Adding 'NoSuffix' legs to the CI (#9502)
* Adding 'NoSuffix' legs to the CI

* Fixing typo...

* Updates per code review...

* "openSUSE 43.2" should be "openSUSE 42.3"; fixing 'netci.groovy' command formation logic.
2018-06-21 12:00:28 -07:00
Livar
4757e52adb
Merge pull request #9524 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-06-21 10:53:38 -07:00
Livar
2bc587a615
Merge pull request #9496 from mlorbetske/dev/mlorbe/UpdateTestTemplatesToSdk15.8.0-preview-20180610-02
Update templates to carry test SDK 15.8.0-preview-20180610-02
2018-06-21 10:49:32 -07:00
Livar
52ee655dbe
Merge pull request #9529 from KevinRansom/alignFSharpWithDev158
Align f# with dev15.8
2018-06-21 10:42:31 -07:00