Commit Graph

443 Commits

Author SHA1 Message Date
Doug Bunting 4a6f2fdb42 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2532)
- no-op merge\n\nCommit migrated from 02c5fce040
2019-10-18 17:42:37 -07:00
Doug Bunting b0a1d772a6 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 15c86bd2b8 2019-10-18 17:41:37 -07:00
Doug Bunting ea3ca1fb22 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2529)
\n\nCommit migrated from f15f3278c7
2019-10-17 22:17:43 -07:00
Doug Bunting 1fb290164c Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from b55f0f890b 2019-10-17 22:16:51 -07:00
Doug Bunting c543006927 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2517)
- no-op merge\n\nCommit migrated from 3af74ca52b
2019-10-17 10:37:42 -07:00
Doug Bunting 756949d140 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 33a17a7d3e 2019-10-17 10:36:58 -07:00
Doug Bunting 1e214e5714 Merge branch 'release/3.0' => 'release/3.1' (dotnet/extensions#2526)
- no-op merge\n\nCommit migrated from d5bb3dbe20
2019-10-17 10:29:14 -07:00
Doug Bunting 393e4dada9 Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from 301dc0435e 2019-10-17 10:28:39 -07:00
William Godbe 93e9ff312a Merge pull request dotnet/extensions#2510 from dotnet-maestro-bot/merge/release/3.1-to-master
[automated] Merge branch 'release/3.1' => 'master'\n\nCommit migrated from b3a158ac05
2019-10-15 10:03:15 -07:00
Doug Bunting 83deb43064 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 3aed3d5f1d 2019-10-15 09:39:49 -07:00
Pranav K fe782681b4 Make WASM packages stay preview releases in 3.1. (dotnet/extensions#2503)
Fixes https://github.com/aspnet/AspNetCore/issues/14623\n\nCommit migrated from b195e40af5
2019-10-14 15:36:50 -07:00
Doug Bunting 5ae76a5a0b Merge branch 'release/3.1' => 'master' (dotnet/extensions#2509)
\n\nCommit migrated from fe3780f9b7
2019-10-14 10:04:25 -07:00
Doug Bunting 16af860cf5 Merge branch 'release/3.0' => 'release/3.1' (dotnet/extensions#2494)
\n\nCommit migrated from 5a5c71b93a
2019-10-14 09:36:39 -07:00
Doug Bunting 65916b9c31 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2508)
\n\nCommit migrated from 0a6ba7a052
2019-10-14 09:15:29 -07:00
Doug Bunting a8ec741076 Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from d506d7b569 2019-10-14 09:10:43 -07:00
Doug Bunting 7364cfcc56 Regen Microsoft.AspNetCore.Testing ref/ code
- account for xUnit refactoring in 'release/3.1'
\n\nCommit migrated from c6cacd7161
2019-10-13 21:15:18 -07:00
Doug Bunting b6d129dda4 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2493)
- no-op merge\n\nCommit migrated from 1dfe8bc2af
2019-10-12 22:03:52 -07:00
Doug Bunting b8f4d84e6f Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from beb69f0d49 2019-10-12 22:02:48 -07:00
Doug Bunting f706def408 Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from 5bd76469dc 2019-10-12 21:57:07 -07:00
John Luo e6cc170447 Compile using ref assemblies (dotnet/extensions#2483)
* Compile using ref assemblies

* Use updated ResolveReferences.target from AspNetCore

* Generate ref assemblies for .NET framework\n\nCommit migrated from e771c4205f
2019-10-11 03:41:09 -07:00
Doug Bunting edc714354e Merge branch 'release/3.1' => 'master' (dotnet/extensions#2490)
- no-op merge\n\nCommit migrated from 20dbe66079
2019-10-10 21:21:07 -07:00
Doug Bunting 9d2b3c7a16 Merge branch 'release/3.0' => 'release/3.1' (dotnet/extensions#2489)
- no-op merge\n\nCommit migrated from 1c89ed1bbc
2019-10-10 21:04:54 -07:00
Doug Bunting 1b44116ad9 Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from f92c60108b 2019-10-10 21:02:57 -07:00
Chris Ross c94dc7c854 [automated] Merge branch 'release/3.1' => 'master'
\n\nCommit migrated from bae710c8bb
2019-10-09 22:50:32 -07:00
Chris Ross aae216ade2 Unify OS version xunit attributes (dotnet/extensions#2481)
\n\nCommit migrated from 65e70f58df
2019-10-09 17:59:08 -07:00
Ryan Nowak 7c90a7f467 Merge pull request dotnet/extensions#2474 from dotnet-maestro-bot/merge/release/3.1-to-master
[automated] Merge branch 'release/3.1' => 'master'\n\nCommit migrated from 359a08509c
2019-10-07 10:33:11 -07:00
Doug Bunting f823334582 Merge branch 'release/3.0' => 'release/3.1' (dotnet/extensions#2473)
- no-op merge\n\nCommit migrated from faaffa1d5f
2019-10-06 20:20:53 -07:00
Doug Bunting cb5e9e5463 Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from ee73025e68 2019-10-06 20:19:01 -07:00
Doug Bunting 7e3f3c93be Merge branch 'release/3.1' => 'master' (dotnet/extensions#2471)
- no-op merge\n\nCommit migrated from 922af7bc09
2019-10-06 16:34:50 -07:00
Doug Bunting 46c088ff37 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 6720845713 2019-10-06 16:34:10 -07:00
Doug Bunting af3a890269 Merge branch 'release/3.1-preview1' => 'release/3.1' (dotnet/extensions#2470)
\n\nCommit migrated from 2e65c75273
2019-10-06 16:24:22 -07:00
Doug Bunting 3436ce6f2b Merge branch 'release/3.1' into merge/release/3.1-preview1-to-release/3.1\n\nCommit migrated from 9d66ade691 2019-10-06 16:00:19 -07:00
Doug Bunting 4e6d0fa2ea Merge branch 'release/3.1' => 'master' (dotnet/extensions#2468)
- no-op merge\n\nCommit migrated from 478c48ef42
2019-10-06 15:57:08 -07:00
Doug Bunting 8745c27147 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 7b7ffbff7b 2019-10-06 15:56:27 -07:00
Doug Bunting 8bde545b7d Merge branch 'release/3.1-preview1' => 'release/3.1' (dotnet/extensions#2460)
\n\nCommit migrated from d23ed442cb
2019-10-05 22:15:23 -07:00
Doug Bunting 7be3e6ebab Merge branch 'release/3.1' into merge/release/3.1-preview1-to-release/3.1\n\nCommit migrated from 8aa597fe78 2019-10-04 22:20:34 -07:00
Doug Bunting 91be5276e3 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2458)
- no-op merge\n\nCommit migrated from 7d189e5d73
2019-10-04 22:14:29 -07:00
Doug Bunting 1cbe77b931 Merge branch 'release/3.0' => 'release/3.1' (dotnet/extensions#2457)
- no-op merge\n\nCommit migrated from b8185a0c1b
2019-10-04 16:51:08 -07:00
Doug Bunting 008b60cc18 Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from 77cbbf953e 2019-10-04 16:49:29 -07:00
Doug Bunting 79ed025035 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2447)
\n\nCommit migrated from adca9a15cd
2019-10-04 11:49:50 -07:00
Doug Bunting b57ad45b8d Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 457af647b5 2019-10-04 11:20:05 -07:00
Doug Bunting dcbfd4fc78 Merge branch 'release/3.0' => 'release/3.1' (dotnet/extensions#2452)
- no-op merge\n\nCommit migrated from 686387c5c3
2019-10-04 11:10:21 -07:00
Doug Bunting fd8f14b970 Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from aed474eee1 2019-10-04 11:08:43 -07:00
William Godbe 9984073445 Merge pull request dotnet/extensions#2453 from dotnet-maestro-bot/merge/release/3.1-preview1-to-release/3.1
[automated] Merge branch 'release/3.1-preview1' => 'release/3.1'\n\nCommit migrated from 3786f7fb38
2019-10-04 11:07:02 -07:00
William Godbe 2a1be1178a Merge branch 'release/3.1' into merge/release/3.1-preview1-to-release/3.1\n\nCommit migrated from 39d678d625 2019-10-04 10:49:29 -07:00
Chris Ross f31f20e70a Add OSMinVersionAttribute (dotnet/extensions#2449)
\n\nCommit migrated from ddc00c0f2f
2019-10-03 21:03:01 -07:00
William Godbe 8116c35f54 Merge pull request dotnet/extensions#2443 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 11ca600ec2
2019-10-03 10:50:33 -07:00
William Godbe a8cc68a62d Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from 9046a2dd4b 2019-10-03 10:30:38 -07:00
William Godbe 2cad3cc344 Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from 9df988bece 2019-10-03 10:16:26 -07:00
Doug Bunting ab57d18af3 Merge branch 'release/3.1' => 'master' (dotnet/extensions#2433)
- no-op merge\n\nCommit migrated from 8514fcc815
2019-10-02 09:59:07 -07:00