Commit graph

9662 commits

Author SHA1 Message Date
Daniel Plaisted
cc2a2998e3 Clean up dependency versions that aren't needed after repo refactoring 2018-07-31 18:31:02 -07:00
Nick Guerrera
da661202ad
Merge pull request #39 from nguerrera/fix-groovy-merge
Fix bad merge to netci.groovy
2018-07-31 17:16:10 -07:00
Peter Huene
29ee450c70
Fix test failure.
The most recent SDK for 2.2.1xx pinned netstandard.library to 2.0.3 due to
https://github.com/dotnet/sdk/issues/2410.

This commit changes the expected version to match.
2018-07-31 16:39:48 -07:00
Nick Guerrera
5fe3017615 Fix bad merge to netci.groovy 2018-07-31 16:25:02 -07:00
Nick Guerrera
2ec7b7abd5
Merge pull request #37 from nguerrera/merge-cli/release/2.2.1xx-to-core-sdk/master
Merge cli/release/2.2.1xx to core-sdk/master
2018-07-31 15:47:47 -07:00
Nick Guerrera
6ebed76f95 Redo merge to netci.groovy 2018-07-31 15:06:02 -07:00
William Li
2a7b82cef6
tool-nuget-package-format document (#9589) 2018-07-31 14:57:02 -07:00
William Li
7c52acd645
Add packaged shim doc (#9582) 2018-07-31 14:38:43 -07:00
Peter Huene
77739c4db3
Update the multitargeting test assets to netcoreapp2.2.
This commit updates the target framework for the multitargeting test assets to
netcoreapp2.2.
2018-07-31 13:55:44 -07:00
Peter Huene
7db00ca232
Merge branch 'release/2.1.4xx' into release/2.2.1xx
* release/2.1.4xx:
  Fix dotnet sln add for multitargeted C# and VB projects.
2018-07-31 13:53:34 -07:00
Daniel Plaisted
74c1ae46ed
Merge pull request #9770 from nguerrera/fix-bug-comment
Add CLI side of "latest patch for 2.1" in roll-forward logic
2018-07-31 12:25:32 -07:00
Nick Guerrera
60fd63aa41
Merge pull request #9771 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-31 11:08:57 -07:00
Nick Guerrera
d6d0130942 Fix test issues 2018-07-30 17:49:02 -07:00
Nick Guerrera
d6a733c76b Add CLI side of "latest patch for 2.1" in roll-forward logic
Also adjust comment with real reason for skipping test, pointing
to dotnet/sdk bug.
2018-07-30 17:46:02 -07:00
Nick Guerrera
934ae35aa1 Use Tls2 for dotnet-install script download 2018-07-30 17:09:14 -07:00
Nick Guerrera
2c46d9d042 Update toolset and align stage0 version 2018-07-30 17:09:14 -07:00
Nick Guerrera
bbb8d01ef8 Set branch and channel name to master 2018-07-30 17:09:14 -07:00
Nick Guerrera
7dc5587e9c Remove documentation that lives in dotnet/cli repo 2018-07-30 17:09:14 -07:00
Nick Guerrera
46f0cbfd76 Fix merge error 2018-07-30 17:09:14 -07:00
Nick Guerrera
9b4f9f26d9
Merge pull request #9768 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-30 16:26:30 -07:00
Nick Guerrera
d095f097f8
Merge pull request #9767 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-30 16:26:11 -07:00
Peter Huene
fdfc1b668b
Merge pull request #9734 from peterhuene/fix-run-output
Suppress output from `dotnet run` when using quiet verbosity level.
2018-07-30 16:01:08 -07:00
Peter Huene
3018875d22
Suppress output from dotnet run when using quiet verbosity level.
This commit suppresses the output that is displayed by the `dotnet run` command
when launch settings are being used, unless the verbosity level is above
"quiet".

Fixes #9545.
2018-07-30 14:57:32 -07:00
Peter Huene
8642e60a0f
Merge pull request #9766 from peterhuene/fix-default-proj-guid
Fix dotnet sln add for multitargeted C# and VB projects.
2018-07-30 14:29:00 -07:00
Peter Huene
ed23e6b30f
Merge pull request #9733 from peterhuene/add-runtime-to-dotnet-test
Add `--runtime` option to `dotnet test`.
2018-07-30 14:26:24 -07:00
Peter Huene
96c9dc375a
Fix dotnet sln add for multitargeted C# and VB projects.
This commit integrates a fix from the SDK repo that sets
`DefaultProjectTypeGuid` for VB and C# projects when the projects are
multitargeting.  This property is used by `dotnet sln add` to determine the
project type guid to map in the solution file.

Adding additional tests that cover the multitargeting scenario for `dotnet sln
add`.

Fixes #9477.
2018-07-30 13:05:31 -07:00
Nick Guerrera
3e9d29bdf7
Merge pull request #9731 from dotnet-maestro-bot/release/2.1.401-UpdateDependencies
Update coresetup, sdk to preview1-26216-03, servicing-63124-04, respectively (release/2.1.401)
2018-07-30 12:48:22 -07:00
John Beisner
24b487abfa
Merge pull request #9763 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-30 12:32:37 -07:00
John Beisner
4f6ad7b282
Merge pull request #9764 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-30 12:32:33 -07:00
John Beisner
c198433a34
Merge pull request #9762 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-07-30 12:31:44 -07:00
John Beisner
ed8ee9f23b
Merge pull request #9761 from johnbeisner/FixPackageName
NuGetSdkResolverPackageVersion should be MicrosoftBuildNuGetSdkResolverPackageVersion
2018-07-30 10:49:54 -07:00
jbeisner
8780bab54e NuGetSdkResolverPackageVersion should be MicrosoftBuildNuGetSdkResolverPackageVersion 2018-07-30 14:52:06 +00:00
Nick Guerrera
a4a12840f4
Merge branch 'release/2.1.401' into release/2.1.401-UpdateDependencies 2018-07-29 18:38:00 -07:00
Nick Guerrera
204ce948a7
Merge pull request #9758 from KevinRansom/updateCompilersTo.10.2.3
Update FSharp Compiler to 10.2.3
2018-07-28 10:11:58 -07:00
Nick Guerrera
4c944018e7
Merge branch 'release/2.1.4xx' into updateCompilersTo.10.2.3 2018-07-28 09:00:34 -07:00
Nick Guerrera
e47d0f5bdc
Merge pull request #9756 from dotnet-maestro-bot/release/2.1.4xx-UpdateDependencies
Update roslyn to beta8-63127-03 (release/2.1.4xx)
2018-07-28 08:59:33 -07:00
Nick Guerrera
64d824398f
Merge pull request #9753 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-28 08:58:50 -07:00
William Li
0e1e4055e8
Avoid GenerateAssemblyInfo for dotnet migrate tests (#9757) 2018-07-27 20:32:11 -07:00
Kevin Ransom
a666fa777b UPDate FSharp Compiler to 10.2.3 2018-07-27 16:52:56 -07:00
Nick Guerrera
1dc737d03e
Merge pull request #9754 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-27 16:21:05 -07:00
John Beisner
2c61de6470
Merge pull request #9755 from johnbeisner/AddBinLogs
Create binlogs by default.
2018-07-27 15:02:52 -07:00
Nick Guerrera
29d3640768 Merge remote-tracking branch 'cli/release/2.2.1xx' into merge-cli/release/2.2.1xx-to-core-sdk/master 2018-07-27 14:47:38 -07:00
dotnet-maestro-bot
a9b8ade6aa Update roslyn to beta8-63127-03 2018-07-27 21:05:46 +00:00
jbeisner
a2d44ace0b Create binlogs by default. 2018-07-27 20:05:58 +00:00
Nick Guerrera
eaa5700266
Merge branch 'release/2.1.401' into merges/release/2.1.4xx-to-release/2.1.401 2018-07-27 12:55:02 -07:00
Nick Guerrera
f42505d8cd
Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-27 12:54:08 -07:00
John Beisner
421c17ff4c
Merge pull request #9743 from johnbeisner/DisableTests2.2.1xx
Temporarily disable 3 tests; CLI:release/2.2.1xx
2018-07-26 18:11:57 -07:00
Nick Guerrera
ea8c2bc3b8
Merge pull request #9744 from dotnet/nicholg/update-sdk
Update dotnet/sdk with latest nuget inserted
2018-07-26 17:44:11 -07:00
Nick Guerrera
175c421c14
Update dotnet/sdk with latest nuget inserted 2018-07-26 15:43:26 -07:00
Nick Guerrera
db01833556
Merge pull request #9739 from dotnet/nuget.client.release-4.8.0.5362-1-1
Insert NuGet Build 4.8.0-rtm.5362 into cli
2018-07-26 15:36:24 -07:00