Commit graph

9459 commits

Author SHA1 Message Date
John Beisner
e36c3f7c69
Merge pull request #45 from johnbeisner/FixPublishVersionFileTarget
The target: PublishVersionFile fails to fire
2018-08-07 11:14:16 -07:00
Rick Anderson
c2613ba815
Update README.md
Per MS style guide, "Avoid please except in situations where the customer is asked to do something inconvenient or the application or site is to blame for the situation."
2018-08-07 10:52:34 -07:00
jbeisner
1537818815 The target: "PublishVersionFile" fails to fire as it is pinned to [line 30] AfterTargets="Publish" and [line 118] BeforeTargets="Publish" 2018-08-07 17:38:24 +00:00
John Beisner
0723a8e059
Merge pull request #44 from johnbeisner/UpdateToolsetVersion
Update Toolset version to 3.0.100-alpha1-009349
2018-08-06 15:58:16 -07:00
jbeisner
1262aac3b5 Update Toolset version to 3.0.100-alpha1-009349 2018-08-06 22:29:19 +00:00
Daniel Plaisted
aefa774938
Merge pull request #43 from dsplaisted/fix-update-dependencies
Fix update-dependencies script
2018-08-06 13:34:37 -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
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
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
Nick Guerrera
d6d0130942 Fix test issues 2018-07-30 17:49: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
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
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
jbeisner
ba08432b35 Temporarily disable tests: 'GivenNewCommandItDisplaysCompletions', 'TestSdkRpm', and 'TestSdkDeb' 2018-07-26 21:48:10 +00:00
Matt Mitchell
704de4cd4f Update README table with new info: (#33)
* Update README table with new info:
- Package feed per release.  For prodcon builds (2.2 and 2.1.x) this will eventually point to a stable prodcon feed but this isn't generated yet.
- Add links to repo shas for prodcon builds
- Remove 2.1.3xx and add 2.1.401 instead.
- Fix badges for Nix OS's

* Attempt to remove scrollbar
* Fix the 'badge' links
* Fixing the badge link structure.
2018-07-24 09:35:58 -07:00
John Beisner
8d75cf1300
Merge pull request #9728 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-24 09:27:21 -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
63747aaba1
Merge pull request #9720 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-22 18:27:13 -07:00
Nick Guerrera
b7c3d77d77
Merge pull request #9715 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-22 10:30:18 -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
fb7a22a989
Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-22 08:02:02 -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
4a5ca22662
Merge pull request #9707 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-20 11:33:28 -07:00
Daniel Plaisted
5379573360
Merge pull request #34 from crummel/resolvePackageDependenciesBeforePublish
Add dependency for restoring packages before trying to find Microsoft.NETCore.DotNetAppHost package.
2018-07-20 10:40:07 -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
Nick Guerrera
0304b4ec0d
Merge pull request #9697 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-19 10:21:56 -07:00
Nick Guerrera
c45905a1c9
Merge pull request #9695 from johnbeisner/FixRPMInstallErrors
Fix RPM install errors; CLI:release/2.2.1xx
2018-07-18 21:56:36 -07:00
Nick Guerrera
d71eb98fde
Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-18 21:52:01 -07:00
William Li
96636458e5
Passing _NETCoreAppPackageVersion as BundledNETCoreAppPackageVersion(#9702) 2018-07-18 21:18:27 -07:00
Chris Rummel
5fab2468f5
Add dependency for restoring packages before trying to find Microsoft.NETCore.DotNetAppHost package.
This appears to be a difference between the 2.2.0-preview SDK currently
being used in core-sdk and the 2.1.401-preview SDK currently being used
in source-build.  In the 2.2.0 SDK, this target happens to run before
the resolved package list is used, but in the 2.1.401 it is not, so I
added the explicit dependency (doesn't affect anything in the 2.2.0 SDK).
2018-07-18 21:04:14 -05:00
Kevin Ransom (msft)
7df8a5654f Update FSharp Compiler (#9689) 2018-07-18 17:28:02 -07:00
jbeisner
2fc95c3efa Use "SharedFxRpmPackageFileVersion" for the SharedFxRpmPackageName 2018-07-18 22:52:57 +00:00
NuGet Team Bot
fec9b448b6 Insert NuGet Build 4.8.0-rtm.5348 into cli 2018-07-18 15:07:01 -07:00