Commit Graph

425 Commits

Author SHA1 Message Date
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 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
Doug Bunting 0b6c43082b Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 2c1e058559 2019-10-02 09:58:22 -07:00
William Godbe 25c82efdd3 Merge pull request dotnet/extensions#2411 from dotnet-maestro-bot/merge/release/3.1-to-master
[automated] Merge branch 'release/3.1' => 'master'\n\nCommit migrated from 88641b5021
2019-10-01 10:30:36 -07:00
Doug Bunting bb7ad877a4 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from eea24dd2cd 2019-09-28 23:53:30 -07:00
William Godbe 735b89a399 Merge pull request dotnet/extensions#2413 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 e7d326ec14
2019-09-27 13:52:52 -07:00
wtgodbe fb73cc1d81 Merge branches
\n\nCommit migrated from 9356c2770b
2019-09-27 13:13:49 -07:00
William Godbe 0a35cd7453 Merge pull request dotnet/extensions#2399 from aspnet/Basline
Update package baseline\n\nCommit migrated from af6cec94db
2019-09-27 13:04:08 -07:00
William Godbe 7776687a80 Merge pull request dotnet/extensions#2391 from aspnet/Embedded30
[release/3.0] Switch to embedded package icon\n\nCommit migrated from 2103a95fb3
2019-09-27 13:03:18 -07:00
Doug Bunting 842cb9188d Merge branch 'release/3.1' => 'master' (dotnet/extensions#2408)
\n\nCommit migrated from 1540c1de40
2019-09-26 23:52:00 -07:00
Doug Bunting 9b3c9b28e6 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from caca5e9de9 2019-09-26 22:35:06 -07:00
John Luo 9f3077f991 Merge pull request dotnet/extensions#2407 from dotnet-maestro-bot/merge/release/3.1-to-master
[automated] Merge branch 'release/3.1' => 'master'\n\nCommit migrated from b91b0da524
2019-09-26 11:11:29 -07:00
William Godbe 3033f32683 Merge pull request dotnet/extensions#2401 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 58ef85c0d7
2019-09-26 10:14:38 -07:00
Doug Bunting 788812572c Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from dc61bc52df 2019-09-25 19:21:43 -07:00
Doug Bunting 0d96caa04c Merge branch 'release/3.1' => 'master' (dotnet/extensions#2394)
\n\nCommit migrated from 026865e0bd
2019-09-24 19:50:20 -07:00
Doug Bunting c75cd86d00 Merge branch 'release/3.0' => 'release/3.1' (dotnet/extensions#2393)
\n\nCommit migrated from 8f3288e446
2019-09-24 19:32:25 -07:00
Doug Bunting d5968251b5 Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from 7779efb5ea 2019-09-24 18:52:09 -07:00
Doug Bunting c3c93b242e Merge branch 'release/2.2' => 'release/3.0' (dotnet/extensions#2384)
\n\nCommit migrated from 22097e7b9b
2019-09-24 18:41:52 -07:00
wtgodbe afa62186c6 Add icon metadata to manually generated .nuspecs
\n\nCommit migrated from 224e1104ac
2019-09-24 13:15:12 -07:00
wtgodbe b67cfeab49 Switch to embedded PackageIcon
\n\nCommit migrated from 6acbcb1e6d
2019-09-24 13:15:06 -07:00