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

42 Commits

Author SHA1 Message Date
Ryan Brandenburg b61e9b0125
Remove PubTernal APIs (#22290) 
Remove PubTernal APIs
 2020-06-11 09:21:39 -07:00
Pranav K c87d14afbc
Add nullability to Localization (#22323) 
* Changes to support nullable for ns2.0
* Change ref assembly project to use nullable context
 2020-06-01 11:32:31 -07:00
John Luo c181547864 Migration fixup for Logging.Testing 2020-03-04 22:10:12 -08:00
John Luo 2f6cdcf667 More merge fixes 2020-02-20 21:58:16 -08:00
John Luo 5f52370264 Merge fixes 2020-02-20 18:12:00 -08:00
John Luo 7d1f5d8c0b Updates for extensions migrations 
- Multi-target ObjectPool
- Move Embedded.Manifest.Task.Internal.Entry to the public namespace
- Remove ref assemblies from AspNetCore.Testing
- Skip TestPathUtilitiesTest since it's a pattern we want to migrate away from
- Fix FileProviders.Abstractions version in Embedded.*.nuspec
- Add workarounds for project references to FileProviders.Embedded
 2020-02-20 14:00:29 -08:00
Kevin Pilch 639de3f5f4 Update links for repository move/rename (dotnet/extensions#2840) 
\n\nCommit migrated from 6b493684d9
 2020-01-09 13:39:52 -08:00
Ryan Brandenburg 3ab9051a11 Remove Obsoleted methods for 5.0 (dotnet/extensions#2562) 
Remove Obsoleted methods for 5.0
\n\nCommit migrated from 582427c350
 2020-01-03 09:34:44 -08:00
dotnet-maestro[bot] 29d2fd4576 [master] Update dependencies from dotnet/core-setup dotnet/arcade (dotnet/extensions#2559) 
* Update dependencies from https://github.com/dotnet/arcade build 20191023.3

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19523.3
- Microsoft.DotNet.GenAPI - 5.0.0-beta.19523.3
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19523.3

* Updated ref asssemblies

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

- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19524.4
- NETStandard.Library.Ref - 2.1.0-alpha1.19524.4
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19524.4

Dependency coherency updates

- Microsoft.Win32.Registry - 5.0.0-alpha.1.19524.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha.1.19524.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.DiagnosticSource - 5.0.0-alpha.1.19524.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha.1.19524.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha.1.19524.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 5.0.0-alpha.1.19524.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha.1.19524.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha.1.19524.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha.1.19524.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha.1.19524.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha.1.19524.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha.1.19524.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.Platforms - 5.0.0-alpha.1.19524.14 (parent: Microsoft.NETCore.App.Runtime.win-x64)

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

- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19525.8
- NETStandard.Library.Ref - 2.1.0-alpha1.19525.8
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19525.8

Dependency coherency updates

- Microsoft.Win32.Registry - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.DiagnosticSource - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.Platforms - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)

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

- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19526.2
- NETStandard.Library.Ref - 2.1.0-alpha1.19526.2
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19526.2

Dependency coherency updates

- Microsoft.Win32.Registry - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.DiagnosticSource - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.Platforms - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/arcade build 20191027.3

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19527.3
- Microsoft.DotNet.GenAPI - 5.0.0-beta.19527.3
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19527.3

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

- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19527.2
- NETStandard.Library.Ref - 2.1.0-alpha1.19527.2
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19527.2

Dependency coherency updates

- Microsoft.Win32.Registry - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.DiagnosticSource - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.Platforms - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)

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

- Microsoft.NETCore.App.Ref - 5.0.0-alpha.1.19528.5
- NETStandard.Library.Ref - 2.1.0-alpha.1.19528.5
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha.1.19528.5

Dependency coherency updates

- Microsoft.Win32.Registry - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.DiagnosticSource - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.Platforms - 5.0.0-alpha.1.19525.3 (parent: Microsoft.NETCore.App.Runtime.win-x64)

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

- Microsoft.NETCore.App.Ref - 5.0.0-alpha.1.19530.10
- NETStandard.Library.Ref - 2.1.0-alpha.1.19530.10
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha.1.19530.10

Dependency coherency updates

- Microsoft.Win32.Registry - 5.0.0-alpha.1.19530.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha.1.19530.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.DiagnosticSource - 5.0.0-alpha.1.19530.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha.1.19530.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha.1.19530.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 5.0.0-alpha.1.19530.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha.1.19530.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha.1.19530.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha.1.19530.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha.1.19530.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha.1.19530.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha.1.19530.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.Platforms - 5.0.0-alpha.1.19530.13 (parent: Microsoft.NETCore.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/arcade build 20191031.8

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19531.8
- Microsoft.DotNet.GenAPI - 5.0.0-beta.19531.8
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19531.8
\n\nCommit migrated from fc2a7eadfe
 2019-10-31 22:47:08 +00:00
John Luo 3ef03bf8dc Fix tests and tools 
\n\nCommit migrated from 4bc42dae9c
 2019-09-17 20:52:34 -07:00
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 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
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
John Luo 4e01ec6348 Update ref assemblies and missed updates 
\n\nCommit migrated from 6fc17ec76f
 2019-08-09 15:17:50 -07:00
John Luo 6c66664ae6 Update tfm in master to netcoreap5.0 
\n\nCommit migrated from 3fa337f230
 2019-08-09 15:05:55 -07:00
William Godbe fff0e0a324 Merge branch 'master' into merge/release/3.0-to-master\n\nCommit migrated from 97783282f9 2019-08-09 12:12:06 -07:00
Hisham Bin Ateya 7dfc2fe46b Fix GetResourcePrefix() that causes an issue with using Rootnamespace (dotnet/extensions#2081) 
* Fix GetResourcePrefix() that causes an issue with using Rootnamespace

Update GetResourcePrefix to use baseNamespace to calculate resource prefix rather than assembly name.

Addresses issues aspnet/AspNetCoredotnet/extensions#10639\n\nCommit migrated from 2303aa23dd
 2019-08-08 14:32:48 -07:00
John Luo 95746c596e Multitarget extensions packages to remove dependencies for source build (dotnet/extensions#2090) 
\n\nCommit migrated from 3ec8c35e45
 2019-08-07 13:26:14 -07:00
Ryan Brandenburg 97a039f154 PR feedback 
\n\nCommit migrated from d656c4f7e2
 2019-07-08 14:37:20 -07:00
Ryan Brandenburg 109d388e5e More doc comments 
\n\nCommit migrated from d3cad4c787
 2019-07-08 14:37:20 -07:00
Ryan Brandenburg a61d9b6921 Add some missing doc comments 
\n\nCommit migrated from 238b272238
 2019-07-08 14:37:20 -07:00
Nate McMaster 2dd8eb61ba Disable transitive project references in test projects (dotnet/extensions#1834) 
\n\nCommit migrated from e7d5bea3bb
 2019-06-13 16:27:19 -07:00
Nate McMaster 5868b65934 Use even more Arcade and other csproj cleanups (dotnet/extensions#1833) 
* Use Arcade's convention for setting IsPackable (must be explicitly set)
* Use Arcade conventions for using DebugType and eng/Versions.props
* Remove dead code
* Update restore feeds in daily builds.md
* Disable UsingToolNetFrameworkReferenceAssemblies in analyzer tests
* Remove usage of TestGroupName (an obsolete KoreBuild setting)
* Use IVT as a .csproj attribute

\n\nCommit migrated from f12d709976
 2019-06-12 22:39:41 -07:00
Nate McMaster 3a1330b7ac Enable resx source generation (dotnet/extensions#1635) 
\n\nCommit migrated from ad92508be6
 2019-05-03 12:04:29 -07:00
Kévin Chalet 3e9a592422 Make the generic IStringLocalizer interface covariant (dotnet/extensions#1117) 
Make the generic IStringLocalizer interface covariant
\n\nCommit migrated from 90020a9608
 2019-03-07 15:42:29 -08:00
Ryan Brandenburg 58ea57e63f Obsolete ResourceManagerWithCultureStringLocalizer and WithCulture (dotnet/extensions#1133) 
Obsolete ResourceManagerWithCultureStringLocalizer and WithCulture
\n\nCommit migrated from 924015e98b
 2019-02-20 11:43:55 -08:00
Chris Ross c960040b53 Deprecate and replace IHostingEnvronment & IApplicationLifetime (dotnet/extensions#1100) 
* Deprecate and replace IHostingEnvronment & IApplicationLifetime dotnet/extensions#966
* Fix startvs
* Fix ref generation for obosolete\n\nCommit migrated from 6991e2b0e8
 2019-02-15 13:40:33 -08:00
Pavel Krymets 39b6a19f90 Add reference assembly generations support (dotnet/extensions#1093) 
\n\nCommit migrated from 8ad1395c91
 2019-02-11 12:10:15 -08:00
Kahbazi 070bba8ad4 Add event name in localization\n\nCommit migrated from d2b1ad3d23 2019-01-30 10:03:04 -08:00
Nate McMaster 154ab28e45 Cleanup conversion to Arcade (dotnet/extensions#1014) 
* Remove obsolete targets, properties, and scripts
* Replace IsProductComponent with IsShipping
* Undo bad merge to version.props
* Update documentation, and put workarounds into a common file
* Replace usages of RepositoryRoot with RepoRoot
* Remove API baselines
* Remove unnecessary restore feeds and split workarounds into two files
* Enable PR checks on all branches, and disable autocancel\n\nCommit migrated from f41cfded3c
 2019-01-29 18:34:54 -08:00
Ryan Brandenburg 66773c57bc Use Arcade (dotnet/extensions#586) 
Use arcade
\n\nCommit migrated from f0458995c6
 2019-01-29 13:26:53 -08:00
Nate McMaster ee6763d146 Merge branch 'release/2.2' 
\n\nCommit migrated from 604018cb12
 2019-01-07 16:23:11 -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
Nate McMaster 317b4bb4eb Create README.md for the localization folder (dotnet/extensions#683) 
\n\nCommit migrated from c841b4f9e0
 2018-12-13 09:49:07 -08:00
Nate McMaster a81d3d1b06 Merge the master branch of aspnet/Localization 
\n\nCommit migrated from 622c150de5
 2018-12-04 10:48:40 -08:00
Nate McMaster e7c4b678f9 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@60a3d57a3e8b8b6d69232815a9596b5a495a7d0b
\n\nCommit migrated from b885414e8a
 2018-12-04 10:40:35 -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 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