Commit Graph

81 Commits

Author SHA1 Message Date
Nate McMaster ae4f569acc Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from e00628d2f8
2019-06-11 09:24:35 -07:00
dotnet-bot 9bf8f2b9d9 Merge in 'release/2.2' changes
\n\nCommit migrated from 078de340c5
2019-05-06 22:29:20 +00:00
Doug Bunting 90e57d9237 Merge branch 'release/2.1' => 'release/2.2' (dotnet/extensions#1681)
\n\nCommit migrated from 0004308a49
2019-05-06 15:28:41 -07:00
Doug Bunting b5d4b848f3 Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2\n\nCommit migrated from b9968f9c3e 2019-05-06 12:36:12 -07:00
dotnet-bot ff1142ac94 Merge in 'release/2.2' changes
\n\nCommit migrated from a60e75992f
2019-05-05 05:00:57 +00:00
Doug Bunting d8f9dbc26e Merge branch 'release/2.1' => 'release/2.2' (dotnet/extensions#1672)
\n\nCommit migrated from dfa8cfee0e
2019-05-04 22:00:16 -07:00
dotnet-bot ab44b1e154 Merge in 'release/2.2' changes
\n\nCommit migrated from 88db716f07
2019-05-05 03:10:45 +00:00
John Luo 2daa0e934d Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from 3e8c7892f7
2019-05-04 19:11:27 -07:00
dotnet-bot 883d2ce069 Merge in 'release/2.2' changes
\n\nCommit migrated from 130820ce08
2019-05-05 00:06:30 +00:00
dotnet-bot bc84e78cba Merge in 'release/2.2' changes
\n\nCommit migrated from 1ece20b861
2019-04-22 18:19:21 +00:00
Nate McMaster e6b21bc88b Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from 03dcd62e20
2019-04-22 11:04:20 -07:00
dotnet-bot 9844450c42 Merge in 'release/2.2' changes
\n\nCommit migrated from 0fca7b48d0
2019-04-19 05:57:33 +00:00
dotnet-bot 0c72d86acf Merge in 'release/2.2' changes
\n\nCommit migrated from 874cf59e64
2019-04-16 16:34:03 +00:00
Doug Bunting 062961e190 Merge branch 'release/2.1' => 'release/2.2' (dotnet/extensions#1428)
\n\nCommit migrated from d3d329ecf0
2019-04-16 09:33:13 -07:00
Ryan Nowak 3ba58f028f Port fix for dotnet/extensions#1041 to 2.2 (dotnet/extensions#1312)
* Update HealthCheckPublisherOptions.cs

This seems wrong.

Presumably fixes: https://github.com/aspnet/Extensions/issues/1041

(cherry picked from commit dotnet/extensions@b3c88d78fe)

* Update patchconfig.props\n\nCommit migrated from 1301f31b91
2019-04-11 10:30:52 -07:00
Doug Bunting 58fe78d247 Merge branch 'release/2.1' => 'release/2.2' (dotnet/extensions#1380)
\n\nCommit migrated from 76b9183b73
2019-04-09 22:23:55 -07:00
Doug Bunting dd1040f417 Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2\n\nCommit migrated from 7fed0c72ae 2019-04-09 19:08:59 -07:00
Doug Bunting 7cf6c4f949 Merge branch 'release/2.1' => 'release/2.2' (dotnet/extensions#1321)
- mostly [automated]\n\nCommit migrated from ca3e023fe3
2019-03-27 15:51:10 -07:00
Doug Bunting 61ed038b32 Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2\n\nCommit migrated from c24b528392 2019-03-27 15:13:40 -07:00
Doug Bunting 58a2dad1b2 Merge branch 'release/2.1' => 'release/2.2' (dotnet/extensions#1259)
- mostly [automated]\n\nCommit migrated from e2f51bb31a
2019-03-14 22:22:56 -07:00
Doug Bunting 13908cca6a Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from 01e9cf3733
2019-03-14 21:59:20 -07:00
Hao Kung 1bfa807e48 Port config fix to 2.2 (dotnet/extensions#1221)
- port of dotnet/extensions#1202
- with PR tweaks for 2.2
  - e.g. adjust Microsoft.Extensions.Configuration.FunctionalTests.csproj to match layout here
- update PatchConfig.props and NuGetPackageVerifier.json\n\nCommit migrated from 9ebff1a64e
2019-03-14 21:14:45 -07:00
Doug Bunting ec5506c67a Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from 87d7fac6f1
2019-02-04 22:56:10 -08:00
Doug Bunting e35ad6ecc9 Merge branch 'merge/release/2.1-to-release/2.2' of git://github.com/dotnet-maestro-bot/Common into release/2.2
\n\nCommit migrated from 2de0d6658a
2019-02-04 11:47:41 -08:00
Doug Bunting 5b5ff476fc Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from 4a68c56aa6
2019-02-01 11:36:00 -08:00
John Luo 94a37fe030 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from d6f94ed6c6
2019-01-29 15:40:02 -08:00
Nate McMaster 16c7cbba45 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from 6e758d41c1
2019-01-07 15:58:24 -08:00
Nate McMaster 3db4f50eac Remove netcoreapp2.0 test TFMs (dotnet/extensions#907)
.NET Core 2.0 reached EOL last year. This removes multi-targeting our test projects and test assets to only use .NET Core 2.1 and .NET Framework 4.6.1.\n\nCommit migrated from 084494d21d
2019-01-07 15:52:44 -08:00
= 88594035c7 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from fb09315112
2018-12-18 13:05:31 -08:00
Nate McMaster 93b7e57a30 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from 0a705e33a5
2018-12-14 08:43:08 -08:00
Nate McMaster 4fcd97e4d2 Remove Microsoft.Extensions.WebEncoders.Sources
\n\nCommit migrated from e7bb41b9bf
2018-12-13 11:41:24 -08:00
Nate McMaster cb018faf53 Remove Microsoft.Extensions.StackTrace.Sources
\n\nCommit migrated from 1713ada32d
2018-12-13 11:39:54 -08:00
Nate McMaster 01a4a273d7 Remove Microsoft.Extensions.SecurityHelper.Sources
\n\nCommit migrated from c41abe44af
2018-12-13 11:26:34 -08:00
Nate McMaster e0051303d1 Remove Microsoft.Extensions.RazorViews.Sources
\n\nCommit migrated from 3f5df6ddbc
2018-12-13 11:19:00 -08:00
Nate McMaster 921060b2ca Remove Microsoft.Extensions.PropertyActivator.Sources and Microsoft.Extensions.PropertyHelper.Sources
\n\nCommit migrated from 6c11818fe9
2018-12-13 11:15:55 -08:00
Nate McMaster bbf0ebdd91 Remove Microsoft.Extensions.ObjectMethodExecutor.Sources
\n\nCommit migrated from 71a672e287
2018-12-13 11:04:12 -08:00
Nate McMaster 2f36a1ecf9 Remove Microsoft.Extensions.ClosedGenericMatcher.Sources
This code isn't used locally, so it will move to aspnet/AspNetCore
\n\nCommit migrated from 7305817fea
2018-12-13 11:01:34 -08:00
Nate McMaster e8d84a1962 Remove Microsoft.Extensions.CopyOnWriteDictionary.Sources
This code will move to aspnet/AspNetCore
\n\nCommit migrated from 468940be7f
2018-12-13 10:43:02 -08:00
Nate McMaster 2d001bb583 Stop producing Microsoft.AspNetCore.Certificates.Generation.Sources
This was only used in the aspnet/AspNetCore repo. so the source for this project is moving to that repo
\n\nCommit migrated from 9290dc1dbc
2018-12-13 10:37:41 -08:00
Nate McMaster a053c7e1a4 Stop producing Microsoft.Extensions.Process.Sources
This was only used in the aspnet/AspNetCore repo. so the source for this project is moving to that repo
\n\nCommit migrated from 98522c18fb
2018-12-13 10:33:33 -08:00
Pavel Krymets be90f6d4d2 Merge branch 'merge/release/2.1-to-release/2.2' of github.com:dotnet-maestro-bot/Common into merge/release/2.1-to-release/2.2
\n\nCommit migrated from df6cb6e898
2018-12-12 09:27:33 -08:00
Nate McMaster 0ceb90c247 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from a1c28c42e7
2018-12-10 16:44:37 -08:00
Nate McMaster 0b97612ac2 Merge aspnet/Localization release/2.2
\n\nCommit migrated from 54b3e0135d
2018-12-04 10:44:20 -08:00
Nate McMaster 6920d910de Merge branch release/2.1 into release/2.2
\n\nCommit migrated from 909256fb24
2018-12-04 10:43:32 -08:00
Nate McMaster 090119859b Update targets and tasks to build Localization projects
\n\nCommit migrated from 22f5402e13
2018-12-03 16:22:29 -08:00
Nate McMaster cd7daf64a2 Merge source code from aspnet/Localization
\n\nCommit migrated from 9c7e86f4dc
2018-12-03 16:22:15 -08:00
Nate McMaster e5fee282ab Reorganize source code in preparation to move into aspnet/Extensions
Prior to reorganization, this source code was found in https://github.com/aspnet/Localization/tree/dotnet/extensions@0bcac31dd705fb9db60723f5d7eaeffb728358f5
\n\nCommit migrated from c8e0450d7a
2018-12-03 16:17:41 -08:00
Nate McMaster 0c234eee22 Merge HealthChecks API source code from aspnet/Diagnostics
\n\nCommit migrated from 47a4cce17b
2018-11-20 21:07:51 -08:00
Nate McMaster 6dc295b578 Reorganize source code in preparation to move into aspnet/Extensions
Prior to reorganization, this source code was found in https://github.com/aspnet/Diagnostics/tree/dotnet/extensions@c802d5ef5fba1ba8dfbcb8c3741af2ba15e9d1aa
\n\nCommit migrated from a03861270c
2018-11-20 20:49:10 -08:00
Nate McMaster dfa8899da9 Merge branch 'release/2.1' into release/2.2
\n\nCommit migrated from db6dfae60a
2018-11-19 23:18:28 -08:00