Skip to content

Commit d7f1a07

Browse files
author
Sven Erb
committed
Merge branch 'gcode_reader' into gcode_writer
2 parents 1c5c3e8 + 465a145 commit d7f1a07

Some content is hidden

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

52 files changed

+3237
-228658
lines changed

.github/workflows/BuildTestDeploy.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Setup Dotnet sdk
3939
uses: actions/setup-dotnet@v3
4040
with:
41-
dotnet-version: 7.0.x
41+
dotnet-version: 8.0.x
4242

4343
- name: Remove GUI Projects (Linux)
4444
if: contains(matrix.os, 'ubuntu')
@@ -50,17 +50,17 @@ jobs:
5050
- name: Test Linux
5151
if: contains(matrix.os, 'ubuntu')
5252
run: |
53-
dotnet run --configuration Release --framework net6 --no-build --project ReaderWriter/FileReaderWriterFactoryGRPCWrapper/FileReaderWriterFactoryGRPCWrapper.csproj &
53+
dotnet run --configuration Release --framework net8.0 --no-build --project ReaderWriter/FileReaderWriterFactoryGRPCWrapper/FileReaderWriterFactoryGRPCWrapper.csproj &
5454
grpcpid="$!"
5555
echo "started grpc server"
5656
sleep 5s
57-
dotnet test --no-build --configuration Release --framework net6
57+
dotnet test --no-build --configuration Release --framework net8.0
5858
kill $grpcpid
5959
6060
- name: Test Windows
6161
if: contains(matrix.os, 'windows')
6262
run: |
63-
$j = Start-Process -PassThru -Filepath 'dotnet' -WorkingDirectory $PWD -ArgumentList 'run --configuration Release --framework net6 --no-build --project .\ReaderWriter\FileReaderWriterFactoryGRPCWrapper\FileReaderWriterFactoryGRPCWrapper.csproj'
63+
$j = Start-Process -PassThru -Filepath 'dotnet' -WorkingDirectory $PWD -ArgumentList 'run --configuration Release --framework net8.0 --no-build --project .\ReaderWriter\FileReaderWriterFactoryGRPCWrapper\FileReaderWriterFactoryGRPCWrapper.csproj'
6464
Start-Sleep -s 5
6565
dotnet test --no-build --configuration Release
6666
$j | Select-Object -Property Id | Stop-Process
@@ -81,7 +81,7 @@ jobs:
8181
- name: Setup Dotnet sdk
8282
uses: actions/setup-dotnet@v3
8383
with:
84-
dotnet-version: 7.0.x
84+
dotnet-version: 8.0.x
8585

8686
- name: Build Windows
8787
run: |

Benchmarks/Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net7.0;net6.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<IsPackable>false</IsPackable>
88
<Nullable>enable</Nullable>

0 commit comments

Comments
 (0)