Primary constructor

NuGet.config

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear/>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+  <packageSourceMapping>
+    <packageSource key="nuget.org">
+      <package pattern="*" />
+    </packageSource>
+  </packageSourceMapping>
+</configuration>

RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj

@@ -39,7 +39,7 @@
     <None Include="..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs

@@ -2,17 +2,8 @@
 
 using System.Globalization;
 
-internal sealed class CaptureControlService : ICaptureControlService
+internal sealed class CaptureControlService(IHttpClientFactory httpClientFactory, INetworkService networkService) : ICaptureControlService
 {
-    private readonly IHttpClientFactory httpClientFactory;
-    private readonly INetworkService networkService;
-
-    public CaptureControlService(IHttpClientFactory httpClientFactory, INetworkService networkService)
-    {
-        this.httpClientFactory = httpClientFactory;
-        this.networkService = networkService;
-    }
-
     public async ValueTask<IEnumerable<CaptureInterfaceGroup>> GetInterfacesAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         string sid = await GetSidAsync(internetGatewayDevice).ConfigureAwait(false);

RS.Fritz.Manager.API/Services/DeviceHosts/DeviceHostsService.cs

@@ -3,17 +3,8 @@
 using System.Runtime.Serialization;
 using System.Xml;
 
-internal sealed class DeviceHostsService : IDeviceHostsService
+internal sealed class DeviceHostsService(IHttpClientFactory httpClientFactory, INetworkService networkService) : IDeviceHostsService
 {
-    private readonly IHttpClientFactory httpClientFactory;
-    private readonly INetworkService networkService;
-
-    public DeviceHostsService(IHttpClientFactory httpClientFactory, INetworkService networkService)
-    {
-        this.httpClientFactory = httpClientFactory;
-        this.networkService = networkService;
-    }
-
     public async ValueTask<DeviceHostInfo> GetDeviceHostsAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         HostsGetHostListPathResponse hostsGetHostListPathResponse = await internetGatewayDevice.HostsGetHostListPathAsync().ConfigureAwait(false);

RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs

@@ -7,26 +7,14 @@
 using System.Text;
 using System.Xml;
 
-internal sealed class DeviceSearchService : IDeviceSearchService
+internal sealed class DeviceSearchService(IHttpClientFactory httpClientFactory, IFritzServiceOperationHandler fritzServiceOperationHandler, IUsersService usersService, INetworkService networkService)
+    : IDeviceSearchService
 {
     private const string InternetGatewayDeviceDeviceType = "urn:dslforum-org:device:InternetGatewayDevice:1";
     private const int UPnPMultiCastPort = 1900;
     private const int ReceiveTimeoutInSeconds = 2;
     private const int DefaultSendCount = 1;
 
-    private readonly IHttpClientFactory httpClientFactory;
-    private readonly IFritzServiceOperationHandler fritzServiceOperationHandler;
-    private readonly IUsersService usersService;
-    private readonly INetworkService networkService;
-
-    public DeviceSearchService(IHttpClientFactory httpClientFactory, IFritzServiceOperationHandler fritzServiceOperationHandler, IUsersService usersService, INetworkService networkService)
-    {
-        this.httpClientFactory = httpClientFactory;
-        this.fritzServiceOperationHandler = fritzServiceOperationHandler;
-        this.usersService = usersService;
-        this.networkService = networkService;
-    }
-
     public async ValueTask<IEnumerable<InternetGatewayDevice>> GetDevicesAsync(string? deviceType = null, int? sendCount = null, int? timeout = null, CancellationToken cancellationToken = default)
     {
         deviceType ??= InternetGatewayDeviceDeviceType;

RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshService.cs

@@ -2,17 +2,8 @@
 
 using System.Text.Json;
 
-internal sealed class DeviceMeshService : IDeviceMeshService
+internal sealed class DeviceMeshService(IHttpClientFactory httpClientFactory, INetworkService networkService) : IDeviceMeshService
 {
-    private readonly IHttpClientFactory httpClientFactory;
-    private readonly INetworkService networkService;
-
-    public DeviceMeshService(IHttpClientFactory httpClientFactory, INetworkService networkService)
-    {
-        this.httpClientFactory = httpClientFactory;
-        this.networkService = networkService;
-    }
-
     public async ValueTask<DeviceMeshInfo> GetDeviceMeshAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         HostsGetMeshListPathResponse hostsGetMeshListPathResponse = await internetGatewayDevice.HostsGetMeshListPathAsync().ConfigureAwait(false);

RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/FritzAvmSpeedtestService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzAvmSpeedtestService : FritzServiceClient<IFritzAvmSpeedtestService>, IFritzAvmSpeedtestService
+internal sealed class FritzAvmSpeedtestService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzAvmSpeedtestService>(endpointConfiguration, remoteAddress, networkCredential), IFritzAvmSpeedtestService
 {
     public const string ControlUrl = "/upnp/control/x_speedtest";
 
-    public FritzAvmSpeedtestService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<AvmSpeedtestGetInfoResponse> GetInfoAsync(AvmSpeedtestGetInfoRequest avmSpeedtestGetInfoRequest)
         => Channel.GetInfoAsync(avmSpeedtestGetInfoRequest);
 

RS.Fritz.Manager.API/Services/TR-064/Services/DeviceConfig/FritzDeviceConfigService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzDeviceConfigService : FritzServiceClient<IFritzDeviceConfigService>, IFritzDeviceConfigService
+internal sealed class FritzDeviceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzDeviceConfigService>(endpointConfiguration, remoteAddress, networkCredential), IFritzDeviceConfigService
 {
     public const string ControlUrl = "/upnp/control/deviceconfig";
 
-    public FritzDeviceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<DeviceConfigGetPersistentDataResponse> GetPersistentDataAsync(DeviceConfigGetPersistentDataRequest deviceConfigGetPersistentDataRequest)
         => Channel.GetPersistentDataAsync(deviceConfigGetPersistentDataRequest);
 

RS.Fritz.Manager.API/Services/TR-064/Services/DeviceInfo/FritzDeviceInfoService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzDeviceInfoService : FritzServiceClient<IFritzDeviceInfoService>, IFritzDeviceInfoService
+internal sealed class FritzDeviceInfoService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential? networkCredential = null)
+    : FritzServiceClient<IFritzDeviceInfoService>(endpointConfiguration, remoteAddress, networkCredential), IFritzDeviceInfoService
 {
     public const string ControlUrl = "/upnp/control/deviceinfo";
 
-    public FritzDeviceInfoService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential? networkCredential = null)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<DeviceInfoGetSecurityPortResponse> GetSecurityPortAsync(DeviceInfoGetSecurityPortRequest deviceInfoGetSecurityPortRequest)
         => Channel.GetSecurityPortAsync(deviceInfoGetSecurityPortRequest);
 

RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzHostsService : FritzServiceClient<IFritzHostsService>, IFritzHostsService
+internal sealed class FritzHostsService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzHostsService>(endpointConfiguration, remoteAddress, networkCredential), IFritzHostsService
 {
     public const string ControlUrl = "/upnp/control/hosts";
 
-    public FritzHostsService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<HostsGetHostNumberOfEntriesResponse> GetHostNumberOfEntriesAsync(HostsGetHostNumberOfEntriesRequest hostsGetHostNumberOfEntriesRequest)
         => Channel.GetHostNumberOfEntriesAsync(hostsGetHostNumberOfEntriesRequest);
 

RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/FritzLanConfigSecurityService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzLanConfigSecurityService : FritzServiceClient<IFritzLanConfigSecurityService>, IFritzLanConfigSecurityService
+internal sealed class FritzLanConfigSecurityService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential? networkCredential = null)
+    : FritzServiceClient<IFritzLanConfigSecurityService>(endpointConfiguration, remoteAddress, networkCredential), IFritzLanConfigSecurityService
 {
     public const string ControlUrl = "/upnp/control/lanconfigsecurity";
 
-    public FritzLanConfigSecurityService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential? networkCredential = null)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<LanConfigSecurityGetAnonymousLoginResponse> GetAnonymousLoginAsync(LanConfigSecurityGetAnonymousLoginRequest lanConfigSecurityGetAnonymousLoginRequest)
         => Channel.GetAnonymousLoginAsync(lanConfigSecurityGetAnonymousLoginRequest);
 

RS.Fritz.Manager.API/Services/TR-064/Services/LanEthernetInterfaceConfig/FritzLanEthernetInterfaceConfigService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzLanEthernetInterfaceConfigService : FritzServiceClient<IFritzLanEthernetInterfaceConfigService>, IFritzLanEthernetInterfaceConfigService
+internal sealed class FritzLanEthernetInterfaceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzLanEthernetInterfaceConfigService>(endpointConfiguration, remoteAddress, networkCredential), IFritzLanEthernetInterfaceConfigService
 {
     public const string ControlUrl = "/upnp/control/lanethernetifcfg";
 
-    public FritzLanEthernetInterfaceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<LanEthernetInterfaceConfigGetInfoResponse> GetInfoAsync(LanEthernetInterfaceConfigGetInfoRequest lanEthernetInterfaceConfigGetInfoRequest)
         => Channel.GetInfoAsync(lanEthernetInterfaceConfigGetInfoRequest);
 

RS.Fritz.Manager.API/Services/TR-064/Services/LanHostConfigManagement/FritzLanHostConfigManagementService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzLanHostConfigManagementService : FritzServiceClient<IFritzLanHostConfigManagementService>, IFritzLanHostConfigManagementService
+internal sealed class FritzLanHostConfigManagementService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzLanHostConfigManagementService>(endpointConfiguration, remoteAddress, networkCredential), IFritzLanHostConfigManagementService
 {
     public const string ControlUrl = "/upnp/control/lanhostconfigmgm";
 
-    public FritzLanHostConfigManagementService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<LanHostConfigManagementGetInfoResponse> GetInfoAsync(LanHostConfigManagementGetInfoRequest lanHostConfigManagementGetInfoRequest)
         => Channel.GetInfoAsync(lanHostConfigManagementGetInfoRequest);
 

RS.Fritz.Manager.API/Services/TR-064/Services/Layer3Forwarding/FritzLayer3ForwardingService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzLayer3ForwardingService : FritzServiceClient<IFritzLayer3ForwardingService>, IFritzLayer3ForwardingService
+internal sealed class FritzLayer3ForwardingService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzLayer3ForwardingService>(endpointConfiguration, remoteAddress, networkCredential), IFritzLayer3ForwardingService
 {
     public const string ControlUrl = "/upnp/control/layer3forwarding";
 
-    public FritzLayer3ForwardingService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<Layer3ForwardingGetDefaultConnectionServiceResponse> GetDefaultConnectionServiceAsync(Layer3ForwardingGetDefaultConnectionServiceRequest layer3ForwardingGetDefaultConnectionServiceRequest)
         => Channel.GetDefaultConnectionServiceAsync(layer3ForwardingGetDefaultConnectionServiceRequest);
 

RS.Fritz.Manager.API/Services/TR-064/Services/ManagementServer/FritzManagementServerService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzManagementServerService : FritzServiceClient<IFritzManagementServerService>, IFritzManagementServerService
+internal sealed class FritzManagementServerService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzManagementServerService>(endpointConfiguration, remoteAddress, networkCredential), IFritzManagementServerService
 {
     public const string ControlUrl = "/upnp/control/mgmsrv";
 
-    public FritzManagementServerService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<ManagementServerGetInfoResponse> GetInfoAsync(ManagementServerGetInfoRequest managementServerGetInfoRequest)
         => Channel.GetInfoAsync(managementServerGetInfoRequest);
 

RS.Fritz.Manager.API/Services/TR-064/Services/Time/FritzTimeService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzTimeService : FritzServiceClient<IFritzTimeService>, IFritzTimeService
+internal sealed class FritzTimeService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzTimeService>(endpointConfiguration, remoteAddress, networkCredential), IFritzTimeService
 {
     public const string ControlUrl = "/upnp/control/time";
 
-    public FritzTimeService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<TimeGetInfoResponse> GetInfoAsync(TimeGetInfoRequest timeGetInfoRequest)
         => Channel.GetInfoAsync(timeGetInfoRequest);
 

RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/FritzUserInterfaceService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzUserInterfaceService : FritzServiceClient<IFritzUserInterfaceService>, IFritzUserInterfaceService
+internal sealed class FritzUserInterfaceService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzUserInterfaceService>(endpointConfiguration, remoteAddress, networkCredential), IFritzUserInterfaceService
 {
     public const string ControlUrl = "/upnp/control/userif";
 
-    public FritzUserInterfaceService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<UserInterfaceGetInfoResponse> GetInfoAsync(UserInterfaceGetInfoRequest userInterfaceGetInfoRequest)
         => Channel.GetInfoAsync(userInterfaceGetInfoRequest);
 

RS.Fritz.Manager.API/Services/TR-064/Services/WanCommonInterfaceConfig/FritzWanCommonInterfaceConfigService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzWanCommonInterfaceConfigService : FritzServiceClient<IFritzWanCommonInterfaceConfigService>, IFritzWanCommonInterfaceConfigService
+internal sealed class FritzWanCommonInterfaceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzWanCommonInterfaceConfigService>(endpointConfiguration, remoteAddress, networkCredential), IFritzWanCommonInterfaceConfigService
 {
     public const string ControlUrl = "/upnp/control/wancommonifconfig1";
 
-    public FritzWanCommonInterfaceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<WanCommonInterfaceConfigGetCommonLinkPropertiesResponse> GetCommonLinkPropertiesAsync(WanCommonInterfaceConfigGetCommonLinkPropertiesRequest wanCommonInterfaceConfigGetCommonLinkPropertiesRequest)
         => Channel.GetCommonLinkPropertiesAsync(wanCommonInterfaceConfigGetCommonLinkPropertiesRequest);
 

RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/FritzWanDslInterfaceConfigService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzWanDslInterfaceConfigService : FritzServiceClient<IFritzWanDslInterfaceConfigService>, IFritzWanDslInterfaceConfigService
+internal sealed class FritzWanDslInterfaceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzWanDslInterfaceConfigService>(endpointConfiguration, remoteAddress, networkCredential), IFritzWanDslInterfaceConfigService
 {
     public const string ControlUrl = "/upnp/control/wandslifconfig1";
 
-    public FritzWanDslInterfaceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<WanDslInterfaceConfigGetDslDiagnoseInfoResponse> GetDslDiagnoseInfoAsync(WanDslInterfaceConfigGetDslDiagnoseInfoRequest wanDslInterfaceConfigGetDslDiagnoseInfoRequest)
         => Channel.GetDslDiagnoseInfoAsync(wanDslInterfaceConfigGetDslDiagnoseInfoRequest);
 

RS.Fritz.Manager.API/Services/TR-064/Services/WanDslLinkConfig/FritzWanDslLinkConfigService.cs

@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzWanDslLinkConfigService : FritzServiceClient<IFritzWanDslLinkConfigService>, IFritzWanDslLinkConfigService
+internal sealed class FritzWanDslLinkConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzWanDslLinkConfigService>(endpointConfiguration, remoteAddress, networkCredential), IFritzWanDslLinkConfigService
 {
     public const string ControlUrl = "/upnp/control/wandsllinkconfig1";
 
-    public FritzWanDslLinkConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<WanDslLinkConfigGetInfoResponse> GetInfoAsync(WanDslLinkConfigGetInfoRequest wanDslLinkConfigGetInfoRequest)
         => Channel.GetInfoAsync(wanDslLinkConfigGetInfoRequest);