From 2fbc3a12d841a0da146e61990dcbfe40cd6d1b75 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Tue, 10 Aug 2021 07:03:32 -0700 Subject: [PATCH] Make BaseDtoType in BaseDto virtual. --- Shared/Models/RemoteControlDtos/AudioSampleDto.cs | 2 +- Shared/Models/RemoteControlDtos/BaseDto.cs | 2 +- Shared/Models/RemoteControlDtos/CaptureFrameDto.cs | 2 +- Shared/Models/RemoteControlDtos/ClipboardTextDto.cs | 2 +- Shared/Models/RemoteControlDtos/ClipboardTransferDto.cs | 2 +- Shared/Models/RemoteControlDtos/CursorChangeDto.cs | 2 +- Shared/Models/RemoteControlDtos/FileDto.cs | 2 +- Shared/Models/RemoteControlDtos/KeyDownDto.cs | 2 +- Shared/Models/RemoteControlDtos/KeyPressDto.cs | 2 +- Shared/Models/RemoteControlDtos/KeyUpDto.cs | 2 +- Shared/Models/RemoteControlDtos/MouseDownDto.cs | 2 +- Shared/Models/RemoteControlDtos/MouseMoveDto.cs | 2 +- Shared/Models/RemoteControlDtos/MouseUpDto.cs | 2 +- Shared/Models/RemoteControlDtos/MouseWheelDto.cs | 2 +- Shared/Models/RemoteControlDtos/ScreenDataDto.cs | 2 +- Shared/Models/RemoteControlDtos/ScreenSizeDto.cs | 2 +- Shared/Models/RemoteControlDtos/SelectScreenDto.cs | 2 +- Shared/Models/RemoteControlDtos/TapDto.cs | 2 +- Shared/Models/RemoteControlDtos/ToggleAudioDto.cs | 2 +- Shared/Models/RemoteControlDtos/ToggleBlockInputDto.cs | 2 +- Shared/Models/RemoteControlDtos/ToggleWebRtcVideoDto.cs | 2 +- Shared/Models/RemoteControlDtos/WindowsSessionsDto.cs | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Shared/Models/RemoteControlDtos/AudioSampleDto.cs b/Shared/Models/RemoteControlDtos/AudioSampleDto.cs index 02d4935e..57301378 100644 --- a/Shared/Models/RemoteControlDtos/AudioSampleDto.cs +++ b/Shared/Models/RemoteControlDtos/AudioSampleDto.cs @@ -16,7 +16,7 @@ namespace Remotely.Shared.Models.RemoteControlDtos [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.AudioSample; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.AudioSample; } } diff --git a/Shared/Models/RemoteControlDtos/BaseDto.cs b/Shared/Models/RemoteControlDtos/BaseDto.cs index 0dac5592..c8f25133 100644 --- a/Shared/Models/RemoteControlDtos/BaseDto.cs +++ b/Shared/Models/RemoteControlDtos/BaseDto.cs @@ -7,6 +7,6 @@ namespace Remotely.Shared.Models.RemoteControlDtos public class BaseDto { [DataMember(Name = "DtoType")] - public BaseDtoType DtoType { get; set; } + public virtual BaseDtoType DtoType { get; init; } } } diff --git a/Shared/Models/RemoteControlDtos/CaptureFrameDto.cs b/Shared/Models/RemoteControlDtos/CaptureFrameDto.cs index 288e0396..003160d0 100644 --- a/Shared/Models/RemoteControlDtos/CaptureFrameDto.cs +++ b/Shared/Models/RemoteControlDtos/CaptureFrameDto.cs @@ -8,7 +8,7 @@ namespace Remotely.Shared.Models.RemoteControlDtos public class CaptureFrameDto : BaseDto { [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.CaptureFrame; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.CaptureFrame; [DataMember(Name = "EndOfFrame")] public bool EndOfFrame { get; init; } diff --git a/Shared/Models/RemoteControlDtos/ClipboardTextDto.cs b/Shared/Models/RemoteControlDtos/ClipboardTextDto.cs index 1b18363c..6fa4743d 100644 --- a/Shared/Models/RemoteControlDtos/ClipboardTextDto.cs +++ b/Shared/Models/RemoteControlDtos/ClipboardTextDto.cs @@ -16,6 +16,6 @@ namespace Remotely.Shared.Models.RemoteControlDtos [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.ClipboardText; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.ClipboardText; } } diff --git a/Shared/Models/RemoteControlDtos/ClipboardTransferDto.cs b/Shared/Models/RemoteControlDtos/ClipboardTransferDto.cs index 820f8a15..05981b8f 100644 --- a/Shared/Models/RemoteControlDtos/ClipboardTransferDto.cs +++ b/Shared/Models/RemoteControlDtos/ClipboardTransferDto.cs @@ -15,6 +15,6 @@ namespace Remotely.Shared.Models.RemoteControlDtos [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.ClipboardTransfer; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.ClipboardTransfer; } } diff --git a/Shared/Models/RemoteControlDtos/CursorChangeDto.cs b/Shared/Models/RemoteControlDtos/CursorChangeDto.cs index e635060f..df66c95f 100644 --- a/Shared/Models/RemoteControlDtos/CursorChangeDto.cs +++ b/Shared/Models/RemoteControlDtos/CursorChangeDto.cs @@ -18,7 +18,7 @@ namespace Remotely.Shared.Models.RemoteControlDtos public string CssOverride { get; } [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.CursorChange; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.CursorChange; [DataMember(Name = "HotSpotX")] public int HotSpotX { get; } diff --git a/Shared/Models/RemoteControlDtos/FileDto.cs b/Shared/Models/RemoteControlDtos/FileDto.cs index e813ba3f..e3ba4c28 100644 --- a/Shared/Models/RemoteControlDtos/FileDto.cs +++ b/Shared/Models/RemoteControlDtos/FileDto.cs @@ -23,6 +23,6 @@ namespace Remotely.Shared.Models.RemoteControlDtos public bool StartOfFile { get; set; } [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.File; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.File; } } diff --git a/Shared/Models/RemoteControlDtos/KeyDownDto.cs b/Shared/Models/RemoteControlDtos/KeyDownDto.cs index 6cdcbd79..660ff705 100644 --- a/Shared/Models/RemoteControlDtos/KeyDownDto.cs +++ b/Shared/Models/RemoteControlDtos/KeyDownDto.cs @@ -10,6 +10,6 @@ namespace Remotely.Shared.Models.RemoteControlDtos public string Key { get; set; } [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.KeyDown; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.KeyDown; } } diff --git a/Shared/Models/RemoteControlDtos/KeyPressDto.cs b/Shared/Models/RemoteControlDtos/KeyPressDto.cs index 99d4125d..e44cb1b1 100644 --- a/Shared/Models/RemoteControlDtos/KeyPressDto.cs +++ b/Shared/Models/RemoteControlDtos/KeyPressDto.cs @@ -10,6 +10,6 @@ namespace Remotely.Shared.Models.RemoteControlDtos public string Key { get; set; } [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.KeyPress; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.KeyPress; } } diff --git a/Shared/Models/RemoteControlDtos/KeyUpDto.cs b/Shared/Models/RemoteControlDtos/KeyUpDto.cs index 29278abc..c2dd48c2 100644 --- a/Shared/Models/RemoteControlDtos/KeyUpDto.cs +++ b/Shared/Models/RemoteControlDtos/KeyUpDto.cs @@ -10,6 +10,6 @@ namespace Remotely.Shared.Models.RemoteControlDtos public string Key { get; set; } [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.KeyUp; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.KeyUp; } } diff --git a/Shared/Models/RemoteControlDtos/MouseDownDto.cs b/Shared/Models/RemoteControlDtos/MouseDownDto.cs index 2b3f4f80..91341698 100644 --- a/Shared/Models/RemoteControlDtos/MouseDownDto.cs +++ b/Shared/Models/RemoteControlDtos/MouseDownDto.cs @@ -10,7 +10,7 @@ namespace Remotely.Shared.Models.RemoteControlDtos public int Button { get; set; } [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.MouseDown; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.MouseDown; [DataMember(Name = "PercentX")] public double PercentX { get; set; } diff --git a/Shared/Models/RemoteControlDtos/MouseMoveDto.cs b/Shared/Models/RemoteControlDtos/MouseMoveDto.cs index ddd3a117..8c983c31 100644 --- a/Shared/Models/RemoteControlDtos/MouseMoveDto.cs +++ b/Shared/Models/RemoteControlDtos/MouseMoveDto.cs @@ -8,7 +8,7 @@ namespace Remotely.Shared.Models.RemoteControlDtos { [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; set; } = BaseDtoType.MouseMove; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.MouseMove; [DataMember(Name = "PercentX")] public double PercentX { get; set; } diff --git a/Shared/Models/RemoteControlDtos/MouseUpDto.cs b/Shared/Models/RemoteControlDtos/MouseUpDto.cs index 2e6a557a..55956757 100644 --- a/Shared/Models/RemoteControlDtos/MouseUpDto.cs +++ b/Shared/Models/RemoteControlDtos/MouseUpDto.cs @@ -10,7 +10,7 @@ namespace Remotely.Shared.Models.RemoteControlDtos public int Button { get; set; } [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.MouseUp; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.MouseUp; [DataMember(Name = "PercentX")] public double PercentX { get; set; } diff --git a/Shared/Models/RemoteControlDtos/MouseWheelDto.cs b/Shared/Models/RemoteControlDtos/MouseWheelDto.cs index d37b02b8..e32fa71d 100644 --- a/Shared/Models/RemoteControlDtos/MouseWheelDto.cs +++ b/Shared/Models/RemoteControlDtos/MouseWheelDto.cs @@ -8,7 +8,7 @@ namespace Remotely.Shared.Models.RemoteControlDtos { [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.MouseWheel; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.MouseWheel; [DataMember(Name = "DeltaX")] public double DeltaX { get; set; } diff --git a/Shared/Models/RemoteControlDtos/ScreenDataDto.cs b/Shared/Models/RemoteControlDtos/ScreenDataDto.cs index 6ff4796a..070ddd0d 100644 --- a/Shared/Models/RemoteControlDtos/ScreenDataDto.cs +++ b/Shared/Models/RemoteControlDtos/ScreenDataDto.cs @@ -12,7 +12,7 @@ namespace Remotely.Shared.Models.RemoteControlDtos [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.ScreenData; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.ScreenData; [DataMember(Name = "SelectedDisplay")] public string SelectedDisplay { get; init; } diff --git a/Shared/Models/RemoteControlDtos/ScreenSizeDto.cs b/Shared/Models/RemoteControlDtos/ScreenSizeDto.cs index f7b6c038..951694f4 100644 --- a/Shared/Models/RemoteControlDtos/ScreenSizeDto.cs +++ b/Shared/Models/RemoteControlDtos/ScreenSizeDto.cs @@ -19,6 +19,6 @@ namespace Remotely.Shared.Models.RemoteControlDtos public int Height { get; } [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.ScreenSize; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.ScreenSize; } } diff --git a/Shared/Models/RemoteControlDtos/SelectScreenDto.cs b/Shared/Models/RemoteControlDtos/SelectScreenDto.cs index 1475b0ce..1860da32 100644 --- a/Shared/Models/RemoteControlDtos/SelectScreenDto.cs +++ b/Shared/Models/RemoteControlDtos/SelectScreenDto.cs @@ -10,6 +10,6 @@ namespace Remotely.Shared.Models.RemoteControlDtos public string DisplayName { get; set; } [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.SelectScreen; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.SelectScreen; } } diff --git a/Shared/Models/RemoteControlDtos/TapDto.cs b/Shared/Models/RemoteControlDtos/TapDto.cs index 93f2c9d3..9bb46941 100644 --- a/Shared/Models/RemoteControlDtos/TapDto.cs +++ b/Shared/Models/RemoteControlDtos/TapDto.cs @@ -8,7 +8,7 @@ namespace Remotely.Shared.Models.RemoteControlDtos { [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.Tap; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.Tap; [DataMember(Name = "PercentX")] public double PercentX { get; set; } diff --git a/Shared/Models/RemoteControlDtos/ToggleAudioDto.cs b/Shared/Models/RemoteControlDtos/ToggleAudioDto.cs index 68665383..38759ad7 100644 --- a/Shared/Models/RemoteControlDtos/ToggleAudioDto.cs +++ b/Shared/Models/RemoteControlDtos/ToggleAudioDto.cs @@ -10,6 +10,6 @@ namespace Remotely.Shared.Models.RemoteControlDtos public bool ToggleOn { get; set; } [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.ToggleAudio; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.ToggleAudio; } } diff --git a/Shared/Models/RemoteControlDtos/ToggleBlockInputDto.cs b/Shared/Models/RemoteControlDtos/ToggleBlockInputDto.cs index 0853499d..6fb7550a 100644 --- a/Shared/Models/RemoteControlDtos/ToggleBlockInputDto.cs +++ b/Shared/Models/RemoteControlDtos/ToggleBlockInputDto.cs @@ -10,6 +10,6 @@ namespace Remotely.Shared.Models.RemoteControlDtos public bool ToggleOn { get; set; } [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.ToggleBlockInput; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.ToggleBlockInput; } } diff --git a/Shared/Models/RemoteControlDtos/ToggleWebRtcVideoDto.cs b/Shared/Models/RemoteControlDtos/ToggleWebRtcVideoDto.cs index 8ab705cf..20a470c5 100644 --- a/Shared/Models/RemoteControlDtos/ToggleWebRtcVideoDto.cs +++ b/Shared/Models/RemoteControlDtos/ToggleWebRtcVideoDto.cs @@ -10,6 +10,6 @@ namespace Remotely.Shared.Models.RemoteControlDtos public bool ToggleOn { get; set; } [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.ToggleWebRtcVideo; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.ToggleWebRtcVideo; } } diff --git a/Shared/Models/RemoteControlDtos/WindowsSessionsDto.cs b/Shared/Models/RemoteControlDtos/WindowsSessionsDto.cs index eee26e43..29f8089d 100644 --- a/Shared/Models/RemoteControlDtos/WindowsSessionsDto.cs +++ b/Shared/Models/RemoteControlDtos/WindowsSessionsDto.cs @@ -18,6 +18,6 @@ namespace Remotely.Shared.Models.RemoteControlDtos [DataMember(Name = "DtoType")] - public new BaseDtoType DtoType { get; } = BaseDtoType.WindowsSessions; + public override BaseDtoType DtoType { get; init; } = BaseDtoType.WindowsSessions; } }