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

354 Commits

Author SHA1 Message Date
William Godbe bb08ec9c04 Set IsShipping=false for all TestingUtils projects (dotnet/extensions#2782) 
\n\nCommit migrated from 0743e1c118
 2019-12-12 13:43:49 -08:00
dotnet-maestro-bot 03059afd13 [automated] Merge branch 'release/3.0' => 'release/3.1' (dotnet/extensions#2748) 
* [release/3.0] Update dependencies from dotnet/core-setup (dotnet/extensions#2719)

* Update dependencies from https://github.com/dotnet/core-setup build 20191126.03

- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19576-03

* Update dependencies from https://github.com/dotnet/core-setup build 20191126.05

- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19576-05

* Update dependencies from https://github.com/dotnet/core-setup build 20191126.08

- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19576-08

Dependency coherency updates

- Microsoft.NETCore.Platforms - 3.0.1-servicing.19576.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/arcade build 20191127.5 (dotnet/extensions#2729)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19577.5
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19577.5

* Build implementation projects against ref assemblies

* Add explicit references in tests, where needed
\n\nCommit migrated from d40e21ccc1
 2019-12-04 17:07:43 -08:00
William Godbe ac7a9ed5f0 Merge pull request dotnet/extensions#2712 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 d138822fd4
 2019-11-25 11:07:58 -08:00
William Godbe 824ce85fc4 Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from f63d2552c3 2019-11-25 10:04:47 -08:00
William Godbe db5286c040 Merge pull request dotnet/extensions#2702 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 d4cf58ce16
 2019-11-22 15:59:34 -08:00
William Godbe d13f769dbd Merge pull request dotnet/extensions#2704 from dotnet-maestro-bot/merge/release/2.2-to-release/3.0 
[automated] Merge branch 'release/2.2' => 'release/3.0'\n\nCommit migrated from 1ca47945e6
 2019-11-22 14:20:40 -08:00
William Godbe e936ea2c1c Merge pull request dotnet/extensions#2696 from dotnet-maestro-bot/merge/release/2.1-to-release/2.2 
[automated] Merge branch 'release/2.1' => 'release/2.2'\n\nCommit migrated from 9e2c44b07c
 2019-11-22 12:46:28 -08:00
wtgodbe f7540812ce Merge branchess 
\n\nCommit migrated from 9c6c47ff99
 2019-11-22 12:46:11 -08:00
William Godbe 39273cd311 Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2\n\nCommit migrated from a83df959fc 2019-11-22 11:10:54 -08:00
William Godbe 6619bbe907 Switch to Arcade model for PackageIcon (dotnet/extensions#2663) 
* Switch to Arcade model for PackageIcon

* Update dependencies from Arcade

* Update dependencies from Arcade

* Switch to dotnet-eng
\n\nCommit migrated from cad4d7d0a8
 2019-11-21 12:25:38 -08:00
Brennan 9e9f14cadd Merge pull request dotnet/extensions#2583 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 c8e7e853e8
 2019-10-31 15:52:17 -07:00
Brennan 4df90a03be Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from f9986186bf 2019-10-31 15:32:44 -07:00
Matt Mitchell eda3530092 Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from 388906d290 2019-10-31 13:49:35 -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
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 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 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 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 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 aae216ade2 Unify OS version xunit attributes (dotnet/extensions#2481) 
\n\nCommit migrated from 65e70f58df
 2019-10-09 17:59:08 -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 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 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 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 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
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
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 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