Skip to content

Commit 1b31674

Browse files
committed
Merge remote-tracking branch 'origin/release/2.1' into release/3.1
# 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
2 parents a8e8fe2 + 0a0e1ad commit 1b31674

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)