From 7527117084c69a39062443e1f2da6ea09c48b9d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 00:20:46 +0000 Subject: [PATCH 1/3] [release/5.0] Update dependencies from dotnet/efcore dotnet/runtime (#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 --- eng/Version.Details.xml | 296 ++++++++++++++++++++-------------------- eng/Versions.props | 148 ++++++++++---------- 2 files changed, 222 insertions(+), 222 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 208ed4bf12..33513b5fe4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,309 +13,309 @@ https://github.com/dotnet/blazor cc449601d638ffaab58ae9487f0fd010bb178a12 - + https://github.com/dotnet/efcore - a6653be361ab12369205a6ed51454aaee50a38c6 + 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 - + https://github.com/dotnet/efcore - a6653be361ab12369205a6ed51454aaee50a38c6 + 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 - + https://github.com/dotnet/efcore - a6653be361ab12369205a6ed51454aaee50a38c6 + 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 - + https://github.com/dotnet/efcore - a6653be361ab12369205a6ed51454aaee50a38c6 + 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 - + https://github.com/dotnet/efcore - a6653be361ab12369205a6ed51454aaee50a38c6 + 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 - + https://github.com/dotnet/efcore - a6653be361ab12369205a6ed51454aaee50a38c6 + 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 - + https://github.com/dotnet/efcore - a6653be361ab12369205a6ed51454aaee50a38c6 + 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 - + https://github.com/dotnet/efcore - a6653be361ab12369205a6ed51454aaee50a38c6 + 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 67deb1d9bea3b98e1f21711c2b014240f86cec41 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 560ee97ff0..1bc56934e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,85 +64,85 @@ 3.8.0-2.20407.3 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.12 3.2.0 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.5 + 5.0.0-rc.1.20451.5 + 5.0.0-rc.1.20451.5 + 5.0.0-rc.1.20451.5 + 5.0.0-rc.1.20451.5 + 5.0.0-rc.1.20451.5 + 5.0.0-rc.1.20451.5 + 5.0.0-rc.1.20451.5 5.0.0-beta.20431.1 From b44c6280674d66e29ad8bcb5e8688b04ed96fabe Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 1 Sep 2020 17:37:56 -0700 Subject: [PATCH 2/3] Separate MessagePackHubProtocol into its own package (#25253) * 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 --- src/SignalR/clients/java/signalr/.gitignore | 2 +- src/SignalR/clients/java/signalr/build.gradle | 105 ++---------------- .../clients/java/signalr/core/build.gradle | 75 +++++++++++++ .../core/signalr.client.java.core.javaproj | 57 ++++++++++ .../java/com/microsoft/signalr/.gitignore | 1 + .../java/com/microsoft/signalr/Action.java | 0 .../java/com/microsoft/signalr/Action1.java | 0 .../java/com/microsoft/signalr/Action2.java | 0 .../java/com/microsoft/signalr/Action3.java | 0 .../java/com/microsoft/signalr/Action4.java | 0 .../java/com/microsoft/signalr/Action5.java | 0 .../java/com/microsoft/signalr/Action6.java | 0 .../java/com/microsoft/signalr/Action7.java | 0 .../java/com/microsoft/signalr/Action8.java | 0 .../com/microsoft/signalr/ActionBase.java | 0 .../com/microsoft/signalr/CallbackMap.java | 0 .../signalr/CancelInvocationMessage.java | 2 +- .../com/microsoft/signalr/CloseMessage.java | 2 +- .../microsoft/signalr/CompletionMessage.java | 2 +- .../microsoft/signalr/DefaultHttpClient.java | 0 .../microsoft/signalr/HandshakeProtocol.java | 0 .../signalr/HandshakeRequestMessage.java | 0 .../signalr/HandshakeResponseMessage.java | 0 .../com/microsoft/signalr/HttpClient.java | 0 .../signalr/HttpHubConnectionBuilder.java | 7 +- .../com/microsoft/signalr/HubConnection.java | 0 .../signalr/HubConnectionBuilder.java | 0 .../microsoft/signalr/HubConnectionState.java | 0 .../com/microsoft/signalr/HubException.java | 0 .../com/microsoft/signalr/HubMessage.java | 2 +- .../com/microsoft/signalr/HubMessageType.java | 2 +- .../com/microsoft/signalr/HubProtocol.java | 4 +- .../microsoft/signalr/InvocationBinder.java | 2 +- .../InvocationBindingFailureMessage.java | 2 +- .../microsoft/signalr/InvocationHandler.java | 0 .../microsoft/signalr/InvocationMessage.java | 2 +- .../microsoft/signalr/InvocationRequest.java | 0 .../microsoft/signalr/JsonHubProtocol.java | 5 - .../signalr/LongPollingTransport.java | 0 .../java/com/microsoft/signalr/Negotiate.java | 0 .../microsoft/signalr/NegotiateResponse.java | 0 .../signalr/OkHttpWebSocketWrapper.java | 0 .../microsoft/signalr/OnClosedCallback.java | 0 .../microsoft/signalr/OnReceiveCallBack.java | 0 .../com/microsoft/signalr/PingMessage.java | 2 +- .../signalr/StreamBindingFailureMessage.java | 2 +- .../signalr/StreamInvocationMessage.java | 2 +- .../com/microsoft/signalr/StreamItem.java | 2 +- .../com/microsoft/signalr/Subscription.java | 0 .../com/microsoft/signalr/TransferFormat.java | 0 .../java/com/microsoft/signalr/Transport.java | 0 .../com/microsoft/signalr/TransportEnum.java | 0 .../signalr/TransportOnClosedCallback.java | 0 .../com/microsoft/signalr/TypeReference.java | 1 + .../microsoft/signalr/UserAgentHelper.java | 0 .../java/com/microsoft/signalr/Utils.java | 46 ++++++++ .../microsoft/signalr/WebSocketTransport.java | 0 .../microsoft/signalr/WebSocketWrapper.java | 0 .../signalr/WebsocketWrapperOnClosed.java | 0 .../com/microsoft/signalr/package-info.java | 0 .../java/signalr/messagepack/build.gradle | 50 +++++++++ .../signalr.client.java.messagepack.javaproj | 57 ++++++++++ .../messagepack}/MessagePackHubProtocol.java | 23 ++-- .../microsoft/signalr/messagepack}/Utils.java | 23 +--- .../clients/java/signalr/settings.gradle | 2 +- .../java/com/microsoft/signalr/Version.java | 11 -- .../clients/java/signalr/test/build.gradle | 16 +++ .../signalr.client.java.Tests.javaproj | 57 +++------- .../com/microsoft/signalr/ByteString.java | 0 .../signalr/HandshakeProtocolTest.java | 0 .../signalr/HubConnectionBuilderTest.java | 0 .../microsoft/signalr/HubConnectionTest.java | 0 .../microsoft/signalr/HubExceptionTest.java | 0 .../signalr/JsonHubProtocolTest.java | 5 - .../signalr/LongPollingTransportTest.java | 0 .../signalr/MessagePackHubProtocolTest.java | 7 +- .../com/microsoft/signalr/MockTransport.java | 0 .../signalr/NegotiateResponseTest.java | 0 .../com/microsoft/signalr/PersonPojo.java | 0 .../signalr/ResolveNegotiateUrlTest.java | 0 .../com/microsoft/signalr/TestBinder.java | 0 .../com/microsoft/signalr/TestHttpClient.java | 0 .../java/com/microsoft/signalr/TestUtils.java | 3 +- .../com/microsoft/signalr/UserAgentTest.java | 0 .../signalr/WebSocketTransportTest.java | 0 .../WebSocketTransportUrlFormatTest.java | 0 .../com/microsoft/signalr/sample/Chat.java | 0 87 files changed, 373 insertions(+), 208 deletions(-) create mode 100644 src/SignalR/clients/java/signalr/core/build.gradle create mode 100644 src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj create mode 100644 src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/.gitignore rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action1.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action2.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action3.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action4.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action5.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action6.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action7.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action8.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/ActionBase.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/CallbackMap.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java (93%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/CloseMessage.java (94%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/CompletionMessage.java (95%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/DefaultHttpClient.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HandshakeProtocol.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HandshakeRequestMessage.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HandshakeResponseMessage.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HttpClient.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java (95%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubConnection.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubConnectionState.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubException.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubMessage.java (89%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubMessageType.java (94%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubProtocol.java (88%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/InvocationBinder.java (92%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java (92%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/InvocationHandler.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/InvocationMessage.java (96%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/InvocationRequest.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/JsonHubProtocol.java (99%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/LongPollingTransport.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Negotiate.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/NegotiateResponse.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/OnClosedCallback.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/OnReceiveCallBack.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/PingMessage.java (92%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java (92%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java (90%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/StreamItem.java (95%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Subscription.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/TransferFormat.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Transport.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/TransportEnum.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/TransportOnClosedCallback.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/TypeReference.java (94%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/UserAgentHelper.java (100%) create mode 100644 src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Utils.java rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/WebSocketTransport.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/WebSocketWrapper.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/WebsocketWrapperOnClosed.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/package-info.java (100%) create mode 100644 src/SignalR/clients/java/signalr/messagepack/build.gradle create mode 100644 src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj rename src/SignalR/clients/java/signalr/{src/main/java/com/microsoft/signalr => messagepack/src/main/java/com/microsoft/signalr/messagepack}/MessagePackHubProtocol.java (97%) rename src/SignalR/clients/java/signalr/{src/main/java/com/microsoft/signalr => messagepack/src/main/java/com/microsoft/signalr/messagepack}/Utils.java (89%) delete mode 100644 src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Version.java create mode 100644 src/SignalR/clients/java/signalr/test/build.gradle rename src/SignalR/clients/java/signalr/{ => test}/signalr.client.java.Tests.javaproj (55%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/ByteString.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/HandshakeProtocolTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/HubConnectionBuilderTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/HubConnectionTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/HubExceptionTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/JsonHubProtocolTest.java (99%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/LongPollingTransportTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/MessagePackHubProtocolTest.java (99%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/MockTransport.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/NegotiateResponseTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/PersonPojo.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/ResolveNegotiateUrlTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/TestBinder.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/TestHttpClient.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/TestUtils.java (92%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/UserAgentTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/WebSocketTransportTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/WebSocketTransportUrlFormatTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/sample/Chat.java (100%) diff --git a/src/SignalR/clients/java/signalr/.gitignore b/src/SignalR/clients/java/signalr/.gitignore index 3e9534ce39..88f14c5caf 100644 --- a/src/SignalR/clients/java/signalr/.gitignore +++ b/src/SignalR/clients/java/signalr/.gitignore @@ -2,7 +2,7 @@ .gradletasknamecache .gradle/ build/ -/test-results +test/test-results .settings/ out/ *.class diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index d559274414..e09780cc60 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle @@ -15,32 +15,18 @@ plugins { id 'maven' } -apply plugin: "java-library" -apply plugin: "com.diffplug.gradle.spotless" -apply plugin: 'org.junit.platform.gradle.plugin' +allprojects { + apply plugin: "java-library" + apply plugin: "com.diffplug.gradle.spotless" -group 'com.microsoft.signalr' + // If we're run from outside MSBuild, just assign a bogus dev version. + version project.findProperty('packageVersion') ?: "99.99.99-dev" -// If we're run from outside MSBuild, just assign a bogus dev version. -version project.findProperty('packageVersion') ?: "99.99.99-dev" + sourceCompatibility = 1.8 -sourceCompatibility = 1.8 - -repositories { - mavenCentral() -} - -dependencies { - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' - testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' - testCompile 'org.slf4j:slf4j-jdk14:1.7.25' - implementation 'com.google.code.gson:gson:2.8.5' - implementation 'com.squareup.okhttp3:okhttp:3.11.0' - api 'io.reactivex.rxjava2:rxjava:2.2.3' - implementation 'org.slf4j:slf4j-api:1.7.25' - compile 'org.msgpack:msgpack-core:0.8.20' - compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' + repositories { + mavenCentral() + } } spotless { @@ -48,7 +34,7 @@ spotless { licenseHeader '// Copyright (c) .NET Foundation. All rights reserved.\n' + '// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n\n' // License header - importOrder 'java', 'javax', 'org', 'com', 'com.diffplug', '' // A sequence of package names + importOrder 'java', 'javax', 'org', 'com', 'com.diffplug', '' // A sequence of package names replace 'Not enough space after if', 'if(', 'if (' replace 'Not enough space after else', 'else{', 'else {' @@ -66,73 +52,4 @@ spotless { indentWithSpaces(4) removeUnusedImports() // removes any unused imports } -} - -junitPlatform { - reportsDir file('test-results') -} - -task sourceJar(type: Jar) { - classifier "sources" - from sourceSets.main.allJava -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier "javadoc" - from javadoc.destinationDir -} - -task generatePOM { - pom { - project { - inceptionYear '2018' - description 'ASP.NET Core SignalR Client for Java applications' - url 'https://github.com/dotnet/aspnetcore' - name groupId + ':' + artifactId - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - scm { - connection 'scm:git:git://github.com/dotnet/aspnetcore.git' - developerConnection 'scm:git:git://github.com/dotnet/aspnetcore.git' - url 'http://github.com/dotnet/aspnetcore/tree/master' - } - developers { - developer { - id 'microsoft' - name 'Microsoft' - } - } - } - }.writeTo("${buildDir}/libs/signalr-${project.version}.pom") -} - -task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM]) - -task generateVersionClass { - inputs.property "version", project.version - outputs.dir "$buildDir/generated" - doFirst { - def versionFile = file("$buildDir/../src/main/java/com/microsoft/signalr/Version.java") - versionFile.parentFile.mkdirs() - versionFile.text = - """ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -package com.microsoft.signalr; - -class Version { - public static String getDetailedVersion() { - return "$project.version"; - } -} -""" - } -} - -compileJava.dependsOn generateVersionClass +} \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/core/build.gradle b/src/SignalR/clients/java/signalr/core/build.gradle new file mode 100644 index 0000000000..f7bdcb67e9 --- /dev/null +++ b/src/SignalR/clients/java/signalr/core/build.gradle @@ -0,0 +1,75 @@ +group 'com.microsoft.signalr' + +dependencies { + implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.squareup.okhttp3:okhttp:3.11.0' + api 'io.reactivex.rxjava2:rxjava:2.2.3' + implementation 'org.slf4j:slf4j-api:1.7.25' +} + +archivesBaseName = 'signalr' + +task sourceJar(type: Jar) { + classifier "sources" + from sourceSets.main.allJava +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier "javadoc" + from javadoc.destinationDir +} + +task generatePOM { + pom { + project { + inceptionYear '2018' + description 'ASP.NET Core SignalR Client for Java applications' + url 'https://github.com/dotnet/aspnetcore' + name groupId + ':' + artifactId + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + scm { + connection 'scm:git:git://github.com/dotnet/aspnetcore.git' + developerConnection 'scm:git:git://github.com/dotnet/aspnetcore.git' + url 'http://github.com/dotnet/aspnetcore/tree/master' + } + developers { + developer { + id 'microsoft' + name 'Microsoft' + } + } + } + }.writeTo("${buildDir}/libs/signalr-${project.version}.pom") +} + +task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM]) + +task generateVersionClass { + inputs.property "version", project.version + outputs.dir "$buildDir/generated" + doFirst { + def versionFile = file("$buildDir/../src/main/java/com/microsoft/signalr/Version.java") + versionFile.parentFile.mkdirs() + versionFile.text = + """ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +package com.microsoft.signalr; + +class Version { + public static String getDetailedVersion() { + return "$project.version"; + } +} +""" + } +} + +compileJava.dependsOn generateVersionClass \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj b/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj new file mode 100644 index 0000000000..2bc876ea0c --- /dev/null +++ b/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj @@ -0,0 +1,57 @@ + + + + + + java:signalr + + true + false + + $(GradleOptions) -Dorg.gradle.daemon=false + $(OutputPath) + + + + + + + + + + + + + $(PackDependsOn); + Build + + + + + + + $(GradleOptions) -PpackageVersion="$(PackageVersion)" + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/.gitignore b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/.gitignore new file mode 100644 index 0000000000..b74fd93836 --- /dev/null +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/.gitignore @@ -0,0 +1 @@ +Version.java \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action1.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action1.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action2.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action2.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action3.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action3.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action4.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action4.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action5.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action5.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action6.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action6.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action7.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action7.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action8.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action8.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/ActionBase.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/ActionBase.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/ActionBase.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/ActionBase.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CallbackMap.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CallbackMap.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CallbackMap.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CallbackMap.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java similarity index 93% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java index 9f375aea72..ce5d76f4b7 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java @@ -5,7 +5,7 @@ package com.microsoft.signalr; import java.util.Map; -final class CancelInvocationMessage extends HubMessage { +public final class CancelInvocationMessage extends HubMessage { private final int type = HubMessageType.CANCEL_INVOCATION.value; private Map headers; private final String invocationId; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CloseMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CloseMessage.java similarity index 94% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CloseMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CloseMessage.java index 1d89695057..3486949aac 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CloseMessage.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CloseMessage.java @@ -3,7 +3,7 @@ package com.microsoft.signalr; -final class CloseMessage extends HubMessage { +public final class CloseMessage extends HubMessage { private final String error; private final boolean allowReconnect; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CompletionMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CompletionMessage.java similarity index 95% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CompletionMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CompletionMessage.java index 7256c7dfd4..e581a636ac 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CompletionMessage.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CompletionMessage.java @@ -5,7 +5,7 @@ package com.microsoft.signalr; import java.util.Map; -final class CompletionMessage extends HubMessage { +public final class CompletionMessage extends HubMessage { private final int type = HubMessageType.COMPLETION.value; private Map headers; private final String invocationId; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/DefaultHttpClient.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/DefaultHttpClient.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeProtocol.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HandshakeProtocol.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeProtocol.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HandshakeProtocol.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeRequestMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HandshakeRequestMessage.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeRequestMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HandshakeRequestMessage.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeResponseMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HandshakeResponseMessage.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeResponseMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HandshakeResponseMessage.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpClient.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpClient.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpClient.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpClient.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java similarity index 95% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java index ce29e1a2ce..24722eba17 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java @@ -57,12 +57,13 @@ public class HttpHubConnectionBuilder { } /** - * Sets MessagePack as the {@link HubProtocol} to be used by the {@link HubConnection}. + * Sets the {@link HubProtocol} to be used by the {@link HubConnection}. * + * @param protocol The {@link HubProtocol} to be used by the {@link HubConnection}. * @return This instance of the HttpHubConnectionBuilder. */ - public HttpHubConnectionBuilder withMessagePackHubProtocol() { - this.protocol = new MessagePackHubProtocol(); + public HttpHubConnectionBuilder withHubProtocol(HubProtocol protocol) { + this.protocol = protocol; return this; } diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionState.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnectionState.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionState.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnectionState.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubException.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubException.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubMessage.java similarity index 89% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubMessage.java index ff9e50747a..c4192bf128 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessage.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubMessage.java @@ -6,6 +6,6 @@ package com.microsoft.signalr; /** * A base class for hub messages. */ - abstract class HubMessage { +public abstract class HubMessage { public abstract HubMessageType getMessageType(); } diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessageType.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubMessageType.java similarity index 94% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessageType.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubMessageType.java index a1bfeebfcf..805f9c9c4e 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessageType.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubMessageType.java @@ -3,7 +3,7 @@ package com.microsoft.signalr; -enum HubMessageType { +public enum HubMessageType { INVOCATION(1), STREAM_ITEM(2), COMPLETION(3), diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubProtocol.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubProtocol.java similarity index 88% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubProtocol.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubProtocol.java index 844a458c8c..42471a45e1 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubProtocol.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubProtocol.java @@ -9,14 +9,14 @@ import java.util.List; /** * A protocol abstraction for communicating with SignalR hubs. */ -interface HubProtocol { +public interface HubProtocol { String getName(); int getVersion(); - TransferFormat getTransferFormat(); /** * Creates a new list of {@link HubMessage}s. * @param message A ByteBuffer representation of one or more {@link HubMessage}s. + * @param binder The {@link InvocationBinder} to use for this Protocol instance. * @return A list of {@link HubMessage}s. */ List parseMessages(ByteBuffer message, InvocationBinder binder); diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBinder.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationBinder.java similarity index 92% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBinder.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationBinder.java index 40767a7a98..f09035f4f9 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBinder.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationBinder.java @@ -9,7 +9,7 @@ import java.util.List; /** * An abstraction for passing around information about method signatures. */ -interface InvocationBinder { +public interface InvocationBinder { Type getReturnType(String invocationId); List getParameterTypes(String methodName); } \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java similarity index 92% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java index cda90f9c94..f87c0b2cd1 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java @@ -3,7 +3,7 @@ package com.microsoft.signalr; -class InvocationBindingFailureMessage extends HubMessage { +public class InvocationBindingFailureMessage extends HubMessage { private final String invocationId; private final String target; private final Exception exception; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationHandler.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationHandler.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationHandler.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationHandler.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationMessage.java similarity index 96% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationMessage.java index ecc3650ffe..7820fb4ffc 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationMessage.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationMessage.java @@ -6,7 +6,7 @@ package com.microsoft.signalr; import java.util.Collection; import java.util.Map; -class InvocationMessage extends HubMessage { +public class InvocationMessage extends HubMessage { int type = HubMessageType.INVOCATION.value; private Map headers; private final String invocationId; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationRequest.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationRequest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationRequest.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationRequest.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/JsonHubProtocol.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/JsonHubProtocol.java similarity index 99% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/JsonHubProtocol.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/JsonHubProtocol.java index 892f600ea7..bd0348442e 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/JsonHubProtocol.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/JsonHubProtocol.java @@ -34,11 +34,6 @@ class JsonHubProtocol implements HubProtocol { return 1; } - @Override - public TransferFormat getTransferFormat() { - return TransferFormat.TEXT; - } - @Override public List parseMessages(ByteBuffer payload, InvocationBinder binder) { String payloadStr; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/LongPollingTransport.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/LongPollingTransport.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/LongPollingTransport.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/LongPollingTransport.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Negotiate.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Negotiate.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Negotiate.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Negotiate.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/NegotiateResponse.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/NegotiateResponse.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/NegotiateResponse.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/NegotiateResponse.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OnClosedCallback.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OnClosedCallback.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OnClosedCallback.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OnClosedCallback.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OnReceiveCallBack.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OnReceiveCallBack.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OnReceiveCallBack.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OnReceiveCallBack.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/PingMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/PingMessage.java similarity index 92% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/PingMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/PingMessage.java index 1c0286f70e..4efb26e21b 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/PingMessage.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/PingMessage.java @@ -3,7 +3,7 @@ package com.microsoft.signalr; -class PingMessage extends HubMessage +public class PingMessage extends HubMessage { private final int type = HubMessageType.PING.value; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java similarity index 92% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java index d7b145fa3f..dbd6c3cd91 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java @@ -3,7 +3,7 @@ package com.microsoft.signalr; -class StreamBindingFailureMessage extends HubMessage { +public class StreamBindingFailureMessage extends HubMessage { private final String invocationId; private final Exception exception; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java similarity index 90% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java index 0a8c6211b6..414adaf942 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java @@ -6,7 +6,7 @@ package com.microsoft.signalr; import java.util.Collection; import java.util.Map; -final class StreamInvocationMessage extends InvocationMessage { +public final class StreamInvocationMessage extends InvocationMessage { public StreamInvocationMessage(Map headers, String invocationId, String target, Object[] args, Collection streamIds) { super(headers, invocationId, target, args, streamIds); diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamItem.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamItem.java similarity index 95% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamItem.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamItem.java index 9b18f0bdc3..26dfc7f8e2 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamItem.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamItem.java @@ -5,7 +5,7 @@ package com.microsoft.signalr; import java.util.Map; -final class StreamItem extends HubMessage { +public final class StreamItem extends HubMessage { private final int type = HubMessageType.STREAM_ITEM.value; private Map headers; private final String invocationId; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Subscription.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Subscription.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransferFormat.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransferFormat.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransferFormat.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransferFormat.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Transport.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Transport.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Transport.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Transport.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransportEnum.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransportEnum.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransportEnum.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransportEnum.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransportOnClosedCallback.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransportOnClosedCallback.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransportOnClosedCallback.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransportOnClosedCallback.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TypeReference.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TypeReference.java similarity index 94% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TypeReference.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TypeReference.java index 9fad029eec..24213e663b 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TypeReference.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TypeReference.java @@ -31,6 +31,7 @@ public class TypeReference { /** * Gets the referenced type. + * @return The Type encapsulated by this TypeReference */ public Type getType() { return this.type; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/UserAgentHelper.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/UserAgentHelper.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/UserAgentHelper.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/UserAgentHelper.java diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Utils.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Utils.java new file mode 100644 index 0000000000..45fc99d32f --- /dev/null +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Utils.java @@ -0,0 +1,46 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +package com.microsoft.signalr; + +import java.io.IOException; +import java.lang.reflect.Array; +import java.lang.reflect.GenericArrayType; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.lang.reflect.WildcardType; +import java.nio.ByteBuffer; +import java.util.ArrayList; + +class Utils { + public static String appendQueryString(String original, String queryStringValue) { + if (original.contains("?")) { + return original + "&" + queryStringValue; + } else { + return original + "?" + queryStringValue; + } + } + + public static Class typeToClass(Type type) { + if (type == null) { + return null; + } + if (type instanceof Class) { + return (Class) type; + } else if (type instanceof GenericArrayType) { + // Instantiate an array of the same type as this type, then return its class + return Array.newInstance(typeToClass(((GenericArrayType)type).getGenericComponentType()), 0).getClass(); + } else if (type instanceof ParameterizedType) { + return typeToClass(((ParameterizedType) type).getRawType()); + } else if (type instanceof TypeVariable) { + Type[] bounds = ((TypeVariable) type).getBounds(); + return bounds.length == 0 ? Object.class : typeToClass(bounds[0]); + } else if (type instanceof WildcardType) { + Type[] bounds = ((WildcardType) type).getUpperBounds(); + return bounds.length == 0 ? Object.class : typeToClass(bounds[0]); + } else { + throw new UnsupportedOperationException("Cannot handle type class: " + type.getClass()); + } + } +} \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketTransport.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketTransport.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketTransport.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketTransport.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketWrapper.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketWrapper.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketWrapper.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketWrapper.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/WebsocketWrapperOnClosed.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebsocketWrapperOnClosed.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/WebsocketWrapperOnClosed.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebsocketWrapperOnClosed.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/package-info.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/package-info.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/package-info.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/package-info.java diff --git a/src/SignalR/clients/java/signalr/messagepack/build.gradle b/src/SignalR/clients/java/signalr/messagepack/build.gradle new file mode 100644 index 0000000000..7d4d979c11 --- /dev/null +++ b/src/SignalR/clients/java/signalr/messagepack/build.gradle @@ -0,0 +1,50 @@ +group 'com.microsoft.signalr.messagepack' + +dependencies { + implementation project(':core') + compile 'org.msgpack:msgpack-core:0.8.20' + compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' +} + +archivesBaseName = 'signalr-messagepack' + +task sourceJar(type: Jar) { + classifier "sources" + from sourceSets.main.allJava +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier "javadoc" + from javadoc.destinationDir +} + +task generatePOM { + pom { + project { + inceptionYear '2020' + description 'MessagePack protocol implementation for ASP.NET Core SignalR Client for Java applications' + url 'https://github.com/dotnet/aspnetcore' + name groupId + ':' + artifactId + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + scm { + connection 'scm:git:git://github.com/dotnet/aspnetcore.git' + developerConnection 'scm:git:git://github.com/dotnet/aspnetcore.git' + url 'http://github.com/dotnet/aspnetcore/tree/master' + } + developers { + developer { + id 'microsoft' + name 'Microsoft' + } + } + } + }.writeTo("${buildDir}/libs/signalr-messagepack-${project.version}.pom") +} + +task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM]) \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj b/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj new file mode 100644 index 0000000000..37e14879af --- /dev/null +++ b/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj @@ -0,0 +1,57 @@ + + + + + + java:signalr-messagepack + + true + false + + $(GradleOptions) -Dorg.gradle.daemon=false + $(OutputPath) + + + + + + + + + + + + + $(PackDependsOn); + Build + + + + + + + $(GradleOptions) -PpackageVersion="$(PackageVersion)" + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/MessagePackHubProtocol.java b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java similarity index 97% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/MessagePackHubProtocol.java rename to src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java index bd7f9cd7b2..ebd2047331 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/MessagePackHubProtocol.java +++ b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -package com.microsoft.signalr; +package com.microsoft.signalr.messagepack; import java.io.IOException; import java.lang.reflect.Type; @@ -25,7 +25,21 @@ import org.msgpack.value.ValueType; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.TypeFactory; -class MessagePackHubProtocol implements HubProtocol { +import com.microsoft.signalr.CancelInvocationMessage; +import com.microsoft.signalr.CloseMessage; +import com.microsoft.signalr.CompletionMessage; +import com.microsoft.signalr.HubMessage; +import com.microsoft.signalr.HubMessageType; +import com.microsoft.signalr.HubProtocol; +import com.microsoft.signalr.InvocationBinder; +import com.microsoft.signalr.InvocationBindingFailureMessage; +import com.microsoft.signalr.InvocationMessage; +import com.microsoft.signalr.PingMessage; +import com.microsoft.signalr.StreamBindingFailureMessage; +import com.microsoft.signalr.StreamInvocationMessage; +import com.microsoft.signalr.StreamItem; + +public class MessagePackHubProtocol implements HubProtocol { private static final int ERROR_RESULT = 1; private static final int VOID_RESULT = 2; @@ -44,11 +58,6 @@ class MessagePackHubProtocol implements HubProtocol { return 1; } - @Override - public TransferFormat getTransferFormat() { - return TransferFormat.BINARY; - } - @Override public List parseMessages(ByteBuffer payload, InvocationBinder binder) { if (payload.remaining() == 0) { diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Utils.java b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/Utils.java similarity index 89% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Utils.java rename to src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/Utils.java index 88d589a936..4eba17b6fc 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Utils.java +++ b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/Utils.java @@ -1,7 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -package com.microsoft.signalr; +package com.microsoft.signalr.messagepack; import java.io.IOException; import java.lang.reflect.Array; @@ -14,14 +11,6 @@ import java.nio.ByteBuffer; import java.util.ArrayList; class Utils { - public static String appendQueryString(String original, String queryStringValue) { - if (original.contains("?")) { - return original + "&" + queryStringValue; - } else { - return original + "?" + queryStringValue; - } - } - public static int readLengthHeader(ByteBuffer buffer) throws IOException { // The payload starts with a length prefix encoded as a VarInt. VarInts use the most significant bit // as a marker whether the byte is the last byte of the VarInt or if it spans to the next byte. Bytes @@ -89,9 +78,9 @@ class Utils { } public static Class typeToClass(Type type) { - if (type == null) { - return null; - } + if (type == null) { + return null; + } if (type instanceof Class) { return (Class) type; } else if (type instanceof GenericArrayType) { @@ -108,5 +97,5 @@ class Utils { } else { throw new UnsupportedOperationException("Cannot handle type class: " + type.getClass()); } - } -} \ No newline at end of file + } +} diff --git a/src/SignalR/clients/java/signalr/settings.gradle b/src/SignalR/clients/java/signalr/settings.gradle index 80beacb801..a82ab27def 100644 --- a/src/SignalR/clients/java/signalr/settings.gradle +++ b/src/SignalR/clients/java/signalr/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = 'signalr' -include 'main' +include 'core', 'messagepack', 'test' diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Version.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Version.java deleted file mode 100644 index 3877f515be..0000000000 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Version.java +++ /dev/null @@ -1,11 +0,0 @@ - -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -package com.microsoft.signalr; - -class Version { - public static String getDetailedVersion() { - return "5.0.0-dev"; - } -} diff --git a/src/SignalR/clients/java/signalr/test/build.gradle b/src/SignalR/clients/java/signalr/test/build.gradle new file mode 100644 index 0000000000..75a451b929 --- /dev/null +++ b/src/SignalR/clients/java/signalr/test/build.gradle @@ -0,0 +1,16 @@ +apply plugin: 'org.junit.platform.gradle.plugin' + +dependencies { + implementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' + compile 'org.junit.jupiter:junit-jupiter-params:5.3.1' + runtime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' + implementation 'com.google.code.gson:gson:2.8.5' + testCompile 'org.slf4j:slf4j-jdk14:1.7.25' + implementation project(':core') + implementation project(':messagepack') + compile project(':messagepack') +} + +junitPlatform { + reportsDir file('test-results') +} \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj similarity index 55% rename from src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj rename to src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj index 84771b3fe4..d44d8d25a0 100644 --- a/src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj +++ b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj @@ -2,75 +2,44 @@ - - - java:signalr - - - true - + false true - true - + + false $(GradleOptions) -Dorg.gradle.daemon=false $(OutputPath) true - - - - - - - - - - $(PackDependsOn); - Build - - - - - - - - - - + - - - - + - + - - - - + + + + - - + + + diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/ByteString.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/ByteString.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/ByteString.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/ByteString.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HandshakeProtocolTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HandshakeProtocolTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HandshakeProtocolTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HandshakeProtocolTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionBuilderTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionBuilderTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionBuilderTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionBuilderTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubExceptionTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubExceptionTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubExceptionTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubExceptionTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/JsonHubProtocolTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/JsonHubProtocolTest.java similarity index 99% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/JsonHubProtocolTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/JsonHubProtocolTest.java index 1b707d6a53..c77fa15093 100644 --- a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/JsonHubProtocolTest.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/JsonHubProtocolTest.java @@ -26,11 +26,6 @@ class JsonHubProtocolTest { assertEquals(1, jsonHubProtocol.getVersion()); } - @Test - public void checkTransferFormat() { - assertEquals(TransferFormat.TEXT, jsonHubProtocol.getTransferFormat()); - } - @Test public void verifyWriteMessage() { InvocationMessage invocationMessage = new InvocationMessage(null, null, "test", new Object[] {"42"}, null); diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/LongPollingTransportTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/LongPollingTransportTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MessagePackHubProtocolTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java similarity index 99% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MessagePackHubProtocolTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java index 37df89fabf..ad8cca19fc 100644 --- a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MessagePackHubProtocolTest.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java @@ -19,6 +19,8 @@ import java.util.TreeMap; import org.junit.jupiter.api.Test; +import com.microsoft.signalr.messagepack.MessagePackHubProtocol; + class MessagePackHubProtocolTest { private MessagePackHubProtocol messagePackHubProtocol = new MessagePackHubProtocol(); @@ -31,11 +33,6 @@ class MessagePackHubProtocolTest { public void checkVersionNumber() { assertEquals(1, messagePackHubProtocol.getVersion()); } - - @Test - public void checkTransferFormat() { - assertEquals(TransferFormat.BINARY, messagePackHubProtocol.getTransferFormat()); - } @Test public void verifyWriteInvocationMessage() { diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MockTransport.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MockTransport.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MockTransport.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MockTransport.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/NegotiateResponseTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/NegotiateResponseTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/NegotiateResponseTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/NegotiateResponseTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/PersonPojo.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/PersonPojo.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/PersonPojo.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/PersonPojo.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/ResolveNegotiateUrlTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/ResolveNegotiateUrlTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/ResolveNegotiateUrlTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/ResolveNegotiateUrlTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestBinder.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestBinder.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestBinder.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestBinder.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestHttpClient.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestHttpClient.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestHttpClient.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestHttpClient.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestUtils.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java similarity index 92% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestUtils.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java index 29b0870988..bf6f7e0b61 100644 --- a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestUtils.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java @@ -5,6 +5,7 @@ package com.microsoft.signalr; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; +import com.microsoft.signalr.messagepack.MessagePackHubProtocol; class TestUtils { @@ -33,7 +34,7 @@ class TestUtils { .shouldSkipNegotiate(skipNegotiate); if (withMessagePack) { - builder = builder.withMessagePackHubProtocol(); + builder = builder.withHubProtocol(new MessagePackHubProtocol()); } return builder.build(); diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/UserAgentTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/UserAgentTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/UserAgentTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/UserAgentTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/WebSocketTransportTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/WebSocketTransportTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/WebSocketTransportTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/WebSocketTransportTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/WebSocketTransportUrlFormatTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/WebSocketTransportUrlFormatTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/WebSocketTransportUrlFormatTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/WebSocketTransportUrlFormatTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/sample/Chat.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/sample/Chat.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/sample/Chat.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/sample/Chat.java From ecdcc752d4639061c2c49727ee77a1039bbbca22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 05:54:24 +0000 Subject: [PATCH 3/3] [release/5.0] Update dependencies from dotnet/runtime dotnet/efcore (#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 --- eng/Version.Details.xml | 296 ++++++++++++++++++++-------------------- eng/Versions.props | 148 ++++++++++---------- 2 files changed, 222 insertions(+), 222 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33513b5fe4..8f6c0bfb28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,309 +13,309 @@ https://github.com/dotnet/blazor cc449601d638ffaab58ae9487f0fd010bb178a12 - + https://github.com/dotnet/efcore - 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 + 422fcb2a51c7616b0e2bbeb28c10309ed1b3b365 - + https://github.com/dotnet/efcore - 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 + 422fcb2a51c7616b0e2bbeb28c10309ed1b3b365 - + https://github.com/dotnet/efcore - 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 + 422fcb2a51c7616b0e2bbeb28c10309ed1b3b365 - + https://github.com/dotnet/efcore - 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 + 422fcb2a51c7616b0e2bbeb28c10309ed1b3b365 - + https://github.com/dotnet/efcore - 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 + 422fcb2a51c7616b0e2bbeb28c10309ed1b3b365 - + https://github.com/dotnet/efcore - 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 + 422fcb2a51c7616b0e2bbeb28c10309ed1b3b365 - + https://github.com/dotnet/efcore - 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 + 422fcb2a51c7616b0e2bbeb28c10309ed1b3b365 - + https://github.com/dotnet/efcore - 3c0a65a849d00582fd55b3c729cc5df26ae20ae2 + 422fcb2a51c7616b0e2bbeb28c10309ed1b3b365 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 67deb1d9bea3b98e1f21711c2b014240f86cec41 + 38017c3935de95d0335bac04f4901ddfc2718656 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 1bc56934e1..92ccd824a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,85 +64,85 @@ 3.8.0-2.20407.3 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 - 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.14 3.2.0 - 5.0.0-rc.1.20451.5 - 5.0.0-rc.1.20451.5 - 5.0.0-rc.1.20451.5 - 5.0.0-rc.1.20451.5 - 5.0.0-rc.1.20451.5 - 5.0.0-rc.1.20451.5 - 5.0.0-rc.1.20451.5 - 5.0.0-rc.1.20451.5 + 5.0.0-rc.1.20451.13 + 5.0.0-rc.1.20451.13 + 5.0.0-rc.1.20451.13 + 5.0.0-rc.1.20451.13 + 5.0.0-rc.1.20451.13 + 5.0.0-rc.1.20451.13 + 5.0.0-rc.1.20451.13 + 5.0.0-rc.1.20451.13 5.0.0-beta.20431.1