Skip to content

Commit b284229

Browse files
author
John Luo
authored
Consume host resolver source package from dotnet/runtime (#22962)
1 parent a861d18 commit b284229

File tree

9 files changed

+9
-234
lines changed

9 files changed

+9
-234
lines changed

eng/Dependencies.props

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ and are generated based on the last package release.
4646
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="$(MicrosoftExtensionsFileProvidersCompositePackageVersion)" />
4747
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" />
4848
<LatestPackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
49+
<LatestPackageReference Include="Microsoft.Extensions.HostFactoryResolver.Sources" Version="$(MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion)" />
4950
<LatestPackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsHostingAbstractionsPackageVersion)" />
5051
<LatestPackageReference Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingPackageVersion)" />
5152
<LatestPackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpPackageVersion)" />

eng/Version.Details.xml

+4
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@
113113
<Uri>https://github.com/dotnet/runtime</Uri>
114114
<Sha>533e9b7dbb5ab9f63e74f95d8cae78171dafc31f</Sha>
115115
</Dependency>
116+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="5.0.0-preview.7.20314.1">
117+
<Uri>https://github.com/dotnet/runtime</Uri>
118+
<Sha>533e9b7dbb5ab9f63e74f95d8cae78171dafc31f</Sha>
119+
</Dependency>
116120
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-preview.7.20314.1">
117121
<Uri>https://github.com/dotnet/runtime</Uri>
118122
<Sha>533e9b7dbb5ab9f63e74f95d8cae78171dafc31f</Sha>

eng/Versions.props

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
<MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-preview.7.20314.1</MicrosoftExtensionsFileProvidersCompositePackageVersion>
9191
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-preview.7.20314.1</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
9292
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-preview.7.20314.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
93+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>5.0.0-preview.7.20314.1</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
9394
<MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-preview.7.20314.1</MicrosoftExtensionsHostingAbstractionsPackageVersion>
9495
<MicrosoftExtensionsHostingPackageVersion>5.0.0-preview.7.20314.1</MicrosoftExtensionsHostingPackageVersion>
9596
<MicrosoftExtensionsHttpPackageVersion>5.0.0-preview.7.20314.1</MicrosoftExtensionsHttpPackageVersion>

src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
<ItemGroup>
1313
<Reference Include="Microsoft.AspNetCore.Hosting" />
1414
<Reference Include="System.IO.Pipelines" />
15-
16-
<Compile Include="$(SharedSourceRoot)HostFactoryResolver\*.cs" />
15+
<Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
1716
</ItemGroup>
1817

1918
</Project>

src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
<Reference Include="Microsoft.AspNetCore.Mvc.Core" />
1818
<Reference Include="Microsoft.Extensions.DependencyModel" />
1919
<Reference Include="Microsoft.Extensions.Hosting" />
20-
21-
<Compile Include="$(SharedSourceRoot)HostFactoryResolver\*.cs" />
20+
<Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
2221
</ItemGroup>
2322

2423
<ItemGroup>

src/Shared/HostFactoryResolver/HostFactoryResolver.cs

-112
This file was deleted.

src/Shared/test/Shared.Tests/HostFactoryResolverTests.cs

-116
This file was deleted.

src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<Compile Include="$(SharedSourceRoot)ClosedGenericMatcher\*.cs" Link="Shared\ClosedGenericMatcher\%(Filename)%(Extension)"/>
1515
<Compile Include="$(SharedSourceRoot)CopyOnWriteDictionary\*.cs" Link="Shared\CopyOnWriteDictionary\%(Filename)%(Extension)"/>
1616
<Compile Include="$(SharedSourceRoot)HashCodeCombiner\**\*.cs" Link="Shared\HashCodeCombiner\%(Filename)%(Extension)"/>
17-
<Compile Include="$(SharedSourceRoot)HostFactoryResolver\**\*.cs" Link="Shared\HostFactoryResolver\%(Filename)%(Extension)"/>
1817
<Compile Include="$(SharedSourceRoot)runtime\*.cs" Link="Shared\runtime\%(Filename)%(Extension)"/>
1918
<Compile Include="$(SharedSourceRoot)runtime\Http2\**\*.cs" Link="Shared\runtime\Http2\%(Filename)%(Extension)"/>
2019
<Compile Include="$(SharedSourceRoot)runtime\Http3\**\*.cs" Link="Shared\runtime\Http3\%(Filename)%(Extension)"/>

src/Tools/GetDocumentInsider/src/GetDocumentInsider.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18+
<Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
1819
<Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
1920
<Compile Include="$(ToolSharedSourceRoot)CommandLine/**/*.cs" />
20-
<Compile Include="$(SharedSourceRoot)HostFactoryResolver\*.cs" />
2121
</ItemGroup>
2222

2323
<Target Name="BuildX86" BeforeTargets="Build" Condition=" '$(TargetFramework)' == 'net461' And '$(Platform)' != 'x86' ">

0 commit comments

Comments
 (0)