Skip to content

Commit fc1f919

Browse files
TratcherTratcher
authored
Move IFeatureCollection to new Extensions.Features assembly (#32043)
* Move IFeatureCollection to new Extensions.Features assembly * Update src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj * Update Microsoft.Extensions.Features.csproj * Regen props
1 parent 5ec4bfa commit fc1f919

27 files changed

+171
-577
lines changed

‎AspNetCore.sln‎

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -605,8 +605,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.A
605605
EndProject
606606
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Extensions.Tests", "src\Http\Http.Extensions\test\Microsoft.AspNetCore.Http.Extensions.Tests.csproj", "{402C3AC9-1B1D-4523-AB80-A992CEA85F57}"
607607
EndProject
608-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Features.Tests", "src\Http\Http.Features\test\Microsoft.AspNetCore.Http.Features.Tests.csproj", "{C86D97EF-301F-464B-A6B8-DA75BB0DBECE}"
609-
EndProject
610608
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Owin.Tests", "src\Http\Owin\test\Microsoft.AspNetCore.Owin.Tests.csproj", "{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}"
611609
EndProject
612610
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{EB5E294B-9ED5-43BF-AFA9-1CD2327F3DC1}"
@@ -1638,6 +1636,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpLogging.Sample", "src\M
16381636
EndProject
16391637
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests", "src\Servers\Kestrel\Transport.Quic\test\Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Tests.csproj", "{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}"
16401638
EndProject
1639+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Features", "Features", "{17F28812-983E-4415-A55D-842DD7EC6887}"
1640+
EndProject
1641+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Features", "src\Http\Features\src\Microsoft.Extensions.Features.csproj", "{A07D3B13-388B-444F-9E37-DDC0787C4690}"
1642+
EndProject
1643+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Features.Tests", "src\Http\Features\test\Microsoft.Extensions.Features.Tests.csproj", "{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}"
1644+
EndProject
16411645
Global
16421646
GlobalSection(SolutionConfigurationPlatforms) = preSolution
16431647
Debug|Any CPU = Debug|Any CPU
@@ -3472,18 +3476,6 @@ Global
34723476
{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Release|x64.Build.0 = Release|Any CPU
34733477
{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Release|x86.ActiveCfg = Release|Any CPU
34743478
{402C3AC9-1B1D-4523-AB80-A992CEA85F57}.Release|x86.Build.0 = Release|Any CPU
3475-
{C86D97EF-301F-464B-A6B8-DA75BB0DBECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3476-
{C86D97EF-301F-464B-A6B8-DA75BB0DBECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
3477-
{C86D97EF-301F-464B-A6B8-DA75BB0DBECE}.Debug|x64.ActiveCfg = Debug|Any CPU
3478-
{C86D97EF-301F-464B-A6B8-DA75BB0DBECE}.Debug|x64.Build.0 = Debug|Any CPU
3479-
{C86D97EF-301F-464B-A6B8-DA75BB0DBECE}.Debug|x86.ActiveCfg = Debug|Any CPU
3480-
{C86D97EF-301F-464B-A6B8-DA75BB0DBECE}.Debug|x86.Build.0 = Debug|Any CPU
3481-
{C86D97EF-301F-464B-A6B8-DA75BB0DBECE}.Release|Any CPU.ActiveCfg = Release|Any CPU
3482-
{C86D97EF-301F-464B-A6B8-DA75BB0DBECE}.Release|Any CPU.Build.0 = Release|Any CPU
3483-
{C86D97EF-301F-464B-A6B8-DA75BB0DBECE}.Release|x64.ActiveCfg = Release|Any CPU
3484-
{C86D97EF-301F-464B-A6B8-DA75BB0DBECE}.Release|x64.Build.0 = Release|Any CPU
3485-
{C86D97EF-301F-464B-A6B8-DA75BB0DBECE}.Release|x86.ActiveCfg = Release|Any CPU
3486-
{C86D97EF-301F-464B-A6B8-DA75BB0DBECE}.Release|x86.Build.0 = Release|Any CPU
34873479
{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34883480
{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Debug|Any CPU.Build.0 = Debug|Any CPU
34893481
{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -7781,6 +7773,30 @@ Global
77817773
{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x64.Build.0 = Release|Any CPU
77827774
{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x86.ActiveCfg = Release|Any CPU
77837775
{E3DAEBD3-CD36-493F-877F-460E8FFEAC52}.Release|x86.Build.0 = Release|Any CPU
7776+
{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7777+
{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|Any CPU.Build.0 = Debug|Any CPU
7778+
{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|x64.ActiveCfg = Debug|Any CPU
7779+
{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|x64.Build.0 = Debug|Any CPU
7780+
{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|x86.ActiveCfg = Debug|Any CPU
7781+
{A07D3B13-388B-444F-9E37-DDC0787C4690}.Debug|x86.Build.0 = Debug|Any CPU
7782+
{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|Any CPU.ActiveCfg = Release|Any CPU
7783+
{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|Any CPU.Build.0 = Release|Any CPU
7784+
{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|x64.ActiveCfg = Release|Any CPU
7785+
{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|x64.Build.0 = Release|Any CPU
7786+
{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|x86.ActiveCfg = Release|Any CPU
7787+
{A07D3B13-388B-444F-9E37-DDC0787C4690}.Release|x86.Build.0 = Release|Any CPU
7788+
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7789+
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
7790+
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|x64.ActiveCfg = Debug|Any CPU
7791+
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|x64.Build.0 = Debug|Any CPU
7792+
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|x86.ActiveCfg = Debug|Any CPU
7793+
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Debug|x86.Build.0 = Debug|Any CPU
7794+
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
7795+
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|Any CPU.Build.0 = Release|Any CPU
7796+
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|x64.ActiveCfg = Release|Any CPU
7797+
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|x64.Build.0 = Release|Any CPU
7798+
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|x86.ActiveCfg = Release|Any CPU
7799+
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD}.Release|x86.Build.0 = Release|Any CPU
77847800
EndGlobalSection
77857801
GlobalSection(SolutionProperties) = preSolution
77867802
HideSolutionNode = FALSE
@@ -8077,7 +8093,6 @@ Global
80778093
{3957A90B-1DB9-4AA0-A8B8-E7B0B42B0101} = {3D330C1E-D773-4BA8-9E91-123544B0D672}
80788094
{529AB96D-853D-41B4-ABE6-D0DED4A50DFD} = {DCBBDB52-4A49-4141-8F4D-81C0FFFB7BD5}
80798095
{402C3AC9-1B1D-4523-AB80-A992CEA85F57} = {225AEDCF-7162-4A86-AC74-06B84660B379}
8080-
{C86D97EF-301F-464B-A6B8-DA75BB0DBECE} = {BFDD5ACE-A1F0-4C33-8DA1-06CB5CA53177}
80818096
{66ADF274-B5C4-4D0A-91D9-F7FB76ADBF85} = {AA465A56-D9D0-4684-95B0-192F4436C582}
80828097
{EB5E294B-9ED5-43BF-AFA9-1CD2327F3DC1} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
80838098
{4DDE5F1F-B014-4096-9F8B-E5F2C96DF997} = {EB5E294B-9ED5-43BF-AFA9-1CD2327F3DC1}
@@ -8592,6 +8607,9 @@ Global
85928607
{3A1EC883-EF9C-43E8-95E5-6B527428867B} = {022B4B80-E813-4256-8034-11A68146F4EF}
85938608
{908B2263-B58B-4261-A125-B5F2DFF92799} = {022B4B80-E813-4256-8034-11A68146F4EF}
85948609
{E3DAEBD3-CD36-493F-877F-460E8FFEAC52} = {EE9D0952-6060-4723-B329-94A2950A6762}
8610+
{17F28812-983E-4415-A55D-842DD7EC6887} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
8611+
{A07D3B13-388B-444F-9E37-DDC0787C4690} = {17F28812-983E-4415-A55D-842DD7EC6887}
8612+
{09FFBC53-3EFF-45C4-9822-5D66089CD6AD} = {17F28812-983E-4415-A55D-842DD7EC6887}
85958613
EndGlobalSection
85968614
GlobalSection(ExtensibilityGlobals) = postSolution
85978615
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

‎eng/ProjectReferences.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Hosting.WindowsServices" ProjectPath="$(RepoRoot)src\Hosting\WindowsServices\src\Microsoft.AspNetCore.Hosting.WindowsServices.csproj" />
2525
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.Abstractions" ProjectPath="$(RepoRoot)src\Http\Authentication.Abstractions\src\Microsoft.AspNetCore.Authentication.Abstractions.csproj" />
2626
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Authentication.Core" ProjectPath="$(RepoRoot)src\Http\Authentication.Core\src\Microsoft.AspNetCore.Authentication.Core.csproj" />
27+
<ProjectReferenceProvider Include="Microsoft.Extensions.Features" ProjectPath="$(RepoRoot)src\Http\Features\src\Microsoft.Extensions.Features.csproj" />
2728
<ProjectReferenceProvider Include="Microsoft.Net.Http.Headers" ProjectPath="$(RepoRoot)src\Http\Headers\src\Microsoft.Net.Http.Headers.csproj" />
2829
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Http.Abstractions" ProjectPath="$(RepoRoot)src\Http\Http.Abstractions\src\Microsoft.AspNetCore.Http.Abstractions.csproj" />
2930
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Http.Extensions" ProjectPath="$(RepoRoot)src\Http\Http.Extensions\src\Microsoft.AspNetCore.Http.Extensions.csproj" />

‎eng/SharedFramework.Local.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" />
1414
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.DataProtection" />
1515
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.DataProtection.Extensions" />
16-
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Http.Features" />
16+
<AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Features" />
1717
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Metadata" />
1818
<AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Identity.Core" />
1919
<AspNetCoreAppReferenceAndPackage Include="Microsoft.Extensions.Identity.Stores" />
@@ -47,6 +47,7 @@
4747
<AspNetCoreAppReference Include="Microsoft.Net.Http.Headers" />
4848
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Http.Abstractions" />
4949
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Http.Extensions" />
50+
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Http.Features" />
5051
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Http" />
5152
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Routing.Abstractions" />
5253
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Routing" />

‎src/Framework/test/TestData.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ static TestData()
119119
"Microsoft.Extensions.FileProviders.Embedded",
120120
"Microsoft.Extensions.FileProviders.Physical",
121121
"Microsoft.Extensions.FileSystemGlobbing",
122+
"Microsoft.Extensions.Features",
122123
"Microsoft.Extensions.Hosting",
123124
"Microsoft.Extensions.Hosting.Abstractions",
124125
"Microsoft.Extensions.Http",
@@ -251,6 +252,7 @@ static TestData()
251252
{ "Microsoft.Extensions.FileProviders.Embedded", "6.0.0.0" },
252253
{ "Microsoft.Extensions.FileProviders.Physical", "6.0.0.0" },
253254
{ "Microsoft.Extensions.FileSystemGlobbing", "6.0.0.0" },
255+
{ "Microsoft.Extensions.Features", "6.0.0.0" },
254256
{ "Microsoft.Extensions.Hosting", "6.0.0.0" },
255257
{ "Microsoft.Extensions.Hosting.Abstractions", "6.0.0.0" },
256258
{ "Microsoft.Extensions.Http", "6.0.0.0" },

‎src/Http/Http.Features/src/FeatureCollection.cs‎ renamed to ‎src/Http/Features/src/FeatureCollection.cs‎

File renamed without changes.

‎src/Http/Http.Features/src/FeatureReference.cs‎ renamed to ‎src/Http/Features/src/FeatureReference.cs‎

File renamed without changes.

‎src/Http/Http.Features/src/FeatureReferences.cs‎ renamed to ‎src/Http/Features/src/FeatureReferences.cs‎

File renamed without changes.

‎src/Http/Http.Features/src/IFeatureCollection.cs‎ renamed to ‎src/Http/Features/src/IFeatureCollection.cs‎

File renamed without changes.

‎src/Http/Features/src/Microsoft.Extensions.Features.csproj‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>Provides abstractions for a loosly coupled collection of features.
5+
6+
Commonly Used Types:
7+
Microsoft.AspNetCore.Http.Features.IFeatureCollection
8+
Microsoft.AspNetCore.Http.Features.FeatureCollection
9+
</Description>
10+
<TargetFrameworks>$(DefaultNetFxTargetFramework);netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
11+
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
12+
<IsAspNetCoreApp>true</IsAspNetCoreApp>
13+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
14+
<PackageTags>aspnetcore</PackageTags>
15+
<Nullable>enable</Nullable>
16+
</PropertyGroup>
17+
18+
</Project>

‎src/Http/Features/src/PublicAPI.Shipped.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#nullable enable
2+

0 commit comments

Comments
 (0)