Skip to content

Commit ccff3f4

Browse files
trojanobelixtrojanobelix
committed
Merge branch 'bugfix' of https://github.com/CANopenNode/CANopenEditor into bugfix
2 parents 169e232 + ca539d3 commit ccff3f4

File tree

5 files changed

+38
-25
lines changed

5 files changed

+38
-25
lines changed

‎EDSEditorGUI/Form1.cs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,17 @@ private void newToolStripMenuItem_Click(object sender, EventArgs e)
658658

659659
network.Add(eds);
660660
}
661-
661+
private void TabControl1_Selected(Object sender, TabControlEventArgs e)
662+
{
663+
if(tabControl1.SelectedIndex == 0)
664+
{
665+
DeviceView dv = (DeviceView)tabControl1.SelectedTab.Controls[0];
666+
dv.dispatch_updateOD();
667+
dv.dispatch_updatePDOinfo();
668+
dv.eds.UpdatePDOcount();
669+
dv.dispatch_updatedevice();
670+
}
671+
}
662672
private void tabControl1_ControlsChanged(object sender, ControlEventArgs e)
663673
{
664674
enablesavemenus(tabControl1.TabCount > 0);

‎EDSEditorGUI/Properties/Settings.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tests/Tests.csproj‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\xunit.runner.visualstudio.2.4.2\build\net452\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.4.2\build\net452\xunit.runner.visualstudio.props')" />
4-
<Import Project="..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props" Condition="Exists('..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props')" />
5-
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" />
3+
<Import Project="..\packages\xunit.runner.console.2.4.2\build\xunit.runner.console.props" Condition="Exists('..\packages\xunit.runner.console.2.4.2\build\xunit.runner.console.props')" />
4+
<Import Project="..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" />
5+
<Import Project="..\packages\xunit.core.2.4.2\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.4.2\build\xunit.core.props')" />
66
<PropertyGroup>
77
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
88
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -45,14 +45,14 @@
4545
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
4646
<HintPath>..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
4747
</Reference>
48-
<Reference Include="xunit.assert, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
49-
<HintPath>..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
48+
<Reference Include="xunit.assert, Version=2.4.2.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
49+
<HintPath>..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll</HintPath>
5050
</Reference>
51-
<Reference Include="xunit.core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
52-
<HintPath>..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll</HintPath>
51+
<Reference Include="xunit.core, Version=2.4.2.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
52+
<HintPath>..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll</HintPath>
5353
</Reference>
54-
<Reference Include="xunit.execution.desktop, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
55-
<HintPath>..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath>
54+
<Reference Include="xunit.execution.desktop, Version=2.4.2.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
55+
<HintPath>..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll</HintPath>
5656
</Reference>
5757
</ItemGroup>
5858
<Choose>
@@ -81,7 +81,8 @@
8181
<None Include="packages.config" />
8282
</ItemGroup>
8383
<ItemGroup>
84-
<Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
84+
<Analyzer Include="..\packages\xunit.analyzers.1.1.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
85+
<Analyzer Include="..\packages\xunit.analyzers.1.1.0\analyzers\dotnet\cs\xunit.analyzers.fixes.dll" />
8586
</ItemGroup>
8687
<Choose>
8788
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
@@ -107,12 +108,12 @@
107108
<PropertyGroup>
108109
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
109110
</PropertyGroup>
110-
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
111-
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
112-
<Error Condition="!Exists('..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props'))" />
113-
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.2\build\net452\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.2\build\net452\xunit.runner.visualstudio.props'))" />
111+
<Error Condition="!Exists('..\packages\xunit.core.2.4.2\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.2\build\xunit.core.props'))" />
112+
<Error Condition="!Exists('..\packages\xunit.core.2.4.2\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.2\build\xunit.core.targets'))" />
113+
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props'))" />
114+
<Error Condition="!Exists('..\packages\xunit.runner.console.2.4.2\build\xunit.runner.console.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.console.2.4.2\build\xunit.runner.console.props'))" />
114115
</Target>
115-
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
116+
<Import Project="..\packages\xunit.core.2.4.2\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.2\build\xunit.core.targets')" />
116117
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
117118
Other similar extension points exist, see Microsoft.Common.targets.
118119
<Target Name="BeforeBuild">

‎Tests/packages.config‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="xunit" version="2.4.1" targetFramework="net452" />
3+
<package id="xunit" version="2.4.2" targetFramework="net48" />
44
<package id="xunit.abstractions" version="2.0.3" targetFramework="net452" />
5-
<package id="xunit.analyzers" version="0.10.0" targetFramework="net452" />
6-
<package id="xunit.assert" version="2.4.1" targetFramework="net452" />
7-
<package id="xunit.core" version="2.4.1" targetFramework="net452" />
8-
<package id="xunit.extensibility.core" version="2.4.1" targetFramework="net452" />
9-
<package id="xunit.extensibility.execution" version="2.4.1" targetFramework="net452" />
10-
<package id="xunit.runner.console" version="2.4.1" targetFramework="net452" developmentDependency="true" requireReinstallation="true" />
11-
<package id="xunit.runner.visualstudio" version="2.4.2" targetFramework="net452" developmentDependency="true" />
5+
<package id="xunit.analyzers" version="1.1.0" targetFramework="net48" />
6+
<package id="xunit.assert" version="2.4.2" targetFramework="net48" />
7+
<package id="xunit.core" version="2.4.2" targetFramework="net48" />
8+
<package id="xunit.extensibility.core" version="2.4.2" targetFramework="net48" />
9+
<package id="xunit.extensibility.execution" version="2.4.2" targetFramework="net48" />
10+
<package id="xunit.runner.console" version="2.4.2" targetFramework="net48" developmentDependency="true" />
11+
<package id="xunit.runner.visualstudio" version="2.4.5" targetFramework="net48" developmentDependency="true" />
1212
</packages>

‎libEDSsharp/libEDSsharp.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<DefineConstants>DEBUG;TRACE</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
24+
<Prefer32Bit>false</Prefer32Bit>
2425
</PropertyGroup>
2526
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2627
<DebugType>pdbonly</DebugType>
@@ -30,6 +31,7 @@
3031
<ErrorReport>prompt</ErrorReport>
3132
<WarningLevel>4</WarningLevel>
3233
<DocumentationFile>docs\libEDSsharp.xml</DocumentationFile>
34+
<Prefer32Bit>false</Prefer32Bit>
3335
</PropertyGroup>
3436
<ItemGroup>
3537
<Reference Include="System" />

0 commit comments

Comments
 (0)