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
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
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
dotnet-maestro-bot
a9b8ade6aa
Update roslyn to beta8-63127-03
2018-07-27 21:05:46 +00: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
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
b0ae60a15b
Merge pull request #9716 from AndyGerlicher/MSBUild-15.8.166
...
MSBuild 15.8.166
2018-07-22 09:24:56 -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
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
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
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
69b727745a
Pin stage0 in update-dependencies.sh
2018-07-18 10:51:40 -07:00
Nick Guerrera
f58902c0d7
Pin stage0 used for update-dependencies to stable 2.1 build
2018-07-18 10:15:37 -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
8578825de1
Merge pull request #9683 from dotnet/nguerrera/update-sdk
...
Update dotnet/sdk [2.1.4xx]
2018-07-18 10:03:28 -07:00
Nick Guerrera
ce2c412a18
Update dotnet/sdk
2018-07-17 18:07:31 -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
05d4305fbe
Merge pull request #9674 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
...
Merge release/2.1.3xx to release/2.1.4xx
2018-07-17 00:17: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
e0b2c83a80
Merge pull request #9641 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
...
Merge release/2.1.3xx to release/2.1.4xx
2018-07-16 12:24:18 -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
Nick Guerrera
51728a9594
Merge pull request #9663 from dsplaisted/insert-sdk
...
Insert updated dotnet/sdk
2018-07-13 19:43:14 -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
Peter Huene
38a94f824e
Merge pull request #9653 from v-zbsail/loc_20180711_release_2.1.4xx
...
LOC CHECKIN | dotnet/cli release/2.1.4xx | 20180712
2018-07-13 13:49:37 -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
John Beisner
58d141a378
Merge pull request #9634 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
...
Merge release/2.1.2xx to release/2.1.3xx
2018-07-12 16:00:43 -07:00
Peter Huene
b483d9b4f3
Fix test failure due to smart quotes.
...
Replacing the smart quotes in the translation with `"` to fix a test failure.
This is the only translation for the `DotnetCliHomeUsed` key containing the
smart quotes.
2018-07-12 14:23:18 -07:00
Peter Huene
3bdb615439
Fix translations for latest changes in release/2.1.4xx.
...
Unfortunately, a change went in after the loc deadline that reverted a previous
change to `src/dotnet/commands/dotnet-publish/LocalizableStrings.resx`. The
change was to put back the `SelfContainedOptionDescription` key.
Because translation occurred without this key in the resx file, so simply running
the `UpdateXlf` target would cause `SelfContainedOptionDescription` to show up
as "new" without any translations.
I've manually fixed the translations for this key to restore the previous
translation state, which was "needs review" because of small changes that were
made to the string much earlier in 2.1.4xx development. This way at least the
old translations which are only slightly out of date are restored, rather than
having no translations at all.
2018-07-12 13:11:42 -07:00
Zbyněk Sailer
dba04728cb
LOC CHECKIN | dotnet/cli release/2.1.4xx | 20180712
2018-07-12 16:38:31 +02:00