Skip to content

Commit e601b40

Browse files
authored
Use single automapper version (#171)
* upgrade version for .net8 * fix automapper v13 assert errors
1 parent 6511c03 commit e601b40

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

libEDSsharp/CanOpenEDSMapping.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,15 @@ public static EDSsharp MapFromProtobuffer(CanOpenDevice source)
9090
.ForMember(dest => dest.ModificationDate, opt => opt.MapFrom(src => src.ModificationTime.ToDateTime().ToString("MM-dd-yyyy")))
9191
.ForMember(dest => dest.ModificationTime, opt => opt.MapFrom(src => src.ModificationTime.ToDateTime().ToString("h:mmtt")));
9292
cfg.CreateMap<CanOpen_DeviceInfo, DeviceInfo>()
93+
.ForMember(dest => dest.BaudRate_10, opt => opt.MapFrom(src => src.BaudRate10))
94+
.ForMember(dest => dest.BaudRate_20, opt => opt.MapFrom(src => src.BaudRate20))
95+
.ForMember(dest => dest.BaudRate_50, opt => opt.MapFrom(src => src.BaudRate50))
96+
.ForMember(dest => dest.BaudRate_125, opt => opt.MapFrom(src => src.BaudRate125))
97+
.ForMember(dest => dest.BaudRate_250, opt => opt.MapFrom(src => src.BaudRate250))
98+
.ForMember(dest => dest.BaudRate_500, opt => opt.MapFrom(src => src.BaudRate500))
99+
.ForMember(dest => dest.BaudRate_800, opt => opt.MapFrom(src => src.BaudRate800))
100+
.ForMember(dest => dest.BaudRate_1000, opt => opt.MapFrom(src => src.BaudRate1000))
101+
.ForMember(dest => dest.BaudRate_auto, opt => opt.MapFrom(src => src.BaudRateAuto))
93102
.ForMember(dest => dest.VendorNumber, opt => opt.Ignore())
94103
.ForMember(dest => dest.ProductNumber, opt => opt.Ignore())
95104
.ForMember(dest => dest.RevisionNumber, opt => opt.Ignore())
@@ -113,7 +122,11 @@ public static EDSsharp MapFromProtobuffer(CanOpenDevice source)
113122
.ForMember(dest => dest.LSS_SerialNumber, opt => opt.Ignore());
114123
cfg.CreateMap<OdObject, CustomProperties>()
115124
.ForMember(dest => dest.CO_accessSRDO, opt => opt.Ignore())
116-
.ForMember(dest => dest.CO_stringLengthMin, opt => opt.Ignore());
125+
.ForMember(dest => dest.CO_stringLengthMin, opt => opt.Ignore())
126+
.ForMember(dest => dest.CO_disabled, opt => opt.MapFrom(src => src.Disabled))
127+
.ForMember(dest => dest.CO_countLabel, opt => opt.MapFrom(src => src.CountLabel))
128+
.ForMember(dest => dest.CO_storageGroup, opt => opt.MapFrom(src => src.StorageGroup))
129+
.ForMember(dest => dest.CO_flagsPDO, opt => opt.MapFrom(src => src.FlagsPDO));
117130
cfg.CreateMap<OdObject.Types.ObjectType, ObjectType>().ConvertUsing<ODTypeResolver>();
118131
cfg.CreateMap<OdObject, ODentry>()
119132
.ForMember(dest => dest.Index, opt => opt.Ignore())

libEDSsharp/libEDSsharp.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
<PackageReference Include="System.CodeDom" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
4848
<PackageReference Include="Google.Protobuf" Version="3.27.2" />
4949
<PackageReference Include="Google.Protobuf.Tools" Version="3.27.2" />
50-
<PackageReference Include="AutoMapper" Version="10.0.0" />
50+
<PackageReference Include="AutoMapper" Version="10.0.0" Condition="'$(TargetFramework)' == 'net481'" />
51+
<PackageReference Include="AutoMapper" Version="13.0.1" Condition="'$(TargetFramework)' == 'net8.0'" />
5152
</ItemGroup>
5253

5354
<ItemGroup>

0 commit comments

Comments
 (0)