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

9672 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Beisner
07f7f82f9f
Merge pull request #9784 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx 
Merge release/2.1.4xx to release/2.2.1xx
 2018-08-03 09:46:10 -07:00
Nick Guerrera
b2ceb7e81f Update BranchInfo to release/2.1.5xx 2018-08-02 15:47:31 -07:00
Nick Guerrera
5752a708ec Updating branding to 2.1.500 2018-08-02 15:46:15 -07:00
John Beisner
fb7c80b585
Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-08-02 13:44:26 -07:00
Livar
91b1c13032
Merge pull request #9780 from livarcocc/merge_release_401_into_400 
Merge release/2.1.401 into release/2.1.400
 2018-08-02 11:02:14 -07:00
Livar Cunha
817e321895 Keeping branch info as 2.1.4xx. 2018-08-02 09:02:57 -07:00
Daniel Plaisted
82b517ae4c Fix update-dependencies script 2018-08-01 17:34:27 -07:00
Daniel Plaisted
faf1bcb01e
Merge pull request #40 from dsplaisted/clean-dependencies 
Clean up dependency versions that aren't needed after repo refactoring
 2018-08-01 14:30:30 -07:00
Daniel Plaisted
670f15e4ce Import TestDependencyVersions.props for test projects 2018-08-01 11:40:45 -07:00
Peter Huene
1f2ad7c354
Merge pull request #9772 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx 
Merge release/2.1.4xx to release/2.2.1xx
 2018-07-31 23:35:45 -07:00
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