diff --git a/src/Directory.Build.props b/src/Directory.Build.props index abe8f77..13b933a 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -35,9 +35,9 @@ DataBus; ШинаДанных Copyright © $([System.DateTime]::Now.Year.ToString()) - 0.1.0 - 0.1.0.0 - 0.1.0.0 + 0.1.1 + 0.1.1.0 + 0.1.1.0 diff --git a/src/Spoleto.DataBus.Interfaces/Converters/ConverterInBase.cs b/src/Spoleto.DataBus.Interfaces/Converters/ConverterInBase.cs index 3793eba..d82e6dc 100644 --- a/src/Spoleto.DataBus.Interfaces/Converters/ConverterInBase.cs +++ b/src/Spoleto.DataBus.Interfaces/Converters/ConverterInBase.cs @@ -16,10 +16,8 @@ public abstract class ConverterInBase : IConverterIn typeof(TInput); public Type OutputType => typeof(TOutput); -#endif } } diff --git a/src/Spoleto.DataBus.Interfaces/Converters/ConverterOutBase.cs b/src/Spoleto.DataBus.Interfaces/Converters/ConverterOutBase.cs index 7198356..73e1fa0 100644 --- a/src/Spoleto.DataBus.Interfaces/Converters/ConverterOutBase.cs +++ b/src/Spoleto.DataBus.Interfaces/Converters/ConverterOutBase.cs @@ -16,10 +16,8 @@ public abstract class ConverterOutBase : IConverterOut typeof(TInput); public Type OutputType => typeof(TOutput); -#endif } } diff --git a/src/Spoleto.DataBus.Interfaces/Converters/IConverter.cs b/src/Spoleto.DataBus.Interfaces/Converters/IConverter.cs index 9f636a6..26d3b7b 100644 --- a/src/Spoleto.DataBus.Interfaces/Converters/IConverter.cs +++ b/src/Spoleto.DataBus.Interfaces/Converters/IConverter.cs @@ -5,9 +5,25 @@ namespace Spoleto.DataBus.Interfaces.Converters /// /// The base converter. /// + public interface IConverter + { + /// + /// Gets the input data type. + /// + Type InputType { get; } + + /// + /// Gets the output data type. + /// + Type OutputType { get; } + } + + /// + /// The base converter with generic input and output data types.. + /// /// The input data. /// The ouput data. - public interface IConverter + public interface IConverter : IConverter where TInput : IConverterData where TOutput : IConverterData { @@ -30,28 +46,5 @@ public interface IConverter /// The input data. /// The output data. TOutput Convert(TInput source); - -#if NET5_0_OR_GREATER - /// - /// Gets the input data type. - /// - Type InputType => typeof(TInput); - - /// - /// Gets the output data type. - /// - Type OutputType => typeof(TOutput); -#else - /// - /// Gets the input data type. - /// - Type InputType { get; } - - /// - /// Gets the output data type. - /// - Type OutputType { get; } -#endif - } } diff --git a/src/Spoleto.DataBus.Interfaces/Converters/IConverterIn.cs b/src/Spoleto.DataBus.Interfaces/Converters/IConverterIn.cs index ad0dd49..a9624d3 100644 --- a/src/Spoleto.DataBus.Interfaces/Converters/IConverterIn.cs +++ b/src/Spoleto.DataBus.Interfaces/Converters/IConverterIn.cs @@ -5,9 +5,16 @@ namespace Spoleto.DataBus.Interfaces.Converters /// /// The input converter. /// + public interface IConverterIn : IConverter + { + } + + /// + /// The input converter with generic input and output data types. + /// /// The input data. /// The ouput data. - public interface IConverterIn : IConverter + public interface IConverterIn : IConverterIn, IConverter where TInput : IConverterData where TOutput : IConverterData { diff --git a/src/Spoleto.DataBus.Interfaces/Converters/IConverterOut.cs b/src/Spoleto.DataBus.Interfaces/Converters/IConverterOut.cs index 579d9df..47bd873 100644 --- a/src/Spoleto.DataBus.Interfaces/Converters/IConverterOut.cs +++ b/src/Spoleto.DataBus.Interfaces/Converters/IConverterOut.cs @@ -5,9 +5,16 @@ namespace Spoleto.DataBus.Interfaces.Converters /// /// The output converter. /// + public interface IConverterOut : IConverter + { + } + + /// + /// The output converter with generic input and output data types. + /// /// The input data. /// The ouput data. - public interface IConverterOut : IConverter + public interface IConverterOut : IConverterOut, IConverter where TInput : IConverterData where TOutput : IConverterData {