Commit graph

9408 commits

Author SHA1 Message Date
Daniel Plaisted
73ec338775 Remove -upgrade suffix from deb and rpm installer filenames 2018-07-11 14:37:39 -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
jbeisner
f2039c9139 Update 'CLI' and 'Toolset' versions; update 'Toolset' blob location; update build tools package references. 2018-07-11 18:46:24 +00: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
Daniel Plaisted
b44a2bb723 Insert ASP.NET Core 3.0 2018-07-11 02:13:06 -07:00
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
Daniel Plaisted
2c8a349bd1 Generate .binlog on non-Windows 2018-07-09 16:38:12 -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
Daniel Plaisted
905d4d442d Address code review feedback 2018-07-09 14:12:11 -07:00
Daniel Plaisted
75e0dbb45d Update tests for .NET Core 3.0 2018-07-09 13:46:05 -07:00
Daniel Plaisted
cf0441cf6e Update test to target .NET Core 3.0 2018-07-09 13:46:05 -07:00
Daniel Plaisted
21fec561ee Update dev and test script window titles to new repo name 2018-07-09 13:46:05 -07:00
Daniel Plaisted
c431d58b72 Set maximum .NET Core version to 3.0 in BundledVersions.props 2018-07-09 13:46:04 -07:00
Daniel Plaisted
b3be19b820 Fix up runtimeconfig.json files for tools (dotnet, MSBuild, VSTest, etc) to target .NET Core 3.0 2018-07-09 13:46:04 -07:00
Daniel Plaisted
ec9914424c Refactor tests to use CliTargetFramework variable instead of hard-coding target framework 2018-07-09 13:46:04 -07:00
Daniel Plaisted
c6925a5388 Add dotnet-buildtools feed for Microsoft.DotNet.VersionTools 2018-07-09 13:46:03 -07:00
Daniel Plaisted
3e2a16d5db Insert .NET Core 3.0 runtime builds 2018-07-09 13:46:03 -07:00
Daniel Plaisted
69c7fe8fe8
Merge pull request #23 from dsplaisted/add-binlog
Add .binlog, and archive it
2018-07-09 13:39:07 -07:00
Daniel Plaisted
c8321e2bd0 Archive .binlog 2018-07-09 12:49:03 -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
Daniel Plaisted
b1206b0ff5 Create binary log by default 2018-07-09 12:35:50 -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
Daniel Plaisted
9a0c9c0f3a
Merge pull request #20 from johnbeisner/master
Disabling publishing for all 'MSBuildExtensions' artifacts.
2018-07-03 16:35:49 -07:00
jbeisner
692987b919 Disabling publishing for all 'MSBuildExtensions' artifacts. 2018-07-03 22:58:40 +00:00
Daniel Plaisted
9e9fc1994f
Merge pull request #19 from johnbeisner/master
Resolve signing failures; Core-SDK
2018-07-03 14:17:24 -07:00
jbeisner
6c793107b6 Unblocking Jenkins... 2018-07-03 19:48:04 +00:00
jbeisner
9ead28cb25 "Microsoft.DotNet.MSBuildSdkResolver" and "Microsoft.DotNet.Cli.Utils" are delivered/published via 'CLI' not 'Core-SDK'; use 'dotnet-install.sh' from 'dot.net' 2018-07-03 18:43:33 +00:00
John Beisner
93a2d437e5
Merge pull request #18 from johnbeisner/master
The target "ComposeSdk" needs "Prepare" to have been run
2018-07-03 17:21:14 +00: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
jbeisner
c42e66d6ed The target "ComposeSdk" needs "Prepare" to have been run - make it dependent so we can run the single "ComposeSdk" target. 2018-07-03 15:38:10 +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