diff --git a/build/dependencies.props b/build/dependencies.props index 76c06fbdceb6936b7ce53c31c3ce0972310643ce..4f714281efbf99930964c2a410687c94c442d19e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,8 +2,13 @@ <!-- These package versions may be overridden or updated by automation. --> <PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' "> <!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. --> +<<<<<<< HEAD <MicrosoftNETCoreAppPackageVersion>2.1.5-servicing-26906-03</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.5-servicing-26906-03</MicrosoftNETCoreDotNetAppHostPackageVersion> +======= + <MicrosoftNETCoreAppPackageVersion>2.1.3-servicing-26722-02</MicrosoftNETCoreAppPackageVersion> + <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.3-servicing-26722-02</MicrosoftNETCoreDotNetAppHostPackageVersion> +>>>>>>> 51103305aa59c4cf84a1cf5327db2f96fdbe479c </PropertyGroup> <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" /> @@ -110,7 +115,7 @@ <SystemDiagnosticsEventLogPackageVersion>4.5.0</SystemDiagnosticsEventLogPackageVersion> <SystemIdentityModelTokensJwtPackageVersion>5.2.0</SystemIdentityModelTokensJwtPackageVersion> <SystemInteractiveAsyncPackageVersion>3.1.1</SystemInteractiveAsyncPackageVersion> - <SystemIOPipelinesPackageVersion>4.5.0</SystemIOPipelinesPackageVersion> + <SystemIOPipelinesPackageVersion>4.5.1</SystemIOPipelinesPackageVersion> <SystemMemoryPackageVersion>4.5.1</SystemMemoryPackageVersion> <SystemNetHttpPackageVersion>4.3.2</SystemNetHttpPackageVersion> <SystemNetHttpWinHttpHandlerPackageVersion>4.5.0</SystemNetHttpWinHttpHandlerPackageVersion>