diff options
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | build/artifacts.props | 2 | ||||
| -rw-r--r-- | build/buildorder.props | 1 | ||||
| -rw-r--r-- | build/dependencies.props | 3 | ||||
| -rw-r--r-- | build/external-dependencies.props | 3 | ||||
| -rw-r--r-- | build/submodules.props | 1 | ||||
| m--------- | modules/HttpClientFactory | 0 |
7 files changed, 2 insertions, 12 deletions
diff --git a/.gitmodules b/.gitmodules index c0b6f21334..7a76d4a516 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,10 +34,6 @@ path = modules/HttpAbstractions url = https://github.com/aspnet/HttpAbstractions.git branch = release/2.1 -[submodule "modules/HttpClientFactory"] - path = modules/HttpClientFactory - url = https://github.com/aspnet/HttpClientFactory.git - branch = release/2.1 [submodule "modules/HttpSysServer"] path = modules/HttpSysServer url = https://github.com/aspnet/HttpSysServer.git diff --git a/build/artifacts.props b/build/artifacts.props index 00db72258b..717198331b 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -185,8 +185,6 @@ <PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks" Category="noship" /> <PackageArtifact Include="Microsoft.Extensions.Hosting.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Hosting" AllMetapackage="true" AppMetapackage="true" Category="ship" /> - <PackageArtifact Include="Microsoft.Extensions.Http.Polly" AllMetapackage="false" AppMetapackage="false" Category="ship" /> - <PackageArtifact Include="Microsoft.Extensions.Http" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Identity.Core" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Identity.Stores" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.Extensions.Localization.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" /> diff --git a/build/buildorder.props b/build/buildorder.props index d6349662b5..d98dcd526e 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -9,7 +9,6 @@ <ItemGroup> <RepositoryBuildOrder Include="Razor" Order="6" /> <RepositoryBuildOrder Include="HttpAbstractions" Order="6" /> - <RepositoryBuildOrder Include="HttpClientFactory" Order="6" /> <RepositoryBuildOrder Include="Hosting" Order="7" /> <RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" /> <RepositoryBuildOrder Include="HttpSysServer" Order="8" /> diff --git a/build/dependencies.props b/build/dependencies.props index 5f57abaae1..b46e6e7a6c 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -58,6 +58,7 @@ <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>2.1.1</MicrosoftExtensionsFileProvidersPhysicalPackageVersion> <MicrosoftExtensionsFileSystemGlobbingPackageVersion>2.1.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion> <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>2.1.1</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion> + <MicrosoftExtensionsHttpPackageVersion>2.1.1</MicrosoftExtensionsHttpPackageVersion> <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion> <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>2.1.1</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion> <MicrosoftExtensionsLoggingConfigurationPackageVersion>2.1.1</MicrosoftExtensionsLoggingConfigurationPackageVersion> @@ -156,8 +157,6 @@ <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion> <NuGetFrameworksPackageVersion>4.7.0</NuGetFrameworksPackageVersion> <OracleManagedDataAccessPackageVersion>12.2.1100</OracleManagedDataAccessPackageVersion> - <PollyExtensionsHttpPackageVersion>2.0.1</PollyExtensionsHttpPackageVersion> - <PollyPackageVersion>6.0.1</PollyPackageVersion> <RemotionLinqPackageVersion>2.2.0</RemotionLinqPackageVersion> <SeleniumFirefoxWebDriverPackageVersion>0.20.0</SeleniumFirefoxWebDriverPackageVersion> <SeleniumSupportPackageVersion>3.12.1</SeleniumSupportPackageVersion> diff --git a/build/external-dependencies.props b/build/external-dependencies.props index f982ef87be..32846302dd 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -58,6 +58,7 @@ <ExtensionsDependency Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" AllMetapackage="true" AppMetapackage="true" /> <ExtensionsDependency Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" AllMetapackage="true" AppMetapackage="true" /> <ExtensionsDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" /> + <ExtensionsDependency Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpPackageVersion)" AllMetapackage="true" AppMetapackage="true" /> <ExtensionsDependency Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" AllMetapackage="true" AppMetapackage="true" /> <ExtensionsDependency Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(MicrosoftExtensionsLoggingAzureAppServicesPackageVersion)" AllMetapackage="true" /> <ExtensionsDependency Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" AllMetapackage="true" AppMetapackage="true" /> @@ -184,8 +185,6 @@ <ExternalDependency Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonPackageVersion)" /> <ExternalDependency Include="NuGet.Frameworks" Version="$(NuGetFrameworksPackageVersion)" /> <ExternalDependency Include="Oracle.ManagedDataAccess" Version="$(OracleManagedDataAccessPackageVersion)" /> - <ExternalDependency Include="Polly.Extensions.Http" Version="$(PollyExtensionsHttpPackageVersion)" /> - <ExternalDependency Include="Polly" Version="$(PollyPackageVersion)" /> <ExternalDependency Include="Remotion.Linq" Version="$(RemotionLinqPackageVersion)" /> <ExternalDependency Include="Selenium.Firefox.WebDriver" Version="$(SeleniumFirefoxWebDriverPackageVersion)" /> <ExternalDependency Include="Selenium.Support" Version="$(SeleniumSupportPackageVersion)" /> diff --git a/build/submodules.props b/build/submodules.props index 187738b4e0..c93533b4d0 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -58,7 +58,6 @@ <ShippedRepository Include="EntityFrameworkCore" /> <ShippedRepository Include="Hosting" /> <ShippedRepository Include="HttpAbstractions" /> - <ShippedRepository Include="HttpClientFactory" /> <ShippedRepository Include="HttpSysServer" /> <ShippedRepository Include="Identity" /> <ShippedRepository Include="JavaScriptServices" /> diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory deleted file mode 160000 -Subproject cf7cf83ee869ed50a41852f5e880d073386b7fe |