From a317855476f56866c8b6cc9b2102ff6d15829b89 Mon Sep 17 00:00:00 2001 From: Lars Elgtvedt Susaas <9848846+nimrof@users.noreply.github.com> Date: Sat, 25 Jul 2026 15:43:50 +0200 Subject: [PATCH 1/2] automapper upgrade --- EDSEditorGUI2/EDSEditorGUI2.csproj | 2 +- EDSEditorGUI2/Mapper/ProtobufferViewModelMapper.cs | 9 +++++---- libEDSsharp/CanOpenEDSMapping.cs | 5 +++-- libEDSsharp/libEDSsharp.csproj | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/EDSEditorGUI2/EDSEditorGUI2.csproj b/EDSEditorGUI2/EDSEditorGUI2.csproj index 6ad75646..b44a0554 100644 --- a/EDSEditorGUI2/EDSEditorGUI2.csproj +++ b/EDSEditorGUI2/EDSEditorGUI2.csproj @@ -36,6 +36,6 @@ - + diff --git a/EDSEditorGUI2/Mapper/ProtobufferViewModelMapper.cs b/EDSEditorGUI2/Mapper/ProtobufferViewModelMapper.cs index 33e56929..db06d9e4 100644 --- a/EDSEditorGUI2/Mapper/ProtobufferViewModelMapper.cs +++ b/EDSEditorGUI2/Mapper/ProtobufferViewModelMapper.cs @@ -1,6 +1,7 @@ using AutoMapper; using Google.Protobuf.WellKnownTypes; using LibCanOpen; +using Microsoft.Extensions.Logging; using System; namespace EDSEditorGUI2.Mapper @@ -27,7 +28,7 @@ public static ViewModels.Device MapFromProtobuffer(CanOpenDevice source) .ForMember(dest => dest.Objects, opt => opt.MapFrom(src => src.Objects)); cfg.CreateMap(); cfg.CreateMap(); - }); + }, LoggerFactory.Create(builder => { builder.AddDebug(); })); config.AssertConfigurationIsValid(); var mapper = config.CreateMapper(); var result = mapper.Map(source); @@ -42,7 +43,7 @@ public ViewModels.ObjectDictionary Convert(Google.Protobuf.Collections.MapField< { cfg.CreateMap(); cfg.CreateMap(); - }); + }, LoggerFactory.Create(builder => { builder.AddDebug(); })); config.AssertConfigurationIsValid(); var mapper = config.CreateMapper(); @@ -59,7 +60,7 @@ public Google.Protobuf.Collections.MapField Convert(ViewModels { cfg.CreateMap(); cfg.CreateMap(); - }); + }, LoggerFactory.Create(builder => { builder.AddDebug(); })); config.AssertConfigurationIsValid(); var mapper = config.CreateMapper(); @@ -77,7 +78,7 @@ public static CanOpenDevice MapToProtobuffer(ViewModels.Device source) var config = new MapperConfiguration(cfg => { //TODO - }); + }, LoggerFactory.Create(builder => { builder.AddDebug(); })); config.AssertConfigurationIsValid(); var mapper = config.CreateMapper(); var result = mapper.Map(source); diff --git a/libEDSsharp/CanOpenEDSMapping.cs b/libEDSsharp/CanOpenEDSMapping.cs index ce980ef3..3133e44d 100644 --- a/libEDSsharp/CanOpenEDSMapping.cs +++ b/libEDSsharp/CanOpenEDSMapping.cs @@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License using AutoMapper; using Google.Protobuf.WellKnownTypes; using LibCanOpen; +using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; using System.Globalization; @@ -167,7 +168,7 @@ public static EDSsharp MapFromProtobuffer(CanOpenDevice source) .ForMember(dest => dest.objecttype, opt => opt.Ignore()) .ForMember(dest => dest.Description, opt => opt.Ignore()) .ForMember(dest => dest.subobjects, opt => opt.Ignore()); - }); + }, LoggerFactory.Create(builder => { builder.AddDebug(); })); config.AssertConfigurationIsValid(); var mapper = config.CreateMapper(); @@ -236,7 +237,7 @@ public static CanOpenDevice MapToProtobuffer(EDSsharp source) .ForMember(dest => dest.Pdo, opt => opt.MapFrom(src => src.accesstype)) .ForMember(dest => dest.Srdo, opt => opt.MapFrom(src => src.prop.CO_accessSRDO)) .ForMember(dest => dest.StringLengthMin, opt => opt.MapFrom(src => src.prop.CO_stringLengthMin)); - }); + }, LoggerFactory.Create(builder => { builder.AddDebug(); })); config.AssertConfigurationIsValid(); var mapper = config.CreateMapper(); diff --git a/libEDSsharp/libEDSsharp.csproj b/libEDSsharp/libEDSsharp.csproj index 3e443832..37f8bff6 100644 --- a/libEDSsharp/libEDSsharp.csproj +++ b/libEDSsharp/libEDSsharp.csproj @@ -47,8 +47,8 @@ - - + + From e064cede6a047c23858e10c1ef3054d5f417d6a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 25 Jul 2026 15:44:03 +0000 Subject: [PATCH 2/2] [ROOT][DOCS] contrib-readme-action has updated readme --- README.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3d130175..80550f13 100644 --- a/README.md +++ b/README.md @@ -249,6 +249,15 @@ Contributors Regelink + + + Sl-Alex +
+ Sl-Alex +
+ + + rgruening @@ -256,8 +265,6 @@ Contributors rgruening - - Barzello @@ -293,6 +300,8 @@ Contributors DaMutz + + StormOli @@ -300,8 +309,6 @@ Contributors StormOli - - possibly-not