mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9202 commits 41 branches 190 tags 95 MiB
Commit graph

9202 commits

This branch
This branch
All branches
Author SHA1 Message Date
Livar
3818426392
Merge pull request #9475 from AndyGerlicher/MSBuild-15.8.101 
MSBuild 15.8.101
 2018-06-15 09:24:55 -07:00
John Beisner
f97e9e82e9 Merged PR 128197: Recent fixes; merge release/2.1.3xx into release/2.1.3xx-MSRC 
Including in this merge:

https://github.com/dotnet/cli/pull/9495
The "pack" command under 'buildCrossTargeting' for 'Microsoft.DotNet.MSBuildSdkResolver' now throws a "NU5104" warning/error because the SDK stage0 was changed to "2.1.300" [change was intended].
Impact: package failure for Linux-x64, Linux-arm, and Linux-arm64

https://github.com/dotnet/cli/pull/9491
The version of 'Microsoft.AspNetCore.Mvc' should be independent of 'Microsoft.AspNetCore.All'
Impact: RazorApp test failure in all legs except for Linux-arm and Linux-arm64
 2018-06-15 00:47:08 +00:00
John Beisner
734a41730a
Fix the 'Microsoft.AspNet.Core.Mvc' versioning (#9491) 
* The version of 'Microsoft.AspNetCore.Mvc' should be independent of 'Microsoft.AspNetCore.All'

* Changing "MicrosoftAspNetCoreMvcVersion" to "MicrosoftAspNetCoreMvcPackageVersion" in order to be compatable with ProdCon.
 2018-06-14 17:32:24 -07:00
Matt Mitchell
612c9c87bb
Merge pull request #9495 from johnbeisner/AddBackNoWarn 
Add global NoWarn for: 'NU5104'
 2018-06-14 15:11:33 -07:00
jbeisner
c0c445be04 Updating the 'NoWarn' comments. 2018-06-14 21:12:46 +00:00
Mike Lorbetske
d396c8bf4e Update templates to carry test SDK 15.8.0-preview-20180610-02 2018-06-14 13:41:15 -07:00
jbeisner
4050c6374f The "pack" command under 'buildCrossTargeting' for 'Microsoft.DotNet.MSBuildSdkResolver' now throws a "NU5104" warning/error because the SDK stage0 was changed to "2.1.300" [change was intended]. 2018-06-14 20:31:09 +00:00
NuGet Team Bot
bf473ad46c Insert NuGet Build 4.8.0-preview3.5278 into cli 2018-06-14 12:57:21 -07:00
Livar Cunha
04f285629d Updated the expected implicit NETStandard.Library to 2.0.3 2018-06-14 18:32:26 +00:00
vramak
b9a8667dbf Updating the WebSdk version for release/2.1.4xx 2018-06-14 10:43:41 -07:00
Daniel Plaisted
bcbfbffced Update Installer build to create both old and new package identities 2018-06-13 18:25:59 -07:00
Daniel Plaisted
80f143dd08 Bring back old package IDs 2018-06-13 17:59:54 -07:00
John Beisner
89c1500501
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-13 17:15:24 -07:00
Nate McMaster
5f3ad071ec
Update to aspnet 2.0.9-rtm-10029 2018-06-13 14:49:35 -07:00
Livar Cunha
d4a70a4854 Merged PR 127887: Merge release/2.1.3xx into release/2.1.3xx-MSRC 2018-06-13 21:34:20 +00:00
Livar Cunha
f643067869 Merge branch 'release/2.1.3xx' into merge_release_213xx 
* release/2.1.3xx:
  Update SDK/WebSDK dependencies to 2.1.1
  Revert undesired changes
  Update coresetup, msbuild, nugetclient, roslyn to preview1-26216-03, 15.7.177, preview1.5116, beta6-62923-07, respectively
  Correct the 'Channel' and 'BranchName' to "release/2.1.3xx"
 2018-06-13 14:31:26 -07:00
Livar
769f81938e
Merge pull request #9474 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies 
Update coresetup, msbuild, nugetclient, roslyn to preview1-26216-03, 15.7.177, preview1.5116, beta6-62923-07, respectively (release/2.1.3xx)
 2018-06-13 14:18:49 -07:00
Matt Mitchell
7f29a90635
Update SDK/WebSDK dependencies to 2.1.1 2018-06-13 13:24:47 -07:00
Livar
4118b0c58a
Merge pull request #9427 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx 
Merge release/2.1.3xx to release/2.1.4xx
 2018-06-13 10:59:10 -07:00
jbeisner
fddf38656a Resolve conflicts: merge 'release/2.1.3xx' to 'release/2.1.4xx' 2018-06-13 17:30:42 +00:00
John Beisner
24f83b0417
Merge pull request #9470 from johnbeisner/UpdateBranchInfo 
Correcting the 'Channel' and 'BranchName' to "release/2.1.3xx"
 2018-06-13 09:54:20 -07:00
Matt Mitchell
7f0765eb33
Revert undesired changes 2018-06-12 20:34:32 -07:00
Andy Gerlicher
0a5861d8b2 MSBuild 15.8.101-preview 2018-06-12 19:52:57 -07:00
dotnet-maestro-bot
e45766ca1e Update coresetup, msbuild, nugetclient, roslyn to preview1-26216-03, 15.7.177, preview1.5116, beta6-62923-07, respectively 2018-06-13 02:47:33 +00:00
Peter Huene
d89b4b74d5 Merged PR 127666: Update runtime to 2.0.9. 2018-06-13 00:20:23 +00:00
Daniel Plaisted
ac9b4579ce Update VS Insertion NuGet package IDs in Installer.MSI.targets 2018-06-12 16:05:04 -07:00
Daniel Plaisted
4ef09279d2 Update VS insertion package name for x86 package 2018-06-12 15:55:49 -07:00
Daniel Plaisted
1d12ea7f1e Update VS insertion package name for x64 package 2018-06-12 15:55:16 -07:00
Peter Huene
0bd478b31e
Update the runtime branding to 2.0.9. 
This commit updates the runtime branding to 2.0.9.
 2018-06-12 15:33:25 -07:00
wtgodbe
725814c601
Update runtime versions in 2.0.0 2018-06-12 15:31:30 -07:00
Peter Huene
d2c91c3539 Merged PR 127596: Update CLI branding to 2.1.202. 
Update CLI branding to 2.1.202.

This commit updates the CLI branding to 2.1.202.
 2018-06-12 22:26:19 +00:00
jbeisner
af6b9ab12e Correct the 'Channel' and 'BranchName' to "release/2.1.3xx" 2018-06-12 22:15:53 +00:00
Nikolche Kolev
c7cde12e2d update xlf files 2018-06-12 12:08:18 -07:00
Peter Huene
922ba14142
Update CLI branding to 2.1.202. 
This commit updates the CLI branding to 2.1.202.
 2018-06-12 12:07:09 -07:00
Nikolche Kolev
c834c8cd0b add interactive flag for the add package and restore commands 2018-06-12 11:52:50 -07:00
Peter Huene
b7eb74ff6b Merged PR 126597: Merge from upstream release/2.1.3xx 
Merge from upstream release/2.1.3xx

Note: this conflicted with several cherry-picked commits that were already present in release/2.1.3xx-MSRC.
 2018-06-12 17:36:06 +00:00
Peter Huene
c0eff4fa56
Merge branch 'release/2.1.3xx' into release/2.1.3xx-MSRC 
* release/2.1.3xx:
  Updating the CLI stage0 to 2.1.300 and fixing some build failures.
  Update Microsoft.NETCore.App Package Version
  Formatting...
  Drop the LZMA archive for every build.
 2018-06-12 10:31:56 -07:00
Peter Huene
8205dd4a15
Fix publish test for 32-bit environments. 
Ensure the correct DOTNET_ROOT variable is set for the apphost being run.
 2018-06-11 21:55:47 -07:00
Peter Huene
da2b1b90ec
Fix PR review feedback. 
Amending string resources based on suggestions.
Fixing tests that need DOTNET_ROOT set.
Adding args to the asset instance name for `PublishApp`.
 2018-06-11 21:31:48 -07:00
Peter Huene
bc96902c61
Implement mode option for dotnet publish. 
This commit implements a `mode` option that can control how an application is
published with the `dotnet publish` command.

There are three supported modes:

* self-contained: publishes a self-contained application (same as
--self-contained).
* fx-dependent: publishes a framework-dependent application (with an
application host when a runtime is specified).
* fx-dependent-no-exe: publishes a framework-dependent application without an
application host.

The default when publishing without a runtime specified is
`fx-dependent-no-exe`.

The default when publishing with a runtime specified is `self-contained`.

`fx-dependent` requires netcoreapp2.1 or later when a runtime is specified.

The `--self-contained` option is still supported, but is now hidden so that
users will be encouraged to move to the `--mode` option.

Fixes #6237.
 2018-06-11 15:43:55 -07:00
Livar
9ab03e695e
Merge pull request #9446 from livarcocc/update_stage0 
Updating the CLI stage0 to 2.1.300 and fixing some build failures.
 2018-06-09 17:09:08 -07:00
Livar
f13c4a2c5c
Merge pull request #9444 from johnbeisner/UnblockUbuntuCI 
Unblock Ubuntu x64 Jenkins CI Leg
 2018-06-09 10:23:25 -07:00
Livar Cunha
15e6928b02 Updating the CLI stage0 to 2.1.300 and fixing some build failures. 2018-06-08 16:03:24 -07:00
jbeisner
6e550e5c25 Update Microsoft.NETCore.App Package Version 2018-06-08 19:12:51 +00:00
Livar
462479933b
Merge pull request #9436 from AndyGerlicher/MSBuild-15.8.86 
MSBuild 15.8.86
 2018-06-08 09:48:01 -07:00
Andy Gerlicher
767f569ac3 MSBuild 15.8.86 2018-06-07 10:22:03 -07:00
Livar
a8396b53e1
Merge pull request #9430 from johnbeisner/DropTheLzma 
Drop the LZMA archive for every build
 2018-06-07 10:21:28 -07:00
jbeisner
7f5ab825be Formatting... 2018-06-06 23:15:52 +00:00
jbeisner
7a0d2c8f0c Drop the LZMA archive for every build. 2018-06-06 23:08:38 +00:00
John Beisner
548ba179f4
Merge pull request #9393 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx 
Merge release/2.1.3xx to release/2.1.4xx
 2018-06-06 11:52:14 -07:00