Skip to content

Commit e29e2a1

Browse files
trojanobelixtrojanobelix
committed
Updates nuget extensions
1 parent c23a2e4 commit e29e2a1

File tree

9 files changed

+40
-32
lines changed

9 files changed

+40
-32
lines changed

‎EDSEditorGUI/DeviceInfoView.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void populatedeviceinfo()
4545
textBox_productnumber.Text = eds.di.ProductNumber;
4646
textBox_vendorname.Text = eds.di.VendorName;
4747
textBox_vendornumber.Text = eds.di.VendorNumber;
48-
textBox_revisionnumber.Text = eds.di.RevisionNumber;
48+
textBox_revisionnumber.Text = eds.di.RevisionNumber.ToString();
4949

5050
textBox_fileversion.Text = eds.fi.FileVersion;
5151
textBox_di_description.Text = eds.fi.Description;
@@ -142,7 +142,7 @@ private void update_devfile_info()
142142
eds.di.ProductNumber = textBox_productnumber.Text;
143143
eds.di.VendorName = textBox_vendorname.Text;
144144
eds.di.VendorNumber = textBox_vendornumber.Text;
145-
eds.di.RevisionNumber = textBox_revisionnumber.Text;
145+
uint.TryParse(textBox_revisionnumber.Text, out eds.di.RevisionNumber);
146146

147147
eds.fi.FileVersion = textBox_fileversion.Text;
148148
eds.fi.Description = textBox_di_description.Text;

‎EDSEditorGUI/EDSEditorGUI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<ItemGroup>
101101
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
102102
<PackageReference Include="SourceGrid" Version="4.4.0" />
103-
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0-windows'" />
103+
<PackageReference Include="System.Resources.Extensions" Version="10.0.0" Condition="'$(TargetFramework)' == 'net8.0-windows'" />
104104
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
105105
</ItemGroup>
106106
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">

‎EDSEditorGUI2/EDSEditorGUI2.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Avalonia" Version="11.1.5" />
19-
<PackageReference Include="Avalonia.Desktop" Version="11.1.5" />
20-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.5" />
21-
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.5" />
18+
<PackageReference Include="Avalonia" Version="11.3.9" />
19+
<PackageReference Include="Avalonia.Desktop" Version="11.3.9" />
20+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.9" />
21+
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.9" />
2222
<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
23-
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.1.5" />
23+
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.9" />
2424
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
25-
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.5" />
26-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
27-
<PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
25+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.9" />
26+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
27+
<PackageReference Include="DialogHost.Avalonia" Version="0.10.0" />
2828
<PackageReference Include="AutoMapper" Version="13.0.1" />
2929
</ItemGroup>
3030
</Project>

‎GUITests/GUITests.csproj‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,16 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="coverlet.collector" Version="6.0.0" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
14-
<PackageReference Include="xunit" Version="2.5.3" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
12+
<PackageReference Include="coverlet.collector" Version="6.0.4">
13+
<PrivateAssets>all</PrivateAssets>
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
</PackageReference>
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
17+
<PackageReference Include="xunit" Version="2.9.3" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
</PackageReference>
1622
</ItemGroup>
1723

1824
<ItemGroup>

‎Tests/Tests.csproj‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks Condition="'$(BuildNet481)' == 'true'">net481</TargetFrameworks>
44
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net8.0</TargetFrameworks>
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212
<Target Name="CopyEDSSharpToTestOutDir" AfterTargets="Build">
1313
<ItemGroup>
14-
<EDSSharpFiles Include="..\EDSSharp\bin\$(Configuration)\$(TargetFramework)\*"/>
14+
<EDSSharpFiles Include="..\EDSSharp\bin\$(Configuration)\$(TargetFramework)\*" />
1515
</ItemGroup>
1616
<Copy SourceFiles="@(EDSSharpFiles)" DestinationFolder="$(OutDir)" />
1717
</Target>
@@ -21,15 +21,18 @@
2121
</None>
2222
</ItemGroup>
2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
25-
<PackageReference Include="xunit" Version="2.7.0" />
26-
<PackageReference Include="xunit.analyzers" Version="1.11.0" />
27-
<PackageReference Include="xunit.assert" Version="2.7.0" />
28-
<PackageReference Include="xunit.runner.console" Version="2.7.0">
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
25+
<PackageReference Include="xunit" Version="2.9.3" />
26+
<PackageReference Include="xunit.analyzers" Version="1.25.0">
2927
<PrivateAssets>all</PrivateAssets>
3028
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3129
</PackageReference>
32-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
30+
<PackageReference Include="xunit.assert" Version="2.9.3" />
31+
<PackageReference Include="xunit.runner.console" Version="2.9.3">
32+
<PrivateAssets>all</PrivateAssets>
33+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
34+
</PackageReference>
35+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
3336
<PrivateAssets>all</PrivateAssets>
3437
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3538
</PackageReference>

‎libEDSsharp/CanOpenEDSMapping.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@ public OdSubObject.Types.AccessSDO Convert(EDSsharp.AccessType source, OdSubObje
406406
/// </summary>
407407
/// <param name="source">EDS accesstype</param>
408408
/// <param name="destination">protobuffer pdo access type</param>
409-
/// <param name="member">result object</param>
410409
/// <param name="context">resolve context</param>
411410
/// <returns>result </returns>
412411
public OdSubObject.Types.AccessPDO Convert(EDSsharp.AccessType source, OdSubObject.Types.AccessPDO destination, ResolutionContext context)

‎libEDSsharp/CanOpenXDD.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ public ISO15745ProfileContainer convert(EDSsharp eds)
310310

311311
//device.DeviceIdentity.specificationRevision.value =
312312
device.DeviceIdentity.specificationRevision = new specificationRevision();
313-
device.DeviceIdentity.specificationRevision.Value = eds.di.RevisionNumber;
313+
device.DeviceIdentity.specificationRevision.Value = eds.di.RevisionNumber.ToHexString();
314314
device.DeviceIdentity.specificationRevision.readOnly = true;
315315

316316
device.DeviceIdentity.instanceName = new instanceName();
@@ -1161,7 +1161,7 @@ public EDSsharp convert(ISO15745ProfileContainer container)
11611161
eds.di.ProductNumber = obj.DeviceIdentity.productID.Value;
11621162
eds.di.VendorName = obj.DeviceIdentity.vendorName.Value;
11631163
eds.di.VendorNumber = obj.DeviceIdentity.vendorID.Value;
1164-
eds.di.RevisionNumber = obj.DeviceIdentity.specificationRevision.Value;
1164+
uint.TryParse(obj.DeviceIdentity.specificationRevision.Value, out eds.di.RevisionNumber);
11651165

11661166
foreach (object o in obj.DeviceIdentity.productText.Items)
11671167
{

‎libEDSsharp/CanOpenXDD_1_1.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ private ISO15745ProfileContainer Convert(EDSsharp eds, string fileName, bool dev
962962
body_device.DeviceIdentity = new DeviceIdentity();
963963
body_device.DeviceIdentity.vendorName = new vendorName { Value = eds.di.VendorName };
964964
body_device.DeviceIdentity.vendorID = new vendorID { Value = eds.di.VendorNumber };
965-
body_device.DeviceIdentity.specificationRevision = new specificationRevision { Value = eds.di.RevisionNumber };
965+
body_device.DeviceIdentity.specificationRevision = new specificationRevision { Value = eds.di.RevisionNumber.ToHexString()};
966966
body_device.DeviceIdentity.productName = new productName { Value = eds.di.ProductName };
967967
body_device.DeviceIdentity.productID = new productID { Value = eds.di.ProductNumber };
968968
if (eds.fi.Description != null && eds.fi.Description != "")
@@ -1266,7 +1266,7 @@ private EDSsharp Convert(ISO15745ProfileContainer container)
12661266
if (body_device.DeviceIdentity.vendorID != null)
12671267
eds.di.VendorNumber = body_device.DeviceIdentity.vendorID.Value ?? "";
12681268
if (body_device.DeviceIdentity.specificationRevision != null)
1269-
eds.di.RevisionNumber = body_device.DeviceIdentity.specificationRevision.Value ?? "";
1269+
uint.TryParse(body_device.DeviceIdentity.specificationRevision.Value , out eds.di.RevisionNumber) ;
12701270
if (body_device.DeviceIdentity.productName != null)
12711271
eds.di.ProductName = body_device.DeviceIdentity.productName.Value ?? "";
12721272
if (body_device.DeviceIdentity.productID != null)

‎libEDSsharp/libEDSsharp.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<NeutralLanguage></NeutralLanguage>
1919
</PropertyGroup>
2020

21-
<Target Name="AssignInformationalVersion" >
21+
<Target Name="AssignInformationalVersion">
2222
<Exec Command="git describe --tags --long --dirty" ConsoleToMSBuild="true">
2323
<Output TaskParameter="ConsoleOutput" PropertyName="gitInfo" />
2424
</Exec>
@@ -44,9 +44,9 @@
4444
</EmbeddedResource>
4545
</ItemGroup>
4646
<ItemGroup>
47-
<PackageReference Include="System.CodeDom" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
48-
<PackageReference Include="Google.Protobuf" Version="3.27.2" />
49-
<PackageReference Include="Google.Protobuf.Tools" Version="3.27.2" />
47+
<PackageReference Include="System.CodeDom" Version="10.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
48+
<PackageReference Include="Google.Protobuf" Version="3.33.1" />
49+
<PackageReference Include="Google.Protobuf.Tools" Version="3.33.1" />
5050
<PackageReference Include="AutoMapper" Version="10.0.0" Condition="'$(TargetFramework)' == 'net481'" />
5151
<PackageReference Include="AutoMapper" Version="13.0.1" Condition="'$(TargetFramework)' == 'net8.0'" />
5252
</ItemGroup>

0 commit comments

Comments
 (0)