John Beisner
21f5804dfc
Merge pull request #9822 from dotnet/merges/release/2.1.4xx-to-release/2.1.5xx
...
Merge release/2.1.4xx to release/2.1.5xx
2018-08-14 14:07:26 -07:00
Vagisha Nidhi
ea47700f75
TestPlatform 15.9.0-preview Insertion
2018-08-10 14:32:29 +05:30
Nick Guerrera
6242595613
Fix warnings-as-errors in Linux packaging
2018-08-06 17:55:06 -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
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
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
4c944018e7
Merge branch 'release/2.1.4xx' into updateCompilersTo.10.2.3
2018-07-28 09:00:34 -07:00
Kevin Ransom
a666fa777b
UPDate FSharp Compiler to 10.2.3
2018-07-27 16:52:56 -07:00
dotnet-maestro-bot
a9b8ade6aa
Update roslyn to beta8-63127-03
2018-07-27 21:05:46 +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
175c421c14
Update dotnet/sdk with latest nuget inserted
2018-07-26 15:43:26 -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
dotnet-maestro-bot
e63a8b5a52
Update coresetup, sdk to preview1-26216-03, servicing-63122-02, respectively
2018-07-23 23:25:16 +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
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
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
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
2f40e6dc83
Merge pull request #9685 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
...
Merge release/2.1.4xx to release/2.1.401
2018-07-18 14:06:45 -07:00
Nick Guerrera
5180269487
Insert latest 15.8 Roslyn build that is also in VS (2.9.0-beta8-63115-02)
2018-07-18 13:12:58 -07:00
Nick Guerrera
3a19d2212e
Merge pull request #9673 from mlorbetske/dev/mlorbe/InsertTestPlatformFor158
...
Perform test platform insertion for 15.8
2018-07-18 10:03:50 -07:00
Nick Guerrera
ce2c412a18
Update dotnet/sdk
2018-07-17 18:07:31 -07:00
Nick Guerrera
cdffcec1f1
Merge pull request #9681 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
...
Merge release/2.1.4xx to release/2.1.401
2018-07-17 18:01:04 -07:00
Satya Madala
a88a82734f
Add tests for Code coverage with dotnet test ( #9355 )
...
Add tests for dotnet test --collect "Code Coverage" scenario.
Fixes Microsoft/vstest#981 .
2018-07-17 09:54:10 -07:00
Peter Huene
96140a756d
Merge 'release/2.1.4xx' into release/2.1.401
...
* release/2.1.4xx: (23 commits)
Revert version change for ASP.NET bundled templates.
Update dependency versions to 2.1.2.
Update to ASP.NET Core 2.0.9 build 10031
Updates asp.net versions to match prodcon
Update to aspnet 2.0.9-rtm-10030
Bump runtime versions to 2.0.9 stable
Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1.
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.
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
...
2018-07-17 00:30:18 -07:00
Peter Huene
df6f316da5
Merge branch 'release/2.1.3xx' into release/2.1.4xx
...
* release/2.1.3xx:
Revert version change for ASP.NET bundled templates.
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-16 17:04:27 -07:00
Mike Lorbetske
5fd34dd629
Perform test platform insertion for 15.8
2018-07-16 16:16:40 -07:00
John Beisner
85d732a5a1
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx
2018-07-16 08:17:58 -07:00
John Beisner
d46cddd64d
Merge pull request #9666 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
...
Merge release/2.1.4xx to release/2.1.401
2018-07-16 08:15:39 -07:00
dotnet-maestro-bot
ed629af9a6
Update coresetup, sdk to preview1-26216-03, servicing-63108-01, respectively ( #9635 )
2018-07-13 18:48:13 -07:00
Daniel Plaisted
999e1d1382
Insert updated .NET Core SDK
...
Completes the round-trip of the 4.8.0-preview5.5328 NuGet insertion
2018-07-13 18:11:34 -07:00
Nick Guerrera
6a9870a1bd
Merge pull request #9625 from AndyGerlicher/MSBuild-15.8.155
...
MSBuild 15.8.160-preview
2018-07-13 15:01:20 -07:00
Nick Guerrera
bce49a0686
Merge pull request #9645 from abhishkk/testplatfrominsertion15.8rtm1
...
Test platform insertion 15.8 RTM
2018-07-13 15:00:21 -07:00
Daniel Plaisted
46524ae70a
Merge pull request #9630 from dotnet/nuget.client.release-4.8.0.5328-1-1
...
Insert NuGet Build 4.8.0-preview5.5328 into cli
2018-07-13 13:33:42 -07: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
abhishkk
8f624131f4
test platform insertion 15.8 rtm
2018-07-11 17:08:03 +05:30
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
461fd82844
Update MicrosoftNETCoreAppPackageVersion
2018-07-10 14:13:29 -07:00