Extensions: Adding FileProviders and FileSystemGlobbing #33212

maryamariyan · 2020-03-05T05:14:35Z

Initial commits are bulk changes on remaining (upcoming projects) (First 5 commits)
FileSystemGlobbing (6th commit)
FileProviders (7th commit)

Todo on this PR:

For FileSystemGlobbing: Fix packaging error + nit PR feedback changes (8th commit)
For FileProviders.Physical project: Fix test project (commit 11)
Bring over newer commit history from extensions repo
For FileProviders projects (Abstractions/Composite/Physical): add pkg (9th commit)

For upcoming PRs:

Enable remaining packages: Configurations, Hosting, Logging, Options, DependencyInjection
there will be some tasks I'll get to once all projects are building, like:
Adding solutions files
Removing styling and whitespace nit errors skipped using NoWarns (refer to Directory.Build.props diff)
Identifying and removing unused classes (especially in shared/extensions folders)

ericstj · 2020-03-05T20:37:35Z

Fix runtime test error on FileProviders.Physical project

I'm not seeing this?

ericstj · 2020-03-05T20:39:40Z

@steveharter @layomia looks like Json tests timed out here:

  Discovering: System.Text.Json.Tests (method display = ClassAndMethod, method display options = None)
  Discovered:  System.Text.Json.Tests (found 1690 of 1718 test cases)
  Starting:    System.Text.Json.Tests (parallel test collections = on, max threads = 2)
   System.Text.Json.Tests: [Long Running Test] 'System.Text.Json.Serialization.Tests.StreamTests.RoundTripAsync', Elapsed: 00:03:45
   System.Text.Json.Tests: [Long Running Test] 'System.Text.Json.Serialization.Tests.StreamTests.RoundTripAsync', Elapsed: 00:05:45
   System.Text.Json.Tests: [Long Running Test] 'System.Text.Json.Serialization.Tests.StreamTests.RoundTripAsync', Elapsed: 00:07:45
   System.Text.Json.Tests: [Long Running Test] 'System.Text.Json.Serialization.Tests.StreamTests.RoundTripAsync', Elapsed: 00:09:45
   System.Text.Json.Tests: [Long Running Test] 'System.Text.Json.Serialization.Tests.StreamTests.RoundTripAsync', Elapsed: 00:11:45
   System.Text.Json.Tests: [Long Running Test] 'System.Text.Json.Serialization.Tests.StreamTests.RoundTripAsync', Elapsed: 00:13:45

ericstj

sln files?

src/libraries/pkg/descriptions.json

ericstj · 2020-03-05T21:18:08Z

src/libraries/Directory.Build.props

@@ -15,7 +17,7 @@
    <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
    <IsAspNetCoreApp>true</IsAspNetCoreApp>
    <!-- Temporarily ignore nit warning/errors (e.g. extra whitespace) from Extensions projects -->
-    <NoWarn Condition="!$(MSBuildProjectName.EndsWith('.Tests'))">$(NoWarn);SA1129;SA1028;SA1027;SA1121;CA1200</NoWarn>
+    <NoWarn Condition="!$(MSBuildProjectName.EndsWith('.Tests'))">$(NoWarn);SA1129;SA1028;SA1027;SA1121;CA1200;SA1000;CA1507;CA1802;CA1825</NoWarn>


For the curious (like me)
SA1129: DoNotUseDefaultValueTypeConstructor
SA1028: CodeMustNotContainTrailingWhitespace
SA1027: UseTabsCorrectly
SA1121: UseBuiltInTypeAlias
CA1200: Avoid using cref tags with a prefix
SA1000 : KeywordsMustBeSpacedCorrectly
CA1507: Use nameof in place of string
CA1802: Use Literals Where Appropriate
CA1825: Avoid zero-length array allocations

Most of these should be easy to come back and fix at once.

ericstj · 2020-03-05T21:19:21Z

Decide on how to do packaging that has 3 pairs of src/ref projects

Match what extensions did, which should be 1:1 library to package.

eerhardt · 2020-03-05T21:21:25Z

...t.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj

    <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>aspnetcore;validation;options</PackageTags>


Where do these "PackageTags" go now? If we are removing them here, where should it go?

If we wanted to maintain them they'd go in the pkgproj, but we'd need to fix this: https://github.com/dotnet/arcade/blob/ed8c23ff7c4f4988a754ff9afc626571f16e3382/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets#L52

Honestly I don't think they are worth preserving, but I'm happy to hear otherwise if folks feel strongly.

Why do you feel they are not worth preserving? They assist when searching on nuget.org.

Well aspnetcore is not really accurate anymore, and I the other two don't feel very informative (though I could be wrong). My experience with this sort of thing is that folks put stuff there because it was in a template then it gets stale. If on the other hand there was a concerted effort to deliberately set tags and make them meaningful then by all means keep them. It doesn't hurt to just copy all these into the pkgproj for now and we'll fix the bug where they don't make it into nuspec.

@anurse @bradygaster - how much effort/thought went into the existing tags?

I agree we can easily dropp aspnetcore from these. But I'm not so sure about the other tags.

Thought? Almost none ;). Feel free to change them at-will.

src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Properties/InternalsVisibleTo.cs

...s/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj

maryamariyan · 2020-03-05T22:45:05Z

I'm not seeing this?

@ericstj that should show up in next PR

...nsions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj

steveharter · 2020-03-10T14:50:23Z

@steveharter @layomia looks like Json tests timed out here:
System.Text.Json.Tests: [Long Running Test] 'System.Text.Json.Serialization.Tests.StreamTests.RoundTripAsync', Elapsed: 00:13:45

I have not seen a timeout here before.

I looked at the test and it doesn't seem possible to get a hang\deadlock.

The test uses ~.5MB -- is memory low on the hardware?

…lobbing

…nd FileSystemGlobbing

…iders and FileSystemGlobbing

note: will be replaced by GenerateReferenceSource afterwards

from: Resources.resx to Resources\Strings.resx

-- note: in a previous bulk commit, descriptions for FileProviders and FileSystemGlobbing were already added in json file - [ ] TODO: test packaging failed with message: Unable to find description for package Microsoft.Extensions.FileSystemGlobbing (perhaps because it wants to create package for netcoreapp)

- [x] Enable on Directory.Build.props - [x] build ref/src projects and used GenerateReferenceSource - [x] cleanup src csproj properties - [x] set proper targetframeworks TODO - [ ] Add package, 3 projects go in one package - [ ] Fix failing test on M.E.FP.Physical with message: Could not load file or assembly 'Microsoft.Extensions.FileProviders.Abstractions, Version=5.0.0.0

- Fix packaging issue - Remove InternalsVisibleTo in src csproj - Add sln file

- Abstractions - Composite - Physical

Done: [x] bring over more history from extensions repo for - TaskExtensions.cs - ITestCondition.cs - OperatingSystems.cs - OSSkipConditionAttribute.c

...nsions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj

ericstj · 2020-03-12T18:15:27Z

This looks good now. CI is going 📗 🚀

maryamariyan · 2020-03-12T20:31:47Z

Looking over the failing tests on CI, e.g.:

https://helix.dot.net/api/2019-06-17/jobs/013bd288-287d-4930-b113-d44f8ad18523/workitems/Microsoft.Extensions.FileProviders.Physical.Tests/console

maryamariyan · 2020-03-13T02:03:27Z

The remaining failure on the CI is for System.IO.FileSystem.Watcher.Tests
https://github.com/dotnet/runtime/pull/33212/checks?check_run_id=504464776

This should be good to merge

ericstj · 2020-03-13T15:46:30Z

Did you open an issue for the FileSystem.Watcher test failure? Was there one already tracking it?

ericstj · 2020-03-13T15:49:27Z

Here we go: #24181
I've reopened it.

Please make sure you take some action when you observe a failure that isn't caused by your change. That's how we get better 👍

Dotnet-GitSync-Bot added the area-Infrastructure-libraries label Mar 5, 2020

maryamariyan changed the title ~~Extensions: Enable, FileProviders and FileSystemGlobbing~~ Extensions: Adding FileProviders and FileSystemGlobbing Mar 5, 2020

maryamariyan removed the area-Infrastructure-libraries label Mar 5, 2020

maryamariyan force-pushed the fs-globbing branch from bee8a39 to 9132d57 Compare March 5, 2020 07:53

maryamariyan requested review from eerhardt and ericstj March 5, 2020 18:34

ericstj reviewed Mar 5, 2020

View reviewed changes

eerhardt reviewed Mar 5, 2020

View reviewed changes

src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Properties/InternalsVisibleTo.cs Show resolved Hide resolved

eerhardt reviewed Mar 5, 2020

View reviewed changes

...s/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj Show resolved Hide resolved

eerhardt reviewed Mar 5, 2020

View reviewed changes

...s/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj Show resolved Hide resolved

ericstj reviewed Mar 5, 2020

View reviewed changes

...nsions.Configuration.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj Show resolved Hide resolved

jaredpar mentioned this pull request Mar 6, 2020

Error downloading artifacts: could not find end of central directory record #33271

Closed

maryamariyan force-pushed the fs-globbing branch 3 times, most recently from 08edf57 to ec06b61 Compare March 10, 2020 00:10

maryamariyan marked this pull request as ready for review March 10, 2020 10:00

maryamariyan added 8 commits March 11, 2020 14:29

- [x] Bulk update all ref csproj except for FileProviders/FileSystemG…

3fc64b1

…lobbing

- Bulk move Descriptions to json file, all except for FileProviders a…

4424365

…nd FileSystemGlobbing

- Bulk correct test project targetframeworks, all except for FileProv…

77ffeef

…iders and FileSystemGlobbing

- Bulk rename ref cs file and delete the extra duplicates

20b4a94

note: will be replaced by GenerateReferenceSource afterwards

- Bulk move/rename Resources file

358ea71

from: Resources.resx to Resources\Strings.resx

For FileSystemGlobbing:

7d685d4

- Fix packaging issue - Remove InternalsVisibleTo in src csproj - Add sln file

maryamariyan added 3 commits March 11, 2020 14:29

Add packaging for M.E.FileProviders.*:

87a17a7

- Abstractions - Composite - Physical

Switch Reference to ProjectReference in ref proj

aa59a8b

- Removed unnecessary helper files from src project

c1233d6

Done: [x] bring over more history from extensions repo for - TaskExtensions.cs - ITestCondition.cs - OperatingSystems.cs - OSSkipConditionAttribute.c

maryamariyan force-pushed the fs-globbing branch from ec06b61 to c1233d6 Compare March 12, 2020 16:25

ericstj approved these changes Mar 12, 2020

View reviewed changes

Remove ParameterDefaultValue. As It was not needed.

259a0fb

ericstj reviewed Mar 12, 2020

View reviewed changes

...nsions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj Outdated Show resolved Hide resolved

Fix common TestingUtils path

5c1cd5b

ericstj approved these changes Mar 12, 2020

View reviewed changes

Using PlatformSpecific instead of OSSkipCondition

1090288

maryamariyan merged commit 473d6f9 into dotnet:master Mar 13, 2020

maryamariyan added the area-AspNet-Extensions label Mar 13, 2020

maryamariyan added area-Extensions-FileSystem and removed area-Microsoft.Extensions labels Apr 2, 2020

ghost locked as resolved and limited conversation to collaborators Dec 10, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extensions: Adding FileProviders and FileSystemGlobbing #33212

Extensions: Adding FileProviders and FileSystemGlobbing #33212

maryamariyan commented Mar 5, 2020 •

edited

Loading

ericstj commented Mar 5, 2020

ericstj commented Mar 5, 2020

ericstj left a comment

ericstj Mar 5, 2020

ericstj commented Mar 5, 2020

eerhardt Mar 5, 2020

ericstj Mar 5, 2020

ericstj Mar 5, 2020

eerhardt Mar 5, 2020

ericstj Mar 5, 2020

eerhardt Mar 5, 2020

analogrelay Mar 6, 2020

maryamariyan commented Mar 5, 2020

steveharter commented Mar 10, 2020

ericstj commented Mar 12, 2020

maryamariyan commented Mar 12, 2020

maryamariyan commented Mar 13, 2020

ericstj commented Mar 13, 2020

ericstj commented Mar 13, 2020

Extensions: Adding FileProviders and FileSystemGlobbing #33212

Extensions: Adding FileProviders and FileSystemGlobbing #33212

Conversation

maryamariyan commented Mar 5, 2020 • edited Loading

ericstj commented Mar 5, 2020

ericstj commented Mar 5, 2020

ericstj left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ericstj commented Mar 5, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

maryamariyan commented Mar 5, 2020

steveharter commented Mar 10, 2020

ericstj commented Mar 12, 2020

maryamariyan commented Mar 12, 2020

maryamariyan commented Mar 13, 2020

ericstj commented Mar 13, 2020

ericstj commented Mar 13, 2020

maryamariyan commented Mar 5, 2020 •

edited

Loading