Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dotnet/aspnetcore
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.0.5
Choose a base ref
...
head repository: dotnet/aspnetcore
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.0.6
Choose a head ref
9 contributors

Commits on Apr 6, 2021

  1. [internal/release/5.0] Update dependencies from dnceng/internal/dotne… 

    …t-runtime
    @dotnet-bot
    dotnet-bot committed Apr 6, 2021
    Copy the full SHA
    b926cc3 View commit details

  2. Update branding to 5.0.6 (#31563)

    @wtgodbe
    wtgodbe authored Apr 6, 2021
    Copy the full SHA
    367454f View commit details

  3. Merge in 'release/5.0' changes

    @dotnet-bot
    dotnet-bot committed Apr 6, 2021
    Copy the full SHA
    1d6d974 View commit details

Commits on Apr 7, 2021

  1. [release/5.0] Update nuget versions (#31490) 

    * Update nuget/msbuild versions

* Update nuget

* Nuget only

* Fix baseline, update to 5.8.1

* Undo test change

* Update MetadataSerializerTest.cs
    @wtgodbe
    wtgodbe authored Apr 7, 2021
    Copy the full SHA
    1baf991 View commit details

  2. Set cab name for TargetingPack.wixproj (#30975)

    @wtgodbe
    wtgodbe authored Apr 7, 2021
    Copy the full SHA
    0fa43be View commit details

  3. Merge in 'release/5.0' changes

    @dotnet-bot
    dotnet-bot committed Apr 7, 2021
    Copy the full SHA
    45d5753 View commit details

  4. Fix null ref in SyntaxTokenCache (#30978) (#30988) 

    Fixes #27154
    @pranavkm
    pranavkm authored Apr 7, 2021
    Copy the full SHA
    dec60c8 View commit details

  5. Merge in 'release/5.0' changes

    @dotnet-bot
    dotnet-bot committed Apr 7, 2021
    Copy the full SHA
    cb97011 View commit details

  6. Still send 100 Continue with null MinRequestBodyDataRate (#31568)

    @halter73
    halter73 authored Apr 7, 2021
    Copy the full SHA
    9facd9b View commit details

  7. [SignalR TS] Fix permanent Disconnecting state (#30948) (#31253)

    @BrennanConroy
    BrennanConroy authored Apr 7, 2021
    Copy the full SHA
    00c3e7c View commit details

  8. Fix arguments order for call of HeartbeatSlow (#28698) (#31080) 

    Co-authored-by: Roman Marusyk <Marusyk@users.noreply.github.com>
    @BrennanConroy @Marusyk
    BrennanConroy and Marusyk authored Apr 7, 2021
    Copy the full SHA
    dfbbc40 View commit details

  9. Merge in 'release/5.0' changes

    @dotnet-bot
    dotnet-bot committed Apr 7, 2021
    Copy the full SHA
    8413e34 View commit details

Commits on Apr 8, 2021

  1. Quarantine one failing test (#31045) (#31296) 

    - #31044
- `RazorPagesTemplate_RazorRuntimeCompilation_BuildsAndPublishes()`

Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
    @halter73 @dougbu
    halter73 and dougbu authored Apr 8, 2021
    Copy the full SHA
    79dbbca View commit details

  2. Merge in 'release/5.0' changes

    @dotnet-bot
    dotnet-bot committed Apr 8, 2021
    Copy the full SHA
    377b73b View commit details

  3. [internal/release/5.0] Update dependencies from dnceng/internal/dotne… 

    …t-runtime
    @dotnet-bot
    dotnet-bot committed Apr 8, 2021
    Copy the full SHA
    9e2892d View commit details

  4. Use Ubuntu18.04 (#31620) 

    * Use Ubuntu18.04

* Update .azure/pipelines/jobs/default-build.yml

Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>

* Undo queue updates

Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
    @wtgodbe @dougbu
    wtgodbe and dougbu authored Apr 8, 2021
    Copy the full SHA
    8269463 View commit details

  5. Merge in 'release/5.0' changes

    @dotnet-bot
    dotnet-bot committed Apr 8, 2021
    Copy the full SHA
    c7d102b View commit details

Commits on Apr 9, 2021

  1. [internal/release/5.0] Update dependencies from dnceng/internal/dotne… 

    …t-runtime
    @dotnet-bot
    dotnet-bot committed Apr 9, 2021
    Copy the full SHA
    8cfb92a View commit details

Commits on Apr 12, 2021

  1. [SignalR TS] Set keep alive timer in receive loop (#31300) (#31627)

    @BrennanConroy
    BrennanConroy authored Apr 12, 2021
    Copy the full SHA
    2928cd7 View commit details

  2. Merge in 'release/5.0' changes

    @dotnet-bot
    dotnet-bot committed Apr 12, 2021
    Copy the full SHA
    dae2429 View commit details

Commits on Apr 13, 2021

  1. Merge commit 'b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb' into wtgodbe/… 

    …505Merge
    @wtgodbe
    wtgodbe committed Apr 13, 2021
    Copy the full SHA
    7177a13 View commit details

  2. Update baseline, SDK

    @wtgodbe
    wtgodbe committed Apr 13, 2021
    Copy the full SHA
    87b8163 View commit details

  3. Fix SDK version

    @wtgodbe
    wtgodbe committed Apr 13, 2021
    Copy the full SHA
    943df8c View commit details

  4. Update dependencies from https://github.com/dotnet/arcade build 20210… 

    …310.3 (#31764)

[release/5.0] Update dependencies from dotnet/arcade
    @dotnet-maestro
    dotnet-maestro[bot] authored Apr 13, 2021
    Copy the full SHA
    c8b3b4a View commit details

  5. Merge in 'release/5.0' changes

    @dotnet-bot
    dotnet-bot committed Apr 13, 2021
    Copy the full SHA
    150a0d4 View commit details

  6. Merge pull request #31763 from dotnet/wtgodbe/505Merge 

    [release/5.0] Merge in internal changes, update SDK/baseline
    @wtgodbe
    wtgodbe authored Apr 13, 2021
    Copy the full SHA
    415693c View commit details

  7. Merge in 'release/5.0' changes

    @dotnet-bot
    dotnet-bot committed Apr 13, 2021
    Copy the full SHA
    bd95c7c View commit details

Commits on Apr 14, 2021

  1. Update SiteExtensions 3.1 version (#31811)

    @wtgodbe
    wtgodbe authored Apr 14, 2021
    Copy the full SHA
    4bd2449 View commit details

  2. Merge in 'release/5.0' changes

    @dotnet-bot
    dotnet-bot committed Apr 14, 2021
    Copy the full SHA
    8b2dab3 View commit details

Commits on Apr 21, 2021

  1. [internal/release/5.0] Update dependencies from dnceng/internal/dotne… 

    …t-runtime
    @dotnet-bot
    dotnet-bot committed Apr 21, 2021
    Copy the full SHA
    f3eeec8 View commit details

Commits on Apr 23, 2021

  1. Merged PR 14467: [internal/release/5.0] Update dependencies from dnce… 

    …ng/internal/dotnet-efcore

This pull request updates the following dependencies

[marker]: <> (Begin:5283c4a7-f944-4af6-f8bd-08d89c6afc9d)
## From https://github.com/dotnet/efcore
- **Subscription**: 5283c4a7-f944-4af6-f8bd-08d89c6afc9d
- **Build**: 20210413.7
- **Date Produced**: 4/13/2021 9:44 PM
- **Commit**: 42e81439158d5884dab24326c84ed95cd4baaa21
- **Branch**: refs/heads/internal/release/5.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.EntityFrameworkCore.Tools**: [from 5.0.5 to 5.0.6][1]
  - **dotnet-ef**: [from 5.0.5 to 5.0.6][1]
  - **Microsoft.EntityFrameworkCore**: [from 5.0.5 to 5.0.6][1]
  - **Microsoft.EntityFrameworkCore.SqlServer**: [from 5.0.5 to 5.0.6][1]
  - **Microsoft.EntityFrameworkCore.Design**: [from 5.0.5 to 5.0.6][1]
  - **Microsoft.EntityFrameworkCore.Relational**: [from 5.0.5 to 5.0.6][1]
  - **Microsoft.EntityFrameworkCore.Sqlite**: [from 5.0.5 to 5.0.6][1]
  - **Microsoft.EntityFrameworkCore.InMemory**: [from 5.0.5 to 5.0.6][1]

[1]: dotnet/efcore@5420351...42e8143

[DependencyUpdate]: <> (End)

[marker]: <> (End:5283c4a7-f944-4af6-f8bd-08d89c6afc9d)
    @dotnet-bot @mmitche
    dotnet-bot authored and mmitche committed Apr 23, 2021
    Copy the full SHA
    dc5e11a View commit details
Showing with 770 additions and 449 deletions.
  1. +6 −3 .azure/pipelines/ci.yml
  2. +4 −1 .azure/pipelines/jobs/default-build.yml
  3. +8 −3 NuGet.config
  4. +241 −241 eng/Baseline.Designer.props
  5. +101 −101 eng/Baseline.xml
  6. +28 −28 eng/Version.Details.xml
  7. +15 −15 eng/Versions.props
  8. +1 −1 eng/tools/BaselineGenerator/BaselineGenerator.csproj
  9. +1 −3 eng/tools/BaselineGenerator/Program.cs
  10. +1 −1 eng/tools/RepoTasks/RepoTasks.csproj
  11. +6 −6 global.json
  12. +1 −0 src/Installers/Windows/TargetingPack/TargetingPack.wixproj
  13. +1 −0 src/ProjectTemplates/test/RazorPagesTemplateTest.cs
  14. +3 −5 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxFactory.cs
  15. +12 −8 src/Razor/Microsoft.AspNetCore.Razor.Language/src/Syntax/InternalSyntax/SyntaxTokenCache.cs
  16. +78 −0 src/Razor/Microsoft.AspNetCore.Razor.Language/test/Syntax/SyntaxTokenCacheTest.cs
  17. +6 −4 src/Servers/Kestrel/Core/src/Internal/Http/MessageBody.cs
  18. +3 −3 src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelTrace.cs
  19. +12 −5 src/Servers/Kestrel/Core/test/HeartbeatTests.cs
  20. +36 −0 src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs
  21. +4 −2 src/SignalR/clients/ts/signalr/src/HttpConnection.ts
  22. +34 −12 src/SignalR/clients/ts/signalr/src/HubConnection.ts
  23. +13 −6 src/SignalR/clients/ts/signalr/tests/HttpConnection.test.ts
  24. +93 −0 src/SignalR/clients/ts/signalr/tests/HubConnection.Reconnect.test.ts
  25. +8 −1 src/SignalR/clients/ts/signalr/tests/HubConnection.test.ts
  26. +54 −0 src/SignalR/clients/ts/signalr/tests/TestWebSocket.ts
9 changes: 6 additions & 3 deletions .azure/pipelines/ci.yml
View file
Original file line number Diff line number Diff line change
@@ -566,7 +566,7 @@ stages:
jobDisplayName: "Build: Linux Musl ARM64"
agentOs: Linux
useHostedUbuntu: false
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20200413125008-406629a
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine-20210311173921-b2c2436
buildScript: ./build.sh
buildArgs:
--arch arm64
@@ -680,7 +680,7 @@ stages:
parameters:
condition: ne(variables['SkipTests'], 'true')
jobName: Linux_Test
jobDisplayName: "Test: Ubuntu 16.04 x64"
jobDisplayName: "Test: Ubuntu 18.04 x64"
agentOs: Linux
isTestingJob: true
useHostedUbuntu: false
@@ -734,12 +734,15 @@ stages:
displayName: 'Test: Linux Source Build'
container: centos:7
pool:
vmImage: 'ubuntu-16.04'
vmImage: 'ubuntu-18.04'
variables:
DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet
# This isn't needed in the path because build does not need to _use_ global tools.
DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true
LC_ALL: 'en_US.UTF-8'
LANG: 'en_US.UTF-8'
LANGUAGE: 'en_US.UTF-8'
steps:
- script: |
source eng/common/native/common-library.sh
5 changes: 4 additions & 1 deletion .azure/pipelines/jobs/default-build.yml
View file
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ jobs:
vmImage: macOS-10.14
${{ if eq(parameters.agentOs, 'Linux') }}:
${{ if eq(parameters.useHostedUbuntu, true) }}:
vmImage: ubuntu-16.04
vmImage: ubuntu-18.04
${{ if eq(parameters.useHostedUbuntu, false) }}:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCorePublic-Pool
@@ -139,6 +139,9 @@ jobs:
- _SignType: real
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
- _SignType: test
- LC_ALL: 'en_US.UTF-8'
- LANG: 'en_US.UTF-8'
- LANGUAGE: 'en_US.UTF-8'
steps:
- ${{ if ne(parameters.agentOs, 'Windows') }}:
- script: df -h
11 changes: 8 additions & 3 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
@@ -4,10 +4,12 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-pub-dotnet-efcore-5420351" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-54203510/nuget/v3/index.json" />
<add key="darc-int-dotnet-efcore-42e8143" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-42e81439/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2f740ad" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-478b2f8-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-478b2f8-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-478b2f8" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,9 +24,12 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2f740ad" value="true" />
<add key="darc-int-dotnet-runtime-478b2f8" value="true" />
<add key="darc-int-dotnet-runtime-478b2f8-1" value="true" />
<add key="darc-int-dotnet-runtime-478b2f8-2" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-42e8143" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Loading