Merge remote-tracking branch 'origin/release/2.1' into release/3.1

Browse Source

# Conflicts:
#	build/sources.props
#	eng/Baseline.Designer.props
#	eng/Baseline.xml
#	eng/PatchConfig.props
#	modules/EntityFrameworkCore
#	src/AzureIntegration/build/repo.targets
#	src/AzureIntegration/build/sources.props
#	src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/Assets/NuGet.latest.config
#	src/Http/Http.Extensions/src/SendFileResponseExtensions.cs
#	src/Http/Http.Extensions/test/testfile1kb.txt
#	src/Http/HttpAbstractions.sln
#	src/Installers/Windows/AspNetCoreModule-Setup/ANCMPackageResolver/ANCMPackageResolver.csproj
#	src/Middleware/Middleware.sln
#	src/Middleware/ResponseCompression/src/BodyWrapperStream.cs
#	src/Middleware/ResponseCompression/test/BodyWrapperStreamTests.cs
#	src/Templating/build/sources.props
#	test/Cli.FunctionalTests/NuGetPackageSource.cs
#	version.props

...

This commit is contained in:

Chris R 2020-08-12 15:26:39 -07:00

parent a8e8fe2ab3 0a0e1ad9cb

commit 1b31674458

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available