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

291 Commits

Author SHA1 Message Date
Doug Bunting 8d0881794a Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from d65ede7ef1 2019-09-19 12:02:36 -07:00
Javier Calvarro Nelson bcd542a1bb [Infrastructure] Install procdump and capture dumps on build hangs (dotnet/aspnetcore-tooling#1146) 
* Captures process dumps when the build hangs.
* Captures process dumps when a child process hangs inside a test.
\n\nCommit migrated from a9b7e24791
 2019-09-19 18:36:02 +02:00
John Luo 19b84ed7a4 Merge branch 'release/3.1' 
\n\nCommit migrated from 7ff56a9e0d
 2019-09-18 14:03:50 -07:00
John Luo a2081d584f Fix razor tool assembly path (dotnet/aspnetcore-tooling#1138) 
\n\nCommit migrated from 88cd749f38
 2019-09-15 08:05:47 -07:00
Doug Bunting 51ec2760aa Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1\n\nCommit migrated from 683059f2cb 2019-09-14 17:12:43 -07:00
dotnet-maestro[bot] 901f8aa76d [release/3.0] Update dependencies from aspnet/Extensions (dotnet/aspnetcore-tooling#1132) 
* Update dependencies from https://github.com/aspnet/Extensions build 20190913.2

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc2.19463.2
- Microsoft.AspNetCore.Testing - 3.0.0-rc2.19463.2
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc2.19463.2
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc2.19463.2
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-rc2.19463.2
- Microsoft.Extensions.Logging - 3.0.0-rc2.19463.2

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0 (parent: Microsoft.Extensions.Logging)
- System.Reflection.Metadata - 1.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)

* Update dependencies from https://github.com/aspnet/Extensions build 20190913.3

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc2.19463.3
- Microsoft.AspNetCore.Testing - 3.0.0-rc2.19463.3
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc2.19463.3
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc2.19463.3
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-rc2.19463.3
- Microsoft.Extensions.Logging - 3.0.0

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0 (parent: Microsoft.Extensions.Logging)
- System.Reflection.Metadata - 1.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)

* Update dependencies from https://github.com/aspnet/Extensions build 20190913.5

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc2.19463.5
- Microsoft.AspNetCore.Testing - 3.0.0-rc2.19463.5
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc2.19463.5
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc2.19463.5
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-rc2.19463.5
- Microsoft.Extensions.Logging - 3.0.0

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0 (parent: Microsoft.Extensions.Logging)
- System.Reflection.Metadata - 1.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Net.Compilers.Toolset - 3.3.1-beta4-19462-11 (parent: Microsoft.Extensions.Logging)

* Restore test projects prior to running SDK tests (dotnet/aspnetcore-tooling#1078)

* Fix 3.0 tests
\n\nCommit migrated from eaf897c542
 2019-09-14 19:38:15 +00:00
John Luo 1606d9b0d3 Support netcoreapp3.1 TFM (dotnet/aspnetcore-tooling#1122) 
* Support netcoreapp3.1 TFM

* Update branding to preview1

* Skip failing 1.1 test
\n\nCommit migrated from 133b252f09
 2019-09-12 22:02:18 -07:00
Doug Bunting a163dbe04f Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 9aba77ea68 2019-09-11 10:21:21 -07:00
Ajay Bhargav Baaskaran 61726ae9df Restore test projects prior to running SDK tests (dotnet/aspnetcore-tooling#1078) 
\n\nCommit migrated from e6bb507271
 2019-09-10 17:45:59 -07:00
N. Taylor Mullen 4a2e719de2 Merge pull request dotnet/aspnetcore-tooling#1112 from dotnet-maestro-bot/merge/release/3.1-to-master 
[automated] Merge branch 'release/3.1' => 'master'\n\nCommit migrated from b78862dce5
 2019-09-10 10:17:08 -07:00
N. Taylor Mullen 16e93af6b4 Merge pull request dotnet/aspnetcore-tooling#1102 from dotnet-maestro-bot/merge/release/3.1-to-master 
[automated] Merge branch 'release/3.1' => 'master'\n\nCommit migrated from 8f4c2d39ac
 2019-09-09 16:01:34 -07:00
Doug Bunting d18498bf59 Merge branch 'master' into merge/release/3.1-to-master\n\nCommit migrated from 8e60cb9128 2019-08-31 18:17:16 -07:00
William Godbe 3d19bec655 Merge branch 'master' into merge/release/3.0-to-master\n\nCommit migrated from d764ed1025 2019-08-22 15:16:05 -07:00
William Godbe bfc93b0876 Merge pull request dotnet/aspnetcore-tooling#995 from dotnet-maestro-bot/merge/release/3.0-to-master 
[automated] Merge branch 'release/3.0' => 'master'\n\nCommit migrated from 3ed4e87179
 2019-08-22 09:47:17 -07:00
Pranav K ce19e27b00 Retarget to netcoreapp5.0 (dotnet/aspnetcore-tooling#996) 
\n\nCommit migrated from 5908616812
 2019-08-22 08:37:01 -07:00
John Luo d5c2d17c11 Merge pull request dotnet/aspnetcore-tooling#983 from aspnet/johluo/sdk 
Update SDK to preview 8\n\nCommit migrated from 62d5ccbd6a
 2019-08-21 15:42:29 -07:00
William Godbe dd6faf6552 Merge branch 'master' into merge/release/3.0-to-master\n\nCommit migrated from b83bfd1ad1 2019-08-21 13:33:29 -07:00
= 5f7c8d9d74 Apply fix for NuGet warning 
\n\nCommit migrated from fb3187b34f
 2019-08-21 13:30:21 -07:00
Kevin Pilch ad0cf9c6e7 Merge pull request dotnet/aspnetcore-tooling#974 from nguerrera/link-views 
Pass views assembly to linker\n\nCommit migrated from ddb72ebdb1
 2019-08-20 13:58:59 -07:00
Ryan Nowak cb35a0aa40 Reaction to API review changes 
This change updates the snapshot of components APIs used in compiler
tests and updates the tests to react tot hose changes.
\n\nCommit migrated from c8cc588bca
 2019-08-20 08:20:36 -07:00
William Godbe 15cd2afe96 Merge branch 'master' into merge/release/3.0-to-master\n\nCommit migrated from 264f107e73 2019-08-19 09:42:17 -07:00
Nick Guerrera e18cc9a776 Pass views assembly to linker 
1. Re-schedule target to run before linker
2. Add additional linker input item
\n\nCommit migrated from 88b5f29a63
 2019-08-18 23:29:50 -07:00
Doug Bunting 56b51f201e Merge branch 'release/3.0' => 'master' (dotnet/aspnetcore-tooling#977) 
\n\nCommit migrated from 2a2de0bff4
 2019-08-16 21:29:10 -07:00
dotnet-maestro[bot] f757fc2d18 [master] Update dependencies from aspnet/Extensions (dotnet/aspnetcore-tooling#970) 
* Update dependencies from https://github.com/aspnet/Extensions build 20190813.3

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19413.3
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19413.3
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19413.3
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19413.3
- Microsoft.Extensions.NonCapturingTimer.Sources - 5.0.0-alpha1.19413.3
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19413.3

* Update dependencies from https://github.com/aspnet/Extensions build 20190816.10

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19416.10
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19416.10
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19416.10
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19416.10
- Microsoft.Extensions.NonCapturingTimer.Sources - 5.0.0-alpha1.19416.10
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19416.10

Dependency coherency updates

- System.Diagnostics.DiagnosticSource - 5.0.0-alpha1.19409.9 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19411.12 (parent: Microsoft.Extensions.Logging)
- System.Reflection.Metadata - 1.8.0-alpha1.19409.9 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19409.9 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19411.12 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19411.12 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19409.9 (parent: Microsoft.NETCore.App.Runtime.win-x64)

* * React to namespace removal
- a portion of [release/3.0] Update dependencies from aspnet/Extensions (dotnet/aspnetcore-tooling#975)
- w/ thanks to @jkotalik !
\n\nCommit migrated from a988d3e05d
 2019-08-17 03:42:30 +00:00
Ajay Bhargav Baaskaran 2873952822 Set LangVersion the same way as roslyn (dotnet/aspnetcore-tooling#979) 
* Set LangVersion the same way as roslyn

* Update commit link
\n\nCommit migrated from b82d4f9583
 2019-08-15 15:27:12 -07:00
Ajay Bhargav Baaskaran c32e2a5969 Set LangVersion the same way as roslyn (dotnet/aspnetcore-tooling#978) 
* Set LangVersion the same way as roslyn

* Update commit link
\n\nCommit migrated from 7da15da123
 2019-08-15 14:42:21 -07:00
N. Taylor Mullen f3536ca403 Revert "Fix: dotnet/aspnetcore-tooling#11197 automatic backing-field for @ref (dotnet/aspnetcore-tooling#707)" 
This reverts commit dadf9fa.
\n\nCommit migrated from afddfcb49e
 2019-08-15 14:35:26 -07:00
N. Taylor Mullen 9584c7e34f Revert "Fix a bug with ref and declaration phase" 
This reverts commit dotnet/aspnetcore-tooling@09b50151ef.

# Conflicts:
#	src/Razor/test/RazorLanguage.Test/IntegrationTests/ComponentDeclarationIntegrationTest.cs
\n\nCommit migrated from c0e934ed7c
 2019-08-15 14:35:26 -07:00
Pranav K 248326e670 Merge branch 'master' into merge/release/3.0-to-master\n\nCommit migrated from 5eb94ddb0f 2019-08-15 13:37:48 -07:00
dotnet-maestro[bot] 781743fa30 [release/3.0] Update dependencies from aspnet/Extensions (dotnet/aspnetcore-tooling#975) 
* Update dependencies from https://github.com/aspnet/Extensions build 20190815.2

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19415.2
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19415.2
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19415.2
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19415.2
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview9.19415.2
- Microsoft.Extensions.Logging - 3.0.0-preview9.19415.2

Dependency coherency updates

- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Microsoft.Net.Compilers.Toolset - 3.3.0-beta3-19415-01 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/Extensions build 20190814.4

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19414.4
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19414.4
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19414.4
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19414.4
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview9.19414.4
- Microsoft.Extensions.Logging - 3.0.0-preview9.19414.4

* Update dependencies from https://github.com/aspnet/Extensions build 20190815.2

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19415.2
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19415.2
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19415.2
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19415.2
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.0-preview9.19415.2
- Microsoft.Extensions.Logging - 3.0.0-preview9.19415.2

* React to namespace removal
\n\nCommit migrated from 543a1ae2a3
 2019-08-15 20:12:47 +00:00
N. Taylor Mullen 91c0b06d89 Merge pull request dotnet/aspnetcore-tooling#972 from dotnet-maestro-bot/merge/release/3.0-to-master 
[automated] Merge branch 'release/3.0' => 'master'\n\nCommit migrated from 6e349d1786
 2019-08-14 16:58:01 -07:00
Pranav K 778246c674 Add tooling support for TypeScript files to RazorSDK (dotnet/aspnetcore-tooling#971) 
Fixes https://github.com/aspnet/AspNetCore/issues/12840\n\nCommit migrated from 304cafcffe
 2019-08-14 14:22:46 -07:00
dotnet-maestro-bot 8d23c27cb3 [automated] Merge branch 'release/3.0' => 'master' (dotnet/aspnetcore-tooling#968) 
* Give "builder" a less discoverable name

Fixes https://github.com/aspnet/AspNetCore/issues/12991

* Fixup tests

* [Blazor][Fixes dotnet/aspnetcore-tooling#12933] Remove the need for a custom property when resolving static web assets from referenced projects

* Removes the need for a custom property when resolving static web assets from referenced projects
* Rolls in several improvements suggested by the MSBuild folks to improve performance.
\n\nCommit migrated from 112f72da6b
 2019-08-14 16:27:16 +02:00
Javier Calvarro Nelson 70268e7c82 [Blazor][Fixes dotnet/aspnetcore-tooling#12933] Remove the need for a custom property when resolving static web assets from referenced projects 
* Removes the need for a custom property when resolving static web assets from referenced projects
* Rolls in several improvements suggested by the MSBuild folks to improve performance.\n\nCommit migrated from 5335245b08
 2019-08-14 15:59:44 +02:00
Pranav K 2317fc9687 Fixup tests 
\n\nCommit migrated from 5707808e9f
 2019-08-13 12:39:55 -07:00
Pranav K 80d6dfea89 Give "builder" a less discoverable name 
Fixes https://github.com/aspnet/AspNetCore/issues/12991
\n\nCommit migrated from 7e974693b6
 2019-08-13 12:39:55 -07:00
Pranav K 32196f8023 Use globally qualified type name when generating TypeInference (dotnet/aspnetcore-tooling#946) 
The code-generated TypeInference type resides in a custom namespace.
Any types that it refers to in user code must be qualified using the "global::" prefix
to avoid type \ namespace conflicts.

Fixes https://github.com/aspnet/AspNetCore/issues/12116\n\nCommit migrated from f0e09e4a97
 2019-08-13 12:35:37 -07:00
Ajay Bhargav Baaskaran 7e8807ae64 Print warning when reference assembly is not found (dotnet/aspnetcore-tooling#953) 
* Print warning when reference assembly is not found

* Added test
\n\nCommit migrated from d8a5e39739
 2019-08-12 21:30:22 -07:00
Ajay Bhargav Baaskaran 2abbff5b3b Don't coalesce <option> tag in ComponentMarkupBlockPass 
\n\nCommit migrated from 728a7230b0
 2019-08-12 09:10:09 -07:00
Ajay Bhargav Baaskaran 7fc5972613 Fix @inject intellisense (dotnet/aspnetcore-tooling#949) 
* Fix @inject intellisense

* update
\n\nCommit migrated from d953ec40c3
 2019-08-09 13:13:18 -07:00
N. Taylor Mullen 88a002a918 Enable Component parameter delegates to not require @() at design time. 
- The core issue is that the Razor parser splits attribute values based on whitespace. Therefore, when it encounters `@onclick="() => Foo()"` it breaks it into three different tokens based on the spaces involved. This separation results in multiple adjacent classified spans for C# which is currently unsupported by WTE due to multiple seams overlapping. All that being said we have the opportunity to be smarter when generating attribute values that we feel can be simplified or collapsed; because of this in this PR I changed the `TagHelperBlockRewriter` phase to understand "simple" collapsible blocks and to then collapse them. In the future a goal would be to take a collapsing approach to all potential attributes and then to re-inspect each token individually at higher layers in order to decouple our TagHelper phases from what the parser initially parses.
- Added an integration and parser test to validate the new functionality. Most of the testing is from the fact that no other tests had to change because of this (it doesn't break anything).
- Added a new SyntaxNode method `GetTokens` that flattens a node into only its token representation.

aspnet/AspNetCoredotnet/aspnetcore-tooling#11826
\n\nCommit migrated from 80f1bc76a4
 2019-08-07 10:57:52 -07:00
Pranav K 56a440ec9d Make launchSettings.json a content item that does not get copied to b… (dotnet/aspnetcore-tooling#928) 
* Make launchSettings.json a content item that does not get copied to build or publish directory

Fixes https://github.com/aspnet/AspNetCore/issues/12841

\n\nCommit migrated from d0dc8140e2
 2019-08-06 13:00:16 -07:00
Pranav K 2699268bc3 Prevent StackOverflows when assemblies have recursive references (dotnet/aspnetcore-tooling#901) 
* Prevent StackOverflows when assemblies have recursive references

https://github.com/aspnet/AspNetCore/issues/12693

\n\nCommit migrated from 43776c1864
 2019-08-05 09:19:26 -07:00
Ryan Nowak 7312e7cc38 Move RenderTreeBuilder to another castle 
Don't even try to review this xD

This change moves RenderTreeBuilder to the .Rendering namespace and then
updates literally every component baseline.
\n\nCommit migrated from aa8624f46e
 2019-08-04 20:43:21 -07:00
Pranav K f31e951f5d Fixup test 
\n\nCommit migrated from 5eb86992f4
 2019-08-03 17:29:13 -07:00
Pranav K a202e6cfa6 Update 
\n\nCommit migrated from 98d9bda3a2
 2019-08-03 16:59:08 -07:00
N. Taylor Mullen e2d476cc6f Associate C# version with each Razor extension version. 
- Roslyn now default to 8.0 C# so it's no longer specified in a users project file. Because of this restriction we can no longer see the projects `LangVersion` when generating Razor files. Meaning, we can't conditionally generate C# 8.0 aware code because our Razor default is not C# 8.0. Therefore, when we detect that the C# lang version hasn't been provided we don't set a C# version and instead rely on what the default configuration for the Razor project is. In practice this looks like:
  - MVC1.X = C# 7.3
  - MVC2.X = C# 7.3
  - MVC Latest = C# 8.0
- I thought about adding a feature flags variant for `RazorCodeGenerationOptions` but decided not to since C# features are all configurable options that are based on more than just the `RazorLangVersion`.
- Added integration tests to ensure that command line builds with implicit `LangVersion`s result in proper C# nullability handling.

aspnet/AspNetCoredotnet/aspnetcore-tooling#12594
\n\nCommit migrated from f039aa9354
 2019-08-02 17:14:10 -07:00
Pranav K 9d594e41c5 Make launchSettings.json a content item that does not get copied to build or publish directory 
Fixes https://github.com/aspnet/AspNetCore/issues/12841
\n\nCommit migrated from 34628d3066
 2019-08-02 12:15:23 -07:00
Ajay Bhargav Baaskaran 6ad8b96f3e Don't fail the build on warnings (dotnet/aspnetcore-tooling#922) 
* Don't fail the build on warnings

* update

* update
\n\nCommit migrated from 450a780f40
 2019-08-01 13:16:33 -07:00
N. Taylor Mullen ccf56256d9 Add support for non-numeric CSharpLanguageVersions. 
- We would default to improper C# language versions when given non-numeric `LangVersion`s. For instance when given `CSharpLanguageVersion.Latest` we'd default to 7.3 which was inconsistent with how the rest of the C# world functioned.
- Added a test.

aspnet/AspNetCoredotnet/aspnetcore-tooling#11139
\n\nCommit migrated from a08d0b0673
 2019-07-31 11:06:52 -07:00