huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,010 Commits 1 Branch 0 Tags 251 MiB
Commit Graph

1244 Commits

Author SHA1 Message Date
BrennanConroy 26eecf5d92 Merge release/2.2 to master 2018-10-10 08:57:30 -07:00
Nate McMaster 89866bbbd2
Remove aspnet/WebHooks from building in Universe (#1474) 
Remove the aspnet/WebHooks universe from building with Universe.

This is part of consolidating repos and preparing aspnet/Universe to move into https://github.com/aspnet/AspNetCore
 2018-10-09 15:23:12 -07:00
Nate McMaster cc8cc7b443
Merge branch 'release/2.2' 2018-10-09 13:24:13 -07:00
Nate McMaster 8e13235732
Remove the Proxy submodule (#1471) 
Part of https://github.com/aspnet/AspNetCore/issues/3598 - unifying and reducing repos. Proxy does not ship, so its code will move to aspnet/AspLabs.
 2018-10-09 13:16:03 -07:00
Nate McMaster 050dea3f04
Merge branch 'release/2.2' 2018-10-09 12:14:55 -07:00
Nate McMaster eaad1eb3aa
Remove tasks for analyzing the repo graph (#1469) 
As a part of converging repos, we no longer need this code. It is currently buggy and slow, and we can get away without by hard-coding the repo graph (which rarely changes)
 2018-10-09 12:01:41 -07:00
N. Taylor Mullen 18b61e9217 Revert "Update Roslyn version." 
This reverts commit 70f2d3abd9.
 2018-10-09 11:53:37 -07:00
dotnet-maestro-bot 3cd98acda3 Updating external dependencies (#1464) 2018-10-09 11:33:03 -07:00
N. Taylor Mullen 70f2d3abd9 Update Roslyn version. 
aspnet/Razor#2634
 2018-10-09 11:04:04 -07:00
Pavel Krymets 21b98de09b
Update System.IO.Pipelines to 4.5.2 (#1458) 2018-10-09 10:46:27 -07:00
Arthur Vickers 12761474d3 Rename Cosmos.Sql to Cosmos (#1467) 2018-10-09 10:27:49 -07:00
Nate McMaster 73540ca243
Merge branch 'release/2.2' 2018-10-05 17:06:38 -07:00
Nate McMaster 36f21faecf
Merge branch 'release/2.1' into release/2.2 2018-10-05 17:04:01 -07:00
Nate McMaster 36e462d6f2
Update branding to 2.1.6-servicing (#1455) 
Cleanup the implementation of version.props to make it clearer what the rules are for appending version suffixes, applying updates, etc.
 2018-10-05 16:50:15 -07:00
Stephen Halter 80ba49368b Merge branch 'release/2.2' 2018-10-05 10:43:12 -07:00
Stephen Halter 730564d32b
React to aspnet/Logging#884 (#1450) 2018-10-04 16:53:54 -07:00
Nate McMaster b4fbc1a6e3
Merge branch 'release/2.2' 2018-10-04 16:08:21 -07:00
Nate McMaster b0b65a530a
Support using Internal.AspNetCore.Sdk as an MSBuild SDK (#1452) 
* Add Microsoft.AspNetCore.BuildTools.ApiCheck as an external dependency
* Move the global.json files temporarily to avoid loading the wrong version of Internal.AspNetCore.Sdk
 2018-10-04 11:07:06 -07:00
Nate McMaster 5d261e46ce
Support checked-in global.json files 2018-10-04 09:26:44 -07:00
Nate McMaster ef18c467aa
Merge branch 'release/2.2' 2018-10-02 14:45:17 -07:00
Nate McMaster f2691ee4b6
Add a copy of scripts from dotnet-deb-tool 2.0.0 to this repo (#1442) 
We currently build .deb files using dotnet-deb-tool, which comes from a package feed. We're not completely sure where the source code is for this tool, so this moves the scripts from the dotnet-deb-tool 2.0.0 package into this repo for safe keeping.
 2018-10-02 14:32:12 -07:00
Nate McMaster 18e245ecf0
Merge branch 'release/2.2' 2018-10-01 16:00:30 -07:00
Ryan Nowak efe83ad531 Add Diagnostics.EFCore package 2018-10-01 13:32:42 -07:00
dotnet-maestro-bot aad0f719d5 Upgrade to .NET Core 2.2.0-preview3-27001-02 (#1441) 2018-10-01 13:31:46 -07:00
Nate McMaster 6effb13bbd
Update to .NET Core 2.1.5 2018-09-28 19:39:46 -07:00
Nate McMaster 72cd5eedcf
Prepare the 2.1.6 patch (#1434) 2018-09-28 17:57:33 -07:00
dotnet-maestro-bot 66ba370a0a Update .NET Core to 2.2.0-preview3-26927-02 2018-09-27 16:19:50 -07:00
Nate McMaster 91ad43b5f9
Revert dependencies.props to last known working set (#1420) 2018-09-25 16:54:48 -07:00
Nate McMaster 81d13c3a3a
Revert "Upgrade to .NET Core 3.0.0-preview1-26925-03" 
This reverts commit 5b86cb3408.
 2018-09-25 12:01:45 -07:00
Nate McMaster abbb3a0cd5
Revert "Pin System.ValueTuple to 4.5.0" 
This reverts commit 1497f15339.
 2018-09-25 12:01:42 -07:00
Nate McMaster 1497f15339 Pin System.ValueTuple to 4.5.0 2018-09-25 11:25:37 -07:00
dotnet-maestro-bot 5b86cb3408 Upgrade to .NET Core 3.0.0-preview1-26925-03 2018-09-25 11:25:37 -07:00
Ryan Brandenburg f6ae80842d Revert "Upgrade to .NET Core 3.0.0-preview1-26908-01 (#1396)" 
This reverts commit a31f3db6be.
 2018-09-24 15:57:22 -07:00
Ryan Brandenburg 421e8a71e6
Don't install 2.0 on linux-musl (#1418) 
Don't install 2.0 on linux-musl
 2018-09-24 15:41:15 -07:00
dotnet-maestro-bot a31f3db6be Upgrade to .NET Core 3.0.0-preview1-26908-01 (#1396) 2018-09-24 14:09:55 -07:00
dotnet-maestro-bot b6272f18ab Upgrade to .NET Core 2.2.0-preview3-26924-02 (#1405) 2018-09-24 13:02:07 -07:00
Ryan Brandenburg e70c5713ad Don't repeat System.Memory (#1416) 2018-09-24 13:00:45 -07:00
Ryan Brandenburg 9a1f6c3a4e Try installing in Universe 2018-09-24 10:42:11 -07:00
Ryan Brandenburg 48e66d3d10 Pin System.Memory to 4.5.0 2018-09-20 10:30:57 -07:00
Ryan Brandenburg 9e7c3d6110 Remove duplicate CompilerServicesUnsafe 2018-09-20 10:19:35 -07:00
Peter Marcu bd2c692702 add arm64 sharedfx builds 2018-09-19 18:30:23 -07:00
Brice Lambson 4b615a3a04 Merge branch 'release/2.2' 2018-09-19 09:38:59 -07:00
Brice Lambson 7fb4940258 ⬆️ Update NetTopologySuite.Core to 1.15.1 2018-09-19 09:22:07 -07:00
Matt Mitchell 19eba188f2 Fix merge of 2.1->2.2 2018-09-18 07:43:01 -07:00
Ryan Brandenburg d89160ba83 Merge branch 'merge/release/2.1-to-release/2.2' into release/2.2 2018-09-17 12:18:11 -07:00
Matt Mitchell 3952845c57 Unpin package versions for 2.1.5 2018-09-14 13:10:09 -07:00
Ryan Nowak 9667a94069 Add non-capturing timer sources package 
(cherry picked from commit 1a8616349f)
 2018-09-11 13:09:54 -07:00
Ryan Nowak 1a8616349f Add non-capturing timer sources package 2018-09-11 12:41:48 -07:00
Ryan Brandenburg 4d637de70d Fix merge error 2018-09-11 10:45:52 -07:00
Ryan Brandenburg e13cfd1b28 Merge tag '2.1.4' into release/2.1 2018-09-11 10:43:23 -07:00