Commit graph

9198 commits

Author SHA1 Message Date
Peter Huene
dcb83030e9
Merge branch 'release/2.1.2xx' into release/2.1.3xx
* release/2.1.2xx:
  Update to ASP.NET Core 2.0.9 build 10031
  Update to aspnet 2.0.9-rtm-10030
  Bump runtime versions to 2.0.9 stable
  Updated the expected implicit NETStandard.Library to 2.0.3
  Update to aspnet 2.0.9-rtm-10029
  Update the runtime branding to 2.0.9.
  Update runtime versions in 2.0.0
  Update CLI branding to 2.1.202.
2018-07-11 16:52:47 -07:00
Peter Huene
ce566fe199
Merge pull request #9647 from peterhuene/merge-2.1.3xx-msrc
Revert version change for ASP.NET bundled templates.
2018-07-11 13:55:33 -07:00
Peter Huene
bf3e772075
Revert version change for ASP.NET bundled templates.
The bundled ASP.NET templates should match the ASP.NET version.

Confusion over versions and missing packages caused a previous commit
to keep the bundled template versions the same while reving the ASP.NET version
from the private branch.

This commit reverts those changes.
2018-07-11 11:17:02 -07:00
Abhishek Kumawat
887f04cfe8
Added myget feed 2018-07-11 19:29:20 +05:30
abhishkk
8f624131f4 test platform insertion 15.8 rtm 2018-07-11 17:08:03 +05:30
Peter Huene
751976cbbe
Merge pull request #9633 from peterhuene/merge-2.1.3xx-msrc
Merge release/2.1.3xx-MSRC to release/2.1.3xx
2018-07-10 18:25:05 -07:00
Peter Huene
0134d4b661
Update dependency versions to 2.1.2.
This also refactors the ASP.NET SDKs to have independent versions from the
ASP.NET version.
2018-07-10 16:42:01 -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
Andy Gerlicher
50365dec4f MSBuild 15.8.160-preview 2018-07-10 13:37:59 -07:00
William Li
eadd6ead8c Update SDK to 2.1.400-preview-63110-09 2018-07-10 12:53:09 -07:00
Peter Huene
2b84062c57
Merge pull request #9632 from peterhuene/merge-2.1.2xx-msrc
Merge release/2.1.2xx-MSRC to release/2.1.2xx
2018-07-10 11:26:33 -07:00
Peter Huene
6c411e824b
Merge branch 'release/2.1.3xx-MSRC' into release/2.1.3xx
* release/2.1.3xx-MSRC:
  Updates asp.net versions to match prodcon
  Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1.
  Update expected versions to 2.1.2
  Disable NewProjectRestoresCorrectPackageVersion "console" test for now.
  Update the version for 'microsoft.netcore.app' to "2.1.1*"
  Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*"
  Merged PR 126122: Fix alpine file ownership issues with newer docker
  Fix mismatch of dotnet-watch with package variable name
  Set package versions for bundled aspnet tools separately from the metapackage version
  Split the version of Microsoft.AspNetCore.DeveloperCertificates.XPlat into a separate variable
  Fixup myget feed for aspnetcore
  Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change
  Updated Version.props
2018-07-10 10:43:47 -07:00
Peter Huene
3773ff8ad6
Merge branch 'release/2.1.2xx-MSRC' into release/2.1.2xx
* release/2.1.2xx-MSRC:
  Update to ASP.NET Core 2.0.9 build 10031
  Update to aspnet 2.0.9-rtm-10030
  Bump runtime versions to 2.0.9 stable
  Updated the expected implicit NETStandard.Library to 2.0.3
  Update to aspnet 2.0.9-rtm-10029
  Update the runtime branding to 2.0.9.
  Update runtime versions in 2.0.0
  Update CLI branding to 2.1.202.
2018-07-10 10:33:10 -07:00
NuGet Team Bot
db54427525 Insert NuGet Build 4.8.0-preview5.5328 into cli 2018-07-10 09:36:38 -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
Nate McMaster
281caedada Merged PR 130942: Update to ASP.NET Core 2.0.9 build 10031
Includes [this fix](1895502c48), which should ensure NETStandard.Library 2.0.3 is present in the offline cache.
2018-07-03 04:21:23 +00:00
Nate McMaster
3b69038bc4 Update to ASP.NET Core 2.0.9 build 10031 2018-07-03 04:19:14 +00:00
Matt Mitchell
9048955601 Merged PR 130771: Updates asp.net versions to match prodcon
- If this PR should not run tests please add text "skip[REMOVE_THIS]ci[REMOVE_THIS]please" (remove the marked text, no quotes).
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.
2018-07-02 16:18:23 +00:00
Livar
dd83b0c2b3 Updates asp.net versions to match prodcon
Fixes https://github.com/dotnet/cli/issues/9550
2018-07-02 09:16:55 -07: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
Peter Huene
5e52bd6518 Merged PR 129817: Merge release/2.1.2xx into release/2.1.2xx-MSRC 2018-06-26 05:45:48 +00:00
Peter Huene
ce512c767f
Merge branch 'release/2.1.2xx' into release/2.1.2xx-MSRC
* release/2.1.2xx:
  Update Installer build to create both old and new package identities
  Bring back old package IDs
  Update VS Insertion NuGet package IDs in Installer.MSI.targets
  Update VS insertion package name for x86 package
  Update VS insertion package name for x64 package
2018-06-25 22:42:03 -07: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