Skip to content

Commit e6472ec

Browse files
trojanobelixtrojanobelix
committed
Merge remote-tracking branch 'Github_origin/main' into feature
# Conflicts: # EDSEditorGUI/DeviceODView.Designer.cs # EDSEditorGUI/DeviceODView.cs # libEDSsharp/CanOpenNodeExporter.cs
2 parents 2326320 + fdab1c9 commit e6472ec

File tree

80 files changed

+23080
-24447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+23080
-24447
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# .git-blame-ignore-revs
2+
3+
# normalise line endings
4+
6336108d916fe2fe8167255257c71adf2cac062f

‎.gitattributes‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Explicitly declare text files you want to always be normalized and converted
5+
# to native line endings on checkout.
6+
*.cs text
7+
*.csproj text

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Version used**
21+
Information about what version you found the bug in
22+
23+
**Expected behavior**
24+
A clear and concise description of what you expected to happen.
25+
26+
**Screenshots**
27+
If applicable, add screenshots to help explain your problem.
28+
29+
**Additional context**
30+
Add any other context about the problem here.
31+
32+
**files upload**
33+
Add any files that will help to reproduce the problem

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "github-actions"
9+
directory: "/"
10+
schedule:
11+
interval: "weekly"

‎.github/workflows/dotnet.yml‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,44 @@ on:
88

99
jobs:
1010
build:
11+
strategy:
12+
matrix:
13+
dotnet: [net481, net8]
14+
configuration: [Debug, Release]
1115

1216
runs-on: windows-latest
1317
# runs-on: ubuntu-latest # Error: setup-msbuild can only be run on Windows runners
1418
steps:
1519
- name: Checkout
16-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
21+
with:
22+
fetch-depth: 0
1723
- name: Setup .NET
18-
uses: microsoft/setup-msbuild@v1.1
24+
uses: microsoft/setup-msbuild@v2
25+
- name: C# problem matcher
26+
run: |
27+
Invoke-WebRequest "https://raw.githubusercontent.com/actions/setup-dotnet/main/.github/csc.json" -OutFile "csc.json"
28+
echo "::add-matcher::csc.json"
1929
# uses: actions/setup-dotnet@v2
2030
# with:
2131
# dotnet-version: 5.0.x
2232
# - name: Restore dependencies
2333
# run: dotnet restore
2434
- name: Add Packages
2535
run: |
26-
nuget install EDSEditorGUI/packages.config -OutputDirectory packages
27-
# nuget install Tests/packages.config -OutputDirectory packages
36+
dotnet restore
2837
- name: Build
2938
# run: make all # builds the Debug configuration
30-
run: msbuild EDSEditorGUI /property:Configuration=Release
39+
run: |
40+
msbuild -p:Build${{ matrix.dotnet }}=true /property:Configuration=${{ matrix.configuration }}
3141
# run: dotnet build --no-restore
32-
# - name: Test
33-
# run: dotnet test --no-build --verbosity normal
42+
- name: Test
43+
run: |
44+
dotnet test --no-build --verbosity normal Tests\bin\${{ matrix.configuration }}\${{ matrix.dotnet }}*\tests.dll
3445
- name: Upload Artifact
35-
uses: actions/upload-artifact@v3
46+
uses: actions/upload-artifact@v4
3647
with:
37-
name: EDSEditor
38-
path: EDSEditorGUI\bin\Release\
48+
name: EDSEditor_${{ matrix.dotnet }}
49+
path: |
50+
EDSEditorGUI\bin\Release\
51+
EDSSharp\bin\Release\

‎.github/workflows/release.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: make release
2+
3+
on:
4+
push:
5+
tags:
6+
- "v*.*.*"
7+
8+
jobs:
9+
build:
10+
runs-on: windows-latest
11+
permissions:
12+
contents: write
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
- name: Setup .NET
19+
uses: microsoft/setup-msbuild@v2
20+
- name: Add Packages
21+
run: |
22+
dotnet restore
23+
- name: Build
24+
run: |
25+
msbuild /property:Configuration=Release
26+
- name: Check for release tag
27+
run: |
28+
$release = "${{ github.ref_name }}" -match "v[\d]*[.][\d]*[.][\d]*$"
29+
$prerelease = If ($release) {"false"} else {"true"}
30+
echo "prerelease=$prerelease" >> $env:GITHUB_ENV
31+
- name: Make release package
32+
run: |
33+
$tag = "${{ github.ref_name }}"
34+
$filename = "CANopenEditor-$tag-binary.zip"
35+
Compress-Archive -CompressionLevel Optimal -Path "EDSEditorGUI\bin\Release\*","EDSSharp\bin\Release\*" -DestinationPath $filename
36+
echo "binary_name=$filename" >> $env:GITHUB_ENV
37+
- name: make release
38+
uses: softprops/action-gh-release@v2
39+
with:
40+
prerelease: ${{ env.prerelease }}
41+
files: |
42+
${{ env.binary_name }}

‎.travis.yml‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎EDSEditor.sln‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libEDSsharp", "libEDSsharp\libEDSsharp.csproj", "{CC0FA4B1-2BFC-43B3-8C56-B428DF2D24E7}"
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{2A479BF3-7628-409B-8A29-9314C308445E}"
11+
ProjectSection(ProjectDependencies) = postProject
12+
{8B7A7545-6257-44BF-8868-F429E1B72C77} = {8B7A7545-6257-44BF-8868-F429E1B72C77}
13+
EndProjectSection
1114
EndProject
1215
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EDSSharp", "EDSSharp\EDSSharp.csproj", "{8B7A7545-6257-44BF-8868-F429E1B72C77}"
1316
EndProject

‎EDSEditorGUI/.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
version.txt
1+
version.txt
2+
EDSEditorGUI.csproj.user

0 commit comments

Comments
 (0)