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

9229 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
John Beisner
2c61de6470
Merge pull request #9755 from johnbeisner/AddBinLogs 
Create binlogs by default.
 2018-07-27 15:02:52 -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
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
NuGet Team Bot
53eb71801b Insert NuGet Build 4.8.0-rtm.5362 into cli 2018-07-26 10:59:33 -07:00
dotnet-maestro-bot
3adf70de81 Update coresetup, sdk to preview1-26216-03, servicing-63124-04, respectively 2018-07-25 03:22:18 +00:00
Nick Guerrera
a79ceb8b3d
Merge pull request #9726 from dotnet-maestro-bot/release/2.1.401-UpdateDependencies 
Update coresetup, sdk to preview1-26216-03, servicing-63122-02, respectively (release/2.1.401)
 2018-07-24 11:31:18 -07:00
John Beisner
a47ded2ee2
Merge pull request #9727 from dotnet/merges/release/2.1.4xx-to-release/2.1.401 
Merge release/2.1.4xx to release/2.1.401
 2018-07-24 09:26:58 -07:00
dotnet-maestro-bot
e63a8b5a52 Update coresetup, sdk to preview1-26216-03, servicing-63122-02, respectively 2018-07-23 23:25:16 +00:00
John Beisner
8d1787b24f
Merge pull request #9724 from johnbeisner/Fix4xxBadges 
Fixing build badges for release/2.1.4xx
 2018-07-23 13:13:07 -07:00
jbeisner
b271ad2f59 Fixing build badges for release/2.1.4xx 2018-07-23 19:03:55 +00:00
Nick Guerrera
b9987d2442
Merge pull request #9719 from dotnet/merges/release/2.1.4xx-to-release/2.1.401 
Merge release/2.1.4xx to release/2.1.401
 2018-07-22 18:26:42 -07:00
Nick Guerrera
b0ae60a15b
Merge pull request #9716 from AndyGerlicher/MSBUild-15.8.166 
MSBuild 15.8.166
 2018-07-22 09:24:56 -07:00
Nick Guerrera
d4d996d771
Merge pull request #9714 from dotnet/merges/release/2.1.4xx-to-release/2.1.401 
Merge release/2.1.4xx to release/2.1.401
 2018-07-22 08:01:09 -07:00
Andy Gerlicher
b47915414b MSBuild 15.8.166 2018-07-21 22:10:36 -07:00
Nick Guerrera
fbeb838135
Merge pull request #9710 from brettfo/fsharp-dev15.8 
update F# to 10.2.2-rtm-180720-0
 2018-07-20 18:20:43 -07:00
Brett V. Forsgren
cc7e978bd6 update F# to 10.2.2-rtm-180720-0 2018-07-20 13:52:35 -07:00
Nick Guerrera
e424b949e0
Merge pull request #9703 from dotnet-maestro-bot/release/2.1.4xx-UpdateDependencies 
Update roslyn to beta8-63119-10 (release/2.1.4xx)
 2018-07-20 12:54:02 -07:00
Nick Guerrera
c6931b75f7
Insert roslyn 2.9.0-beta8-63119-10 2018-07-20 10:21:38 -07:00
Nick Guerrera
13d264a275
Merge pull request #9708 from dotnet/merges/release/2.1.4xx-to-release/2.1.401 
Merge release/2.1.4xx to release/2.1.401
 2018-07-20 09:58:35 -07:00
Nick Guerrera
6f5d38734b
Merge pull request #9709 from peterhuene/insert-sdk-4xx 
Update the .NET SDK version.
 2018-07-19 19:50:19 -07:00
Peter Huene
656147725f
Update the .NET SDK version. 
Bump the .NET SDK version following the NuGet insertion.
 2018-07-19 18:34:25 -07:00
Nick Guerrera
b305c20871
Merge pull request #9694 from dotnet/nuget.client.release-4.8.0.5348-2-1 
Insert NuGet Build 4.8.0-rtm.5348 into cli
 2018-07-19 16:03:21 -07:00
dotnet-maestro-bot
3e86b9fb76 Update roslyn to beta8-63119-12 2018-07-19 20:54:13 +00:00
Nick Guerrera
9d07296cd3
Merge pull request #9704 from dotnet/merges/release/2.1.4xx-to-release/2.1.401 
Merge release/2.1.4xx to release/2.1.401
 2018-07-19 10:21:12 -07:00
Kevin Ransom (msft)
7df8a5654f Update FSharp Compiler (#9689) 2018-07-18 17:28:02 -07:00
NuGet Team Bot
fec9b448b6 Insert NuGet Build 4.8.0-rtm.5348 into cli 2018-07-18 15:07:01 -07:00
Nick Guerrera
b72fe967d2
Merge pull request #9682 from dotnet/nguerrera/insert-roslyn 
Insert 15.8 Roslyn into CLI 2.1.400
 2018-07-18 14:36:10 -07:00
Nick Guerrera
6cb14e1821
Merge pull request #9684 from nguerrera/fix-update-dependencies 
Pin stage0 used for update-dependencies to stable 2.1 build
 2018-07-18 14:07:28 -07:00