From 963970feeb3159c826b7ebcab26db3de6bfac51b Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Wed, 15 Jan 2025 15:36:44 +1100 Subject: [PATCH] update list of shipped binaries for plugins --- Disco.Services/Plugins/PluginManifest.cs | 36 ++++++++++++++++++++++-- Disco.Web/App_Start/WebApiConfig.cs | 19 ------------- Disco.Web/Global.asax.cs | 2 -- 3 files changed, 33 insertions(+), 24 deletions(-) delete mode 100644 Disco.Web/App_Start/WebApiConfig.cs diff --git a/Disco.Services/Plugins/PluginManifest.cs b/Disco.Services/Plugins/PluginManifest.cs index 7755bba3..b374bd22 100644 --- a/Disco.Services/Plugins/PluginManifest.cs +++ b/Disco.Services/Plugins/PluginManifest.cs @@ -148,12 +148,28 @@ namespace Disco.Services.Plugins "MarkdownSharp", "Microsoft.AspNet.SignalR.Core", "Microsoft.AspNet.SignalR.SystemWeb", + "Microsoft.AspNetCore.Connections.Abstractions", + "Microsoft.AspNetCore.Http.Connections.Client", + "Microsoft.AspNetCore.Http.Connections.Common", + "Microsoft.AspNetCore.SignalR.Client.Core", + "Microsoft.AspNetCore.SignalR.Client", + "Microsoft.AspNetCore.SignalR.Common", + "Microsoft.AspNetCore.SignalR.Protocols.Json", + "Microsoft.Bcl.AsyncInterfaces", + "Microsoft.Bcl.TimeProvider", + "Microsoft.Extensions.DependencyInjection.Abstractions", + "Microsoft.Extensions.DependencyInjection", + "Microsoft.Extensions.Features", + "Microsoft.Extensions.Logging.Abstractions", + "Microsoft.Extensions.Logging", + "Microsoft.Extensions.Options", + "Microsoft.Extensions.Primitives", "Microsoft.Owin", "Microsoft.Owin.Host.SystemWeb", "Microsoft.Owin.Security", "Microsoft.Web.Infrastructure", - "Newtonsoft.Json", "Newtonsoft.Json.Bson", + "Newtonsoft.Json", "Owin", "PdfiumViewer", "PdfSharp", @@ -162,15 +178,29 @@ namespace Disco.Services.Plugins "RazorGenerator.Mvc", "Renci.SshNet", "Spring.Core", + "System.Buffers", "System.Data.SqlServerCe", "System.Data.SqlServerCe.Entity", + "System.Diagnostics.DiagnosticSource", + "System.IO.Pipelines", + "System.Memory", + "System.Net.Http", "System.Net.Http.Extensions", "System.Net.Http.Formatting", "System.Net.Http.Primitives", + "System.Net.ServerSentEvents", + "System.Numerics.Vectors", "System.Reactive.Core", "System.Reactive.Interfaces", "System.Reactive.Linq", "System.Reactive.PlatformServices", + "System.Runtime.CompilerServices.Unsafe", + "System.Runtime.InteropServices.RuntimeInformation", + "System.Text.Encodings.Web", + "System.Text.Json", + "System.Threading.Channels", + "System.Threading.Tasks.Extensions", + "System.ValueTuple", "System.Web.Helpers", "System.Web.Http", "System.Web.Http.WebHost", @@ -181,7 +211,7 @@ namespace Disco.Services.Plugins "System.Web.WebPages.Razor", "T4MVCExtensions", "WebActivatorEx", - "ZXingNet" + "ZXingNet", }; }); public static IReadOnlyCollection PluginExcludedAssemblies @@ -490,7 +520,7 @@ namespace Disco.Services.Plugins var fileDateCheck = System.IO.File.GetLastWriteTime(resourcePath); if (fileDateCheck == resourceHash.Item2) #endif - return new Tuple(resourcePath, resourceHash.Item1); + return new Tuple(resourcePath, resourceHash.Item1); } if (!File.Exists(resourcePath)) diff --git a/Disco.Web/App_Start/WebApiConfig.cs b/Disco.Web/App_Start/WebApiConfig.cs deleted file mode 100644 index 7f09d1cd..00000000 --- a/Disco.Web/App_Start/WebApiConfig.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Web.Http; - -namespace Disco.Web -{ - public static class WebApiConfig - { - public static void Register(HttpConfiguration config) - { - // Migrate to WebAPI Eventually... - - - //config.Routes.MapHttpRoute( - // name: "DefaultApi", - // routeTemplate: "api/{controller}/{id}", - // defaults: new { id = RouteParameter.Optional } - //); - } - } -} diff --git a/Disco.Web/Global.asax.cs b/Disco.Web/Global.asax.cs index a1f1a7dc..e2ef9a72 100644 --- a/Disco.Web/Global.asax.cs +++ b/Disco.Web/Global.asax.cs @@ -55,8 +55,6 @@ namespace Disco.Web AreaRegistration.RegisterAllAreas(); - WebApiConfig.Register(GlobalConfiguration.Configuration); - FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters); RouteConfig.RegisterRoutes(RouteTable.Routes);