Skip to content

[automated] Merge branch 'release/3.1' => 'master' #2864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jan 16, 2020
Merged

[automated] Merge branch 'release/3.1' => 'master' #2864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
db2c38a
Update branding to 2.1.16 (#2842)
Jan 14, 2020
75371ae
Merge branch 'release/2.1' into release/3.1
jkotalik Jan 15, 2020
3e617ba
Merge branch 'release/2.1' => 'release/3.1' (#2859)
dougbu Jan 15, 2020
fde2846
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Jan 15, 2020
b624d6b
Remove ref project from Microsoft.AspNetCore.Testing (#2817)
Jan 16, 2020
1541c04
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Jan 16, 2020
84214a0
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Jan 16, 2020
46214d8
[release/3.1] Update dependencies from dotnet/core-setup (#2869)
dotnet-maestro[bot] Jan 16, 2020
b2165d7
Allow duplicate class to AddHttpClient<T>
rynowak Nov 24, 2019
f198c46
Allow multiple types to be registered for one name
rynowak Nov 24, 2019
9c9ac59
WIP
rynowak Jan 16, 2020
edcf5f2
All duplicates of the same type with different names
rynowak Jan 16, 2020
08a9b86
Merge pull request #2710 from dotnet/rynowak/http-client-factory-fixes
mkArtakMSFT Jan 16, 2020
259a64a
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Jan 16, 2020
3873a07
Merge branch 'merge/release/3.1-to-master' of https://github.com/dotn…
Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</PropertyGroup>

<ItemGroup Condition=" '$(IsUnitTestProject)' == 'true' ">
<Reference Include="Microsoft.AspNetCore.Testing" />
<ProjectReference Include="$(MSBuildThisFileDirectory)src\TestingUtils\Microsoft.AspNetCore.Testing\src\Microsoft.AspNetCore.Testing.csproj" />
<Reference Include="Moq" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion eng/ProjectReferences.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
<ProjectReferenceProvider Include="Microsoft.Extensions.Options.DataAnnotations" ProjectPath="$(RepoRoot)src\Options\DataAnnotations\src\Microsoft.Extensions.Options.DataAnnotations.csproj" RefProjectPath="$(RepoRoot)src\Options\DataAnnotations\ref\Microsoft.Extensions.Options.DataAnnotations.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Options" ProjectPath="$(RepoRoot)src\Options\Options\src\Microsoft.Extensions.Options.csproj" RefProjectPath="$(RepoRoot)src\Options\Options\ref\Microsoft.Extensions.Options.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.Primitives" ProjectPath="$(RepoRoot)src\Primitives\src\Microsoft.Extensions.Primitives.csproj" RefProjectPath="$(RepoRoot)src\Primitives\ref\Microsoft.Extensions.Primitives.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Testing" ProjectPath="$(RepoRoot)src\TestingUtils\Microsoft.AspNetCore.Testing\src\Microsoft.AspNetCore.Testing.csproj" RefProjectPath="$(RepoRoot)src\TestingUtils\Microsoft.AspNetCore.Testing\ref\Microsoft.AspNetCore.Testing.csproj" />
<ProjectReferenceProvider Include="Microsoft.Extensions.WebEncoders" ProjectPath="$(RepoRoot)src\WebEncoders\src\Microsoft.Extensions.WebEncoders.csproj" RefProjectPath="$(RepoRoot)src\WebEncoders\ref\Microsoft.Extensions.WebEncoders.csproj" />
</ItemGroup>
</Project>
68 changes: 34 additions & 34 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,73 +10,73 @@
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-alpha.1.20064.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-alpha.1.20065.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-alpha.1.20064.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-alpha.1.20065.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-alpha.1.20064.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-alpha.1.20065.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-alpha.1.20064.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-alpha.1.20065.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="System.IO.Pipelines" Version="5.0.0-alpha.1.20064.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.IO.Pipelines" Version="5.0.0-alpha.1.20065.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="System.Reflection.Metadata" Version="5.0.0-alpha.1.20064.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Reflection.Metadata" Version="5.0.0-alpha.1.20065.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-alpha.1.20064.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-alpha.1.20065.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-alpha.1.20064.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-alpha.1.20065.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-alpha.1.20064.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-alpha.1.20065.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-alpha.1.20064.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-alpha.1.20065.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="5.0.0-alpha.1.20064.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Text.Encodings.Web" Version="5.0.0-alpha.1.20065.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="5.0.0-alpha.1.20064.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="System.Text.Json" Version="5.0.0-alpha.1.20065.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-alpha.1.20064.4">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-alpha.1.20065.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-alpha.1.20064.4">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-alpha.1.20065.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-alpha.1.20064.4">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-alpha.1.20065.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-alpha.1.20064.4">
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-alpha.1.20065.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" Pinned="true">
<Uri>https://github.com/dotnet/corefx</Uri>
Expand All @@ -96,9 +96,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>250782df013aa8586e21bb225f8efd715372dcf1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha.1.20064.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha.1.20065.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f57d49bb711fda8ac0bd231229d91919f4fca8e8</Sha>
<Sha>5c9338e09ad0a2f282c3dd14b0cc06aab37887a0</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.5.0-beta1-19606-04">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
34 changes: 17 additions & 17 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,26 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/core-setup -->
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-alpha.1.20064.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-alpha.1.20064.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-alpha.1.20064.4</MicrosoftNETCoreAppInternalPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-alpha.1.20064.4</NETStandardLibraryRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-alpha.1.20065.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-alpha.1.20065.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-alpha.1.20065.4</MicrosoftNETCoreAppInternalPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-alpha.1.20065.4</NETStandardLibraryRefPackageVersion>
<!-- Packages from dotnet/corefx -->
<MicrosoftBclAsyncInterfacesPackageVersion>1.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftWin32RegistryPackageVersion>5.0.0-alpha.1.20064.4</MicrosoftWin32RegistryPackageVersion>
<SystemComponentModelAnnotationsPackageVersion>5.0.0-alpha.1.20064.4</SystemComponentModelAnnotationsPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0-alpha.1.20064.4</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>5.0.0-alpha.1.20064.4</SystemDiagnosticsEventLogPackageVersion>
<SystemIOPipelinesPackageVersion>5.0.0-alpha.1.20064.4</SystemIOPipelinesPackageVersion>
<SystemReflectionMetadataPackageVersion>5.0.0-alpha.1.20064.4</SystemReflectionMetadataPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-alpha.1.20064.4</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemSecurityCryptographyCngPackageVersion>5.0.0-alpha.1.20064.4</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>5.0.0-alpha.1.20064.4</SystemSecurityCryptographyXmlPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>5.0.0-alpha.1.20064.4</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>5.0.0-alpha.1.20064.4</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>5.0.0-alpha.1.20064.4</SystemTextJsonPackageVersion>
<MicrosoftWin32RegistryPackageVersion>5.0.0-alpha.1.20065.4</MicrosoftWin32RegistryPackageVersion>
<SystemComponentModelAnnotationsPackageVersion>5.0.0-alpha.1.20065.4</SystemComponentModelAnnotationsPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0-alpha.1.20065.4</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>5.0.0-alpha.1.20065.4</SystemDiagnosticsEventLogPackageVersion>
<SystemIOPipelinesPackageVersion>5.0.0-alpha.1.20065.4</SystemIOPipelinesPackageVersion>
<SystemReflectionMetadataPackageVersion>5.0.0-alpha.1.20065.4</SystemReflectionMetadataPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-alpha.1.20065.4</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemSecurityCryptographyCngPackageVersion>5.0.0-alpha.1.20065.4</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>5.0.0-alpha.1.20065.4</SystemSecurityCryptographyXmlPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>5.0.0-alpha.1.20065.4</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>5.0.0-alpha.1.20065.4</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>5.0.0-alpha.1.20065.4</SystemTextJsonPackageVersion>
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha.1.20064.4</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha.1.20065.4</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20062.1</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
Expand Down
1 change: 0 additions & 1 deletion src/Hosting/IntegrationTesting/src/Microsoft.Extensions.Hosting.IntegrationTesting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
</PropertyGroup>

<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Testing" />
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
<Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
<Reference Include="Microsoft.Extensions.Logging" />
Expand Down
Loading