diff --git a/server/ConfigureSwaggerOptions.cs b/server/ConfigureSwaggerOptions.cs index 28e7200..93c825e 100644 --- a/server/ConfigureSwaggerOptions.cs +++ b/server/ConfigureSwaggerOptions.cs @@ -1,5 +1,6 @@ namespace Sockeye { + using Asp.Versioning.ApiExplorer; using Microsoft.AspNetCore.Mvc.ApiExplorer; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; diff --git a/server/Controllers/ApiRootController.cs b/server/Controllers/ApiRootController.cs index b46e3e8..0954b74 100644 --- a/server/Controllers/ApiRootController.cs +++ b/server/Controllers/ApiRootController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.Extensions.Logging; using System; using Sockeye.Util; diff --git a/server/Controllers/AttachmentController.cs b/server/Controllers/AttachmentController.cs index 22364cd..4cd4af1 100644 --- a/server/Controllers/AttachmentController.cs +++ b/server/Controllers/AttachmentController.cs @@ -2,6 +2,7 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/AuthController.cs b/server/Controllers/AuthController.cs index 848a510..58b1de2 100644 --- a/server/Controllers/AuthController.cs +++ b/server/Controllers/AuthController.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Authorization; using TwoFactorAuthNet; using QRCoder; diff --git a/server/Controllers/AuthorizationRolesController.cs b/server/Controllers/AuthorizationRolesController.cs index 2673cb1..9c8b00e 100644 --- a/server/Controllers/AuthorizationRolesController.cs +++ b/server/Controllers/AuthorizationRolesController.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/BackupController.cs b/server/Controllers/BackupController.cs index eafc520..d0d4c3a 100644 --- a/server/Controllers/BackupController.cs +++ b/server/Controllers/BackupController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/CustomerController.cs b/server/Controllers/CustomerController.cs index d5e930f..f96864c 100644 --- a/server/Controllers/CustomerController.cs +++ b/server/Controllers/CustomerController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/CustomerNoteController.cs b/server/Controllers/CustomerNoteController.cs index 70d1769..9ffd3b5 100644 --- a/server/Controllers/CustomerNoteController.cs +++ b/server/Controllers/CustomerNoteController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/CustomerNotifySubscriptionController.cs b/server/Controllers/CustomerNotifySubscriptionController.cs index 12d3aba..669cd93 100644 --- a/server/Controllers/CustomerNotifySubscriptionController.cs +++ b/server/Controllers/CustomerNotifySubscriptionController.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/DashboardViewController.cs b/server/Controllers/DashboardViewController.cs index 215441a..53fbc20 100644 --- a/server/Controllers/DashboardViewController.cs +++ b/server/Controllers/DashboardViewController.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/DataListColumnViewController.cs b/server/Controllers/DataListColumnViewController.cs index 8ba925d..6e6b37e 100644 --- a/server/Controllers/DataListColumnViewController.cs +++ b/server/Controllers/DataListColumnViewController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/DataListController.cs b/server/Controllers/DataListController.cs index 605655a..5fdcd6e 100644 --- a/server/Controllers/DataListController.cs +++ b/server/Controllers/DataListController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/DataListSavedFilterController.cs b/server/Controllers/DataListSavedFilterController.cs index bbb4a6e..0658e2e 100644 --- a/server/Controllers/DataListSavedFilterController.cs +++ b/server/Controllers/DataListSavedFilterController.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/EnumListController.cs b/server/Controllers/EnumListController.cs index 5786ade..c47ac24 100644 --- a/server/Controllers/EnumListController.cs +++ b/server/Controllers/EnumListController.cs @@ -2,6 +2,7 @@ using System; using System.Linq; using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/EventLogController.cs b/server/Controllers/EventLogController.cs index 2597d09..d1a2ca8 100644 --- a/server/Controllers/EventLogController.cs +++ b/server/Controllers/EventLogController.cs @@ -2,6 +2,7 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/ExportController.cs b/server/Controllers/ExportController.cs index 179163a..680f49f 100644 --- a/server/Controllers/ExportController.cs +++ b/server/Controllers/ExportController.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/FetchController.cs b/server/Controllers/FetchController.cs index 53bd9f3..bb381a6 100644 --- a/server/Controllers/FetchController.cs +++ b/server/Controllers/FetchController.cs @@ -12,7 +12,9 @@ namespace Sockeye.Api.Controllers [Route("fetch")]//Legacy v7 license fetch route [Produces("text/plain")] +#pragma warning disable AV0014 // Missing API behavior public class FetchController : ControllerBase +#pragma warning restore AV0014 // Missing API behavior { private readonly AyContext ct; diff --git a/server/Controllers/FormCustomController.cs b/server/Controllers/FormCustomController.cs index b771ae3..fbd04cc 100644 --- a/server/Controllers/FormCustomController.cs +++ b/server/Controllers/FormCustomController.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/FormFieldsDefinitionsController.cs b/server/Controllers/FormFieldsDefinitionsController.cs index 45ea545..3c79b47 100644 --- a/server/Controllers/FormFieldsDefinitionsController.cs +++ b/server/Controllers/FormFieldsDefinitionsController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/FormUserOptionsController.cs b/server/Controllers/FormUserOptionsController.cs index cc2d6cf..0d65137 100644 --- a/server/Controllers/FormUserOptionsController.cs +++ b/server/Controllers/FormUserOptionsController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/GZCaseController.cs b/server/Controllers/GZCaseController.cs index f66e5aa..369d226 100644 --- a/server/Controllers/GZCaseController.cs +++ b/server/Controllers/GZCaseController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/GlobalBizSettingsController.cs b/server/Controllers/GlobalBizSettingsController.cs index 1991d86..d1220ed 100644 --- a/server/Controllers/GlobalBizSettingsController.cs +++ b/server/Controllers/GlobalBizSettingsController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/GlobalOpsBackupSettingsController.cs b/server/Controllers/GlobalOpsBackupSettingsController.cs index 5576f83..04cc8a9 100644 --- a/server/Controllers/GlobalOpsBackupSettingsController.cs +++ b/server/Controllers/GlobalOpsBackupSettingsController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/GlobalOpsNotificationSettingsController.cs b/server/Controllers/GlobalOpsNotificationSettingsController.cs index 6adbc1b..57e4c42 100644 --- a/server/Controllers/GlobalOpsNotificationSettingsController.cs +++ b/server/Controllers/GlobalOpsNotificationSettingsController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/HeadOfficeController.cs b/server/Controllers/HeadOfficeController.cs index fa58035..31a8f92 100644 --- a/server/Controllers/HeadOfficeController.cs +++ b/server/Controllers/HeadOfficeController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/HealthController.cs b/server/Controllers/HealthController.cs index e2218f1..bcbbbed 100644 --- a/server/Controllers/HealthController.cs +++ b/server/Controllers/HealthController.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Diagnostics.HealthChecks; diff --git a/server/Controllers/ImportController.cs b/server/Controllers/ImportController.cs index 9718dfd..8cf9c3d 100644 --- a/server/Controllers/ImportController.cs +++ b/server/Controllers/ImportController.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/IntegrationController.cs b/server/Controllers/IntegrationController.cs index 244b45f..58bb361 100644 --- a/server/Controllers/IntegrationController.cs +++ b/server/Controllers/IntegrationController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/JobOperationsController.cs b/server/Controllers/JobOperationsController.cs index 4987276..a72e7e8 100644 --- a/server/Controllers/JobOperationsController.cs +++ b/server/Controllers/JobOperationsController.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/KPIController.cs b/server/Controllers/KPIController.cs index 5615575..9054e91 100644 --- a/server/Controllers/KPIController.cs +++ b/server/Controllers/KPIController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/LicenseController.cs b/server/Controllers/LicenseController.cs index 71b1f78..b8c8e56 100644 --- a/server/Controllers/LicenseController.cs +++ b/server/Controllers/LicenseController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/LogFilesController.cs b/server/Controllers/LogFilesController.cs index ce3e57a..e6c835d 100644 --- a/server/Controllers/LogFilesController.cs +++ b/server/Controllers/LogFilesController.cs @@ -1,6 +1,7 @@ using System.Linq; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/LogoController.cs b/server/Controllers/LogoController.cs index 301adcd..3f7c6a0 100644 --- a/server/Controllers/LogoController.cs +++ b/server/Controllers/LogoController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/MemoController.cs b/server/Controllers/MemoController.cs index 2c90dd9..4fad8f2 100644 --- a/server/Controllers/MemoController.cs +++ b/server/Controllers/MemoController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/NameController.cs b/server/Controllers/NameController.cs index 7cbdf68..c242be0 100644 --- a/server/Controllers/NameController.cs +++ b/server/Controllers/NameController.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/NotifyController.cs b/server/Controllers/NotifyController.cs index 60f06ae..e7e97f7 100644 --- a/server/Controllers/NotifyController.cs +++ b/server/Controllers/NotifyController.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/NotifySubscriptionController.cs b/server/Controllers/NotifySubscriptionController.cs index 0fc72e1..80f785a 100644 --- a/server/Controllers/NotifySubscriptionController.cs +++ b/server/Controllers/NotifySubscriptionController.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/PickListController.cs b/server/Controllers/PickListController.cs index b99700d..168c329 100644 --- a/server/Controllers/PickListController.cs +++ b/server/Controllers/PickListController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/ProductController.cs b/server/Controllers/ProductController.cs index 2737891..b9e01d4 100644 --- a/server/Controllers/ProductController.cs +++ b/server/Controllers/ProductController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/PurchaseController.cs b/server/Controllers/PurchaseController.cs index 1cd9dde..b76f679 100644 --- a/server/Controllers/PurchaseController.cs +++ b/server/Controllers/PurchaseController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/ReminderController.cs b/server/Controllers/ReminderController.cs index c62d8d2..0474d86 100644 --- a/server/Controllers/ReminderController.cs +++ b/server/Controllers/ReminderController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/ReportController.cs b/server/Controllers/ReportController.cs index c07c7e8..58d2eaf 100644 --- a/server/Controllers/ReportController.cs +++ b/server/Controllers/ReportController.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using System; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http.Features; diff --git a/server/Controllers/ReviewController.cs b/server/Controllers/ReviewController.cs index 944ddc1..fe64daa 100644 --- a/server/Controllers/ReviewController.cs +++ b/server/Controllers/ReviewController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/RvfController.cs b/server/Controllers/RvfController.cs index cca612e..e59923c 100644 --- a/server/Controllers/RvfController.cs +++ b/server/Controllers/RvfController.cs @@ -14,7 +14,9 @@ namespace Sockeye.Api.Controllers // [AllowAnonymous] [Route("rvf")]//v8 fetch license route [Produces("application/json")] +#pragma warning disable AV0014 // Missing API behavior public class RvfController : ControllerBase +#pragma warning restore AV0014 // Missing API behavior { private readonly AyContext ct; diff --git a/server/Controllers/RvrController.cs b/server/Controllers/RvrController.cs index 6d80517..92cb747 100644 --- a/server/Controllers/RvrController.cs +++ b/server/Controllers/RvrController.cs @@ -13,7 +13,9 @@ namespace Sockeye.Api.Controllers { [Route("rvr")]//v8 TRIAL REQUEST HANDLER ROUTE [Produces("application/json")] +#pragma warning disable AV0014 // Missing API behavior public class RvrController : ControllerBase +#pragma warning restore AV0014 // Missing API behavior { private readonly AyContext ct; diff --git a/server/Controllers/ScheduleController.cs b/server/Controllers/ScheduleController.cs index ea1cb7e..1685684 100644 --- a/server/Controllers/ScheduleController.cs +++ b/server/Controllers/ScheduleController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using System; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/SearchController.cs b/server/Controllers/SearchController.cs index 5e53977..5834774 100644 --- a/server/Controllers/SearchController.cs +++ b/server/Controllers/SearchController.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/ServerMetricsController.cs b/server/Controllers/ServerMetricsController.cs index 7d5e84f..fbd82e8 100644 --- a/server/Controllers/ServerMetricsController.cs +++ b/server/Controllers/ServerMetricsController.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.EntityFrameworkCore; diff --git a/server/Controllers/ServerStateController.cs b/server/Controllers/ServerStateController.cs index 3e10091..9ac5d97 100644 --- a/server/Controllers/ServerStateController.cs +++ b/server/Controllers/ServerStateController.cs @@ -2,6 +2,7 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; using Sockeye.Api.ControllerHelpers; diff --git a/server/Controllers/SubscriptionController.cs b/server/Controllers/SubscriptionController.cs index 3b9a318..57e426a 100644 --- a/server/Controllers/SubscriptionController.cs +++ b/server/Controllers/SubscriptionController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/SubscriptionServerController.cs b/server/Controllers/SubscriptionServerController.cs index 545b4ce..bc58044 100644 --- a/server/Controllers/SubscriptionServerController.cs +++ b/server/Controllers/SubscriptionServerController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/SubscriptionServerTrialRequestController.cs b/server/Controllers/SubscriptionServerTrialRequestController.cs index 750c0d2..e26538f 100644 --- a/server/Controllers/SubscriptionServerTrialRequestController.cs +++ b/server/Controllers/SubscriptionServerTrialRequestController.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Microsoft.EntityFrameworkCore; diff --git a/server/Controllers/TagController.cs b/server/Controllers/TagController.cs index 9e8e05d..54ae2d4 100644 --- a/server/Controllers/TagController.cs +++ b/server/Controllers/TagController.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/TranslationController.cs b/server/Controllers/TranslationController.cs index 0d70e19..7248236 100644 --- a/server/Controllers/TranslationController.cs +++ b/server/Controllers/TranslationController.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/TrialLicenseRequestController.cs b/server/Controllers/TrialLicenseRequestController.cs index 11eea8e..d2e267a 100644 --- a/server/Controllers/TrialLicenseRequestController.cs +++ b/server/Controllers/TrialLicenseRequestController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/UserController.cs b/server/Controllers/UserController.cs index 00d24ec..19ff231 100644 --- a/server/Controllers/UserController.cs +++ b/server/Controllers/UserController.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/UserOptionsController.cs b/server/Controllers/UserOptionsController.cs index 66c5be3..d82df38 100644 --- a/server/Controllers/UserOptionsController.cs +++ b/server/Controllers/UserOptionsController.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; diff --git a/server/Controllers/VendorController.cs b/server/Controllers/VendorController.cs index 92a789f..3029e45 100644 --- a/server/Controllers/VendorController.cs +++ b/server/Controllers/VendorController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Controllers/VendorNotificationController.cs b/server/Controllers/VendorNotificationController.cs index 7321b78..d794ac9 100644 --- a/server/Controllers/VendorNotificationController.cs +++ b/server/Controllers/VendorNotificationController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; diff --git a/server/Startup.cs b/server/Startup.cs index 25996af..5006baf 100644 --- a/server/Startup.cs +++ b/server/Startup.cs @@ -4,7 +4,6 @@ using System.Linq; using System; using System.Collections.Generic; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Mvc.ApiExplorer; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.EntityFrameworkCore; @@ -22,6 +21,8 @@ using Sockeye.Generator; using Sockeye.Biz; using NLog.Extensions.Logging; using StackExchange.Profiling; +using Asp.Versioning.ApiExplorer; +using Asp.Versioning; namespace Sockeye @@ -195,28 +196,46 @@ namespace Sockeye + // #region Swagger + + // services + // .AddApiVersioning(options => + // { + // options.AssumeDefaultVersionWhenUnspecified = true; + // options.DefaultApiVersion = new ApiVersion(8,0);// Microsoft.AspNetCore.Mvc.ApiVersion.Parse("8.0"); + // options.ReportApiVersions = true; + // }); + // services.AddVersionedApiExplorer(options => + // { + + // // add the versioned api explorer, which also adds IApiVersionDescriptionProvider service + // // note: the specified format code will format the version as "'v'major[.minor][-status]" + // options.GroupNameFormat = "'v'VVV"; + + // // note: this option is only necessary when versioning by url segment. the SubstitutionFormat + // // can also be used to control the format of the API version in route templates + + // //THIS IS WHAT ADDS THE API version PARAMETER AUTOMATICALLY so you don't need to type an 8 in every swagger-ui route test + // options.SubstituteApiVersionInUrl = true; + // }); #region Swagger services - .AddApiVersioning(options => - { - options.AssumeDefaultVersionWhenUnspecified = true; - options.DefaultApiVersion = Microsoft.AspNetCore.Mvc.ApiVersion.Parse("8.0"); - options.ReportApiVersions = true; - }); - services.AddVersionedApiExplorer(options => - { + .AddApiVersioning(options => + { + options.AssumeDefaultVersionWhenUnspecified = true; + options.DefaultApiVersion = new ApiVersion(8, 0); + options.ReportApiVersions = true; + }) + .AddMvc() + .AddApiExplorer(options => + { + // format the version as "'v'major[.minor][-status]" + options.GroupNameFormat = "'v'VVV"; - // add the versioned api explorer, which also adds IApiVersionDescriptionProvider service - // note: the specified format code will format the version as "'v'major[.minor][-status]" - options.GroupNameFormat = "'v'VVV"; - - // note: this option is only necessary when versioning by url segment. the SubstitutionFormat - // can also be used to control the format of the API version in route templates - - //THIS IS WHAT ADDS THE API version PARAMETER AUTOMATICALLY so you don't need to type an 8 in every swagger-ui route test - options.SubstituteApiVersionInUrl = true; - }); + // THIS IS WHAT ADDS THE API version PARAMETER AUTOMATICALLY so you don't need to type an 8 in every swagger-ui route test + options.SubstituteApiVersionInUrl = true; + }); services.AddTransient, ConfigureSwaggerOptions>(); services.AddSwaggerGen( c => diff --git a/server/sockeye.csproj b/server/sockeye.csproj index ae93a5c..5ebd46a 100644 --- a/server/sockeye.csproj +++ b/server/sockeye.csproj @@ -1,6 +1,6 @@ - net6.0 + net10.0 true @@ -19,14 +19,14 @@ - + - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/sockeye.tests/sockeye.tests.csproj b/sockeye.tests/sockeye.tests.csproj index e84c3e3..20a6358 100644 --- a/sockeye.tests/sockeye.tests.csproj +++ b/sockeye.tests/sockeye.tests.csproj @@ -1,15 +1,18 @@  - net6.0 + net10.0 enable disable false - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all +