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

359 Commits

Author SHA1 Message Date
John Luo 10bf263a3f Merge branch 'release/3.1' 
\n\nCommit migrated from 785e2b0905
 2019-09-17 15:12:01 -07:00
John Luo 99bf7f0b56 Update ref assembly generation to use DefaultNetCoreTargetFramework property (dotnet/extensions#2362) 
\n\nCommit migrated from d15c5687db
 2019-09-17 14:35:45 -07:00
John Luo 6371d93d18 Update ref assembly generation to use DefaultNetCoreTargetFramework property (dotnet/extensions#2359) 
\n\nCommit migrated from 1f41bdc386
 2019-09-17 11:17:34 -07:00
John Luo 68f3765e6d Fix packing on *nix systems (dotnet/extensions#2344) 
- Without this fix, the nupkg will be missing files if packed on *nix systems\n\nCommit migrated from 51e8af72d5
 2019-09-16 15:17:32 -07:00
Doug Bunting 3101ce50ec Merge branch 'release/3.0' => 'release/3.1' (dotnet/extensions#2351) 
- no-op merge\n\nCommit migrated from 2db96ea772
 2019-09-13 21:14:24 -07:00
Doug Bunting 7a7845d71b Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from e411c3dcd3 2019-09-13 21:13:33 -07:00
Matt Mitchell 0c023fcc67 Merge pull request dotnet/extensions#2337 from dotnet-maestro-bot/merge/release/3.0-to-release/3.1 
[automated] Merge branch 'release/3.0' => 'release/3.1'\n\nCommit migrated from 47a9c6c0f5
 2019-09-13 15:02:44 -07:00
Matt Mitchell fcc6fd382c Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from 7b0de30a97 2019-09-13 14:34:34 -07:00
John Luo fd2033e5d5 Support netcoreapp3.1 TFM (dotnet/extensions#2336) 
* Support netcoreapp3.1 TFM

* Unpin SDK for source build

* Update to preview1 branding
\n\nCommit migrated from 32cc8162ff
 2019-09-12 22:34:52 -07:00
Doug Bunting 9ca2a77261 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2335) 
- new Arcade\n\nCommit migrated from cb42bbb3bd
 2019-09-11 22:44:47 -07:00
Doug Bunting 570269e42b Merge branch 'release/3.1' => 'master' (dotnet/extensions#2327) 
- no-op merge\n\nCommit migrated from c0f053cfcc
 2019-09-11 10:35:13 -07:00
Doug Bunting f1c5e2302c Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 87c5098992 2019-09-11 10:32:23 -07:00
John Luo a91e75b73d Merge pull request dotnet/extensions#2322 from dotnet-maestro-bot/merge/release/3.1-to-master 
[automated] Merge branch 'release/3.1' => 'master'\n\nCommit migrated from 0cb268a6cd
 2019-09-09 09:47:09 -07:00
Doug Bunting 1b3f701272 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2321) 
- no-op merge\n\nCommit migrated from 443dd437b2
 2019-09-09 07:23:05 -07:00
Doug Bunting 3f632710c5 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from d53d4f44a3 2019-09-09 07:22:25 -07:00
Doug Bunting cbcaa1423b Merge branch 'release/3.1' => 'master' (dotnet/extensions#2312) 
- no-op merge\n\nCommit migrated from f3fe8566c8
 2019-09-08 12:21:41 -07:00
Doug Bunting e07c07830c Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 616cf49130 2019-09-08 12:20:51 -07:00
Doug Bunting 9c4fb0a39d Merge branch 'release/3.1' => 'master' (dotnet/extensions#2307) 
- new Arcade\n\nCommit migrated from c6ff169f1d
 2019-09-07 12:38:57 -07:00
Doug Bunting 65420cb265 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2306) 
- no-op merge\n\nCommit migrated from f0aee8e548
 2019-09-07 12:10:18 -07:00
Doug Bunting 6dfbf65289 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from bb039a1743 2019-09-07 12:09:10 -07:00
Doug Bunting 91ceca14ec Merge branch 'release/3.1' => 'master' (dotnet/extensions#2298) 
- no-op merge\n\nCommit migrated from f2faab6a76
 2019-09-06 22:09:15 -07:00
John Luo 18f1833adc Merge pull request dotnet/extensions#2294 from dotnet-maestro-bot/merge/release/3.1-to-master 
[automated] Merge branch 'release/3.1' => 'master'\n\nCommit migrated from 75f60338c7
 2019-09-06 14:48:08 -07:00
John Luo 98d420987c Merge pull request dotnet/extensions#2292 from dotnet-maestro-bot/merge/release/3.1-to-master 
[automated] Merge branch 'release/3.1' => 'master'\n\nCommit migrated from 5ccc6c2c84
 2019-09-06 14:28:25 -07:00
John Luo 64940808dc Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 1e175e491e 2019-09-06 13:48:42 -07:00
Doug Bunting 3cdf52da23 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2284) 
\n\nCommit migrated from ecc4d9fe93
 2019-09-05 19:39:33 -07:00
Doug Bunting cdb5f53e6d Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 20abf0a561 2019-09-05 15:23:34 -07:00
Doug Bunting 02d01599e4 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2277) 
- no-op merge\n\nCommit migrated from e4ff9650f6
 2019-09-05 07:13:32 -07:00
Doug Bunting 434836a3f7 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from b9f62478bd 2019-09-05 07:12:52 -07:00
Doug Bunting 75ad268599 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2270) 
- new Arcade\n\nCommit migrated from c2147ae6a0
 2019-09-03 09:54:45 -07:00
Doug Bunting e4ba9f5855 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2264) 
- no-op merge\n\nCommit migrated from 3f880fdd5a
 2019-08-31 21:28:04 -07:00
Doug Bunting fc33e58c38 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 2220e1a33a 2019-08-31 21:26:46 -07:00
Doug Bunting 0e476186b1 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2261) 
- brings new Microsoft.Data.SqlClient version\n\nCommit migrated from 3347747a56
 2019-08-31 18:07:24 -07:00
Doug Bunting 3054a5a1e1 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from d838533368 2019-08-30 12:44:13 -07:00
Leandro López b4304367f9 Fix typo\n\nCommit migrated from 6df967b79a 2019-08-29 09:45:40 -07:00
Doug Bunting 7caa7ceb1c Merge branch 'release/3.1' => 'master' (dotnet/extensions#2256) 
- no-op merge\n\nCommit migrated from 04a22bf2a9
 2019-08-29 08:29:20 -07:00
Doug Bunting be40d17f00 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 5dbc6099e8 2019-08-29 08:28:26 -07:00
Doug Bunting f00b187037 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2249) 
- no-op merge\n\nCommit migrated from b7f895d876
 2019-08-28 16:11:52 -07:00
Doug Bunting 202f3dcf3e Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from f8ba70000e 2019-08-28 16:10:56 -07:00
Brennan d1c96d1175 Merge pull request dotnet/extensions#2246 from dotnet-maestro-bot/merge/release/3.0-to-master 
[automated] Merge branch 'release/3.0' => 'master'\n\nCommit migrated from fb7fdf5550
 2019-08-28 09:34:49 -07:00
Brennan 4643c8f350 Fix FlakyAttribute (dotnet/extensions#2245) 
\n\nCommit migrated from 1983ee879c
 2019-08-28 09:10:43 -07:00
Doug Bunting d3ea1cca49 Merge branch 'release/3.0' => 'master' (dotnet/extensions#2242) 
\n\nCommit migrated from 94422985a1
 2019-08-28 08:18:53 -07:00
Doug Bunting f90eabec2f Merge branch 'master' into merge/release/3.0-to-master\n\nCommit migrated from ae3a22bf23 2019-08-28 07:22:36 -07:00
Brennan 72dc1409d6 Fix ConditionalFact and ConditionalTheory (dotnet/extensions#2241) 
\n\nCommit migrated from ae9d51ffeb
 2019-08-27 19:41:44 -07:00
Pranav K c6911ce70d Merge pull request dotnet/extensions#2240 from dotnet-maestro-bot/merge/release/3.0-to-master 
[automated] Merge branch 'release/3.0' => 'master'\n\nCommit migrated from d8590b1c03
 2019-08-27 19:33:46 -07:00
Kevin Pilch e1974283f0 Add XML Docs for pubternal types 
\n\nCommit migrated from 033ea04bab
 2019-08-27 13:43:50 -07:00
William Godbe 7c22001f22 Merge pull request dotnet/extensions#2239 from dotnet-maestro-bot/merge/release/3.0-to-master 
[automated] Merge branch 'release/3.0' => 'master'\n\nCommit migrated from 12a28e4d3b
 2019-08-27 10:23:14 -07:00
William Godbe 428d6822ca Merge branch 'master' into merge/release/3.0-to-master\n\nCommit migrated from 7f4859e0fe 2019-08-27 10:08:27 -07:00
Doug Bunting 3c62e19ee3 Merge branch 'release/3.0' => 'master' (dotnet/extensions#2233) 
- brings newer Arcade\n\nCommit migrated from 4afab35c0e
 2019-08-26 09:11:31 -07:00
Doug Bunting 57b356e533 Merge branch 'master' into merge/release/3.0-to-master\n\nCommit migrated from 3940ade37c 2019-08-26 07:27:53 -07:00
Doug Bunting 5c9080a4e9 Merge branch 'release/3.0' => 'master' (dotnet/extensions#2229) 
- no-op merge\n\nCommit migrated from 39d5064a04
 2019-08-24 16:25:49 -07:00