Skip to content

Conversation

@dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/5.0 branch which have not been merged yet to release/5.0-rc2. I'm a robot and am configured to help you automatically keep release/5.0-rc2 up to date, so I've opened this PR.

This PR merges commits made on release/5.0 by the following committers:

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/5.0
git pull --ff-only
git checkout release/5.0-rc2
git pull --ff-only
git merge --no-ff release/5.0

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-to-release/5.0-rc2
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-to-release/5.0-rc2

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/5.0-to-release/5.0-rc2'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/5.0-to-release/5.0-rc2 release/5.0-rc2
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/5.0-to-release/5.0-rc2
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-to-release/5.0-rc2
or if you are using SSH
git checkout -b merge/release/5.0-to-release/5.0-rc2 release/5.0-rc2
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/5.0-to-release/5.0-rc2
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/5.0-to-release/5.0-rc2

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

dotnet-maestro bot and others added 2 commits September 2, 2020 00:20
…otnet#25506)

[release/5.0] Update dependencies from dotnet/efcore dotnet/runtime
- Updates:
  - Microsoft.EntityFrameworkCore.Tools: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.5
  - Microsoft.EntityFrameworkCore.SqlServer: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.5
  - dotnet-ef: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.5
  - Microsoft.EntityFrameworkCore: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.5
  - Microsoft.EntityFrameworkCore.Design: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.5
  - Microsoft.EntityFrameworkCore.Relational: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.5
  - Microsoft.EntityFrameworkCore.Sqlite: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.5
  - Microsoft.EntityFrameworkCore.InMemory: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.5

- Updates:
  - System.ComponentModel.Annotations: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Diagnostics.DiagnosticSource: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Diagnostics.EventLog: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.DirectoryServices.Protocols: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Logging.Abstractions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Logging.Configuration: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Logging.Console: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Logging.Debug: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Logging.EventLog: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Logging.EventSource: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Logging.TraceSource: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Options: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Options.ConfigurationExtensions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Options.DataAnnotations: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Primitives: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Logging: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Internal.Transport: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Http: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Hosting.Abstractions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Caching.Abstractions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Caching.Memory: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Configuration: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Configuration.Abstractions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Configuration.Binder: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Configuration.CommandLine: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Configuration.EnvironmentVariables: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Configuration.FileExtensions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Configuration.Ini: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Configuration.UserSecrets: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Configuration.Xml: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.DependencyInjection: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.DependencyInjection.Abstractions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.FileProviders.Abstractions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.FileProviders.Composite: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.FileProviders.Physical: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.FileSystemGlobbing: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.HostFactoryResolver.Sources: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Hosting: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Extensions.Configuration.Json: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.NETCore.BrowserDebugHost.Transport: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Win32.Registry: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.Win32.SystemEvents: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Drawing.Common: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Text.Json: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Threading.Channels: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Windows.Extensions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Text.Encodings.Web: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.ServiceProcess.ServiceController: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.IO.Pipelines: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Net.Http.Json: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Net.Http.WinHttpHandler: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Net.WebSockets.WebSocketProtocol: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Reflection.Metadata: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Resources.Extensions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Runtime.CompilerServices.Unsafe: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Security.AccessControl: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Security.Cryptography.Cng: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Security.Cryptography.Pkcs: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Security.Cryptography.Xml: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Security.Permissions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
  - System.Security.Principal.Windows: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.12
* Separate MessagePackHubProtocol into its own package

* Remove gitignore

* Maybe undo this later

* More factoring

* Get gradle test working

* Get gradle test working

* Get rid of version.java

* Separate build.gradle files for all

* Create separate javaproj's for everything

* Fix warnings

* Resolve conflicts

* Fixup gitignore

* Feedback, fix error

* Fix error

* Change package name

* Fix folder structure

* Skip helix tests, fix .gitignore

* Make TransferFormat private
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Sep 2, 2020
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approving branch merge.

@ghost ghost added auto-merge tell-mode Indicates a PR which is being merged during tell-mode labels Sep 2, 2020
@ghost
Copy link

ghost commented Sep 2, 2020

Hello @msftbot[bot]!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 60 minutes. No worries though, I will be back when the time is right! 😉

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost
Copy link

ghost commented Sep 2, 2020

Apologies, while this PR appears ready to be merged, it looks like release/5.0-rc2 is a protected branch and I have not been granted permission to perform the merge.

2 similar comments
@ghost
Copy link

ghost commented Sep 2, 2020

Apologies, while this PR appears ready to be merged, it looks like release/5.0-rc2 is a protected branch and I have not been granted permission to perform the merge.

@ghost
Copy link

ghost commented Sep 2, 2020

Apologies, while this PR appears ready to be merged, it looks like release/5.0-rc2 is a protected branch and I have not been granted permission to perform the merge.

…otnet#25522)

[release/5.0] Update dependencies from dotnet/runtime dotnet/efcore
- Updates:
  - Microsoft.EntityFrameworkCore.Tools: from 5.0.0-rc.1.20451.5 to 5.0.0-rc.1.20451.13
  - Microsoft.EntityFrameworkCore.SqlServer: from 5.0.0-rc.1.20451.5 to 5.0.0-rc.1.20451.13
  - dotnet-ef: from 5.0.0-rc.1.20451.5 to 5.0.0-rc.1.20451.13
  - Microsoft.EntityFrameworkCore: from 5.0.0-rc.1.20451.5 to 5.0.0-rc.1.20451.13
  - Microsoft.EntityFrameworkCore.Design: from 5.0.0-rc.1.20451.5 to 5.0.0-rc.1.20451.13
  - Microsoft.EntityFrameworkCore.Relational: from 5.0.0-rc.1.20451.5 to 5.0.0-rc.1.20451.13
  - Microsoft.EntityFrameworkCore.Sqlite: from 5.0.0-rc.1.20451.5 to 5.0.0-rc.1.20451.13
  - Microsoft.EntityFrameworkCore.InMemory: from 5.0.0-rc.1.20451.5 to 5.0.0-rc.1.20451.13

- Updates:
  - System.ComponentModel.Annotations: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Diagnostics.DiagnosticSource: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Diagnostics.EventLog: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.DirectoryServices.Protocols: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Logging.Abstractions: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Logging.Configuration: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Logging.Console: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Logging.Debug: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Logging.EventLog: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Logging.EventSource: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Logging.TraceSource: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Options: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Options.ConfigurationExtensions: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Options.DataAnnotations: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Primitives: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Logging: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Internal.Transport: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Http: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Hosting.Abstractions: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Caching.Abstractions: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Caching.Memory: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Configuration: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Configuration.Abstractions: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Configuration.Binder: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Configuration.CommandLine: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Configuration.EnvironmentVariables: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Configuration.FileExtensions: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Configuration.Ini: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Configuration.UserSecrets: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Configuration.Xml: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.DependencyInjection: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.DependencyInjection.Abstractions: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.FileProviders.Abstractions: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.FileProviders.Composite: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.FileProviders.Physical: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.FileSystemGlobbing: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.HostFactoryResolver.Sources: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Hosting: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Extensions.Configuration.Json: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.NETCore.BrowserDebugHost.Transport: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Win32.Registry: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.Win32.SystemEvents: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Drawing.Common: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Text.Json: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Threading.Channels: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Windows.Extensions: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Text.Encodings.Web: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.ServiceProcess.ServiceController: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.IO.Pipelines: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Net.Http.Json: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Net.Http.WinHttpHandler: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Net.WebSockets.WebSocketProtocol: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Reflection.Metadata: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Resources.Extensions: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Runtime.CompilerServices.Unsafe: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Security.AccessControl: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Security.Cryptography.Cng: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Security.Cryptography.Pkcs: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Security.Cryptography.Xml: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Security.Permissions: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
  - System.Security.Principal.Windows: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.14
@dotnet-maestro-bot
Copy link
Contributor Author

This pull request has been updated.

This PR merges commits made on release/5.0 by the following committers:

@ghost ghost removed the auto-merge label Sep 2, 2020
@wtgodbe
Copy link
Member

wtgodbe commented Sep 2, 2020

Multiple errors with the MessagePack changes this is bringing in:

Task :messagepack:compileJava
/Users/runner/work/1/s/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java:42: error: error while writing MessagePackHubProtocol: /Users/runner/work/1/s/src/SignalR/clients/java/signalr/messagepack/build/classes/java/main/com/microsoft/signalr/messagepack/MessagePackHubProtocol.class (Invalid argument)
public class MessagePackHubProtocol implements HubProtocol {
^
1 error

Task :messagepack:compileJava FAILED

Plus

JUnit Jupiter:HubConnectionTest:LongPollingTransportAccessTokenProviderThrowsDuringStop()
  MethodSource [className = 'com.microsoft.signalr.HubConnectionTest', methodName = 'LongPollingTransportAccessTokenProviderThrowsDuringStop', methodParameterTypes = '']
  => java.lang.RuntimeException: java.util.concurrent.TimeoutException: The source did not signal an event for 1 seconds and has been terminated.

(Not messagepack, but is in the java client, which I messed with quite a bit)

@javiercn
Copy link
Member

javiercn commented Sep 4, 2020

@Pilchie @mkArtakMSFT can either of you merge this one?

@mkArtakMSFT
Copy link
Contributor

@dotnet/aspnet-build folks should this be a Squash and merge or Merge ?

@BrennanConroy
Copy link
Member

Merge
Instructions are in original comment #25520 (comment)

@mkArtakMSFT mkArtakMSFT merged commit fe1a881 into dotnet:release/5.0-rc2 Sep 4, 2020
@mkArtakMSFT
Copy link
Contributor

Thanks @BrennanConroy

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode Type: Merge Forward ⏩

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants