Skip to content

Commit 86d1aec

Browse files
jogibear9988jogibear9988
authored
Merge pull request #213 from dotnetprojects/switchToGithubActions
Switch to GitHub actions
2 parents 98bf5d4 + e76de95 commit 86d1aec

File tree

46 files changed

+291
-222
lines changed

Some content is hidden

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

46 files changed

+291
-222
lines changed

‎.github/workflows/build-pull.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: .NET Pull Request
2+
3+
on:
4+
pull_request:
5+
branches: [ master ]
6+
7+
jobs:
8+
build:
9+
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v4
14+
- name: Fetch history
15+
run: git fetch --prune --unshallow
16+
- name: Setup .NET
17+
uses: actions/setup-dotnet@v4
18+
with:
19+
dotnet-version: |
20+
5.0.x
21+
6.0.x
22+
8.0.x
23+
- name: Restore dependencies
24+
run: dotnet restore DotNetSiemensPLCToolBoxLibrary.sln
25+
- name: Build
26+
run: dotnet build DotNetSiemensPLCToolBoxLibrary.sln

‎.github/workflows/build.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: .NET
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: windows-latest
13+
14+
steps:
15+
- uses: actions/checkout@v4
16+
- name: Fetch history
17+
run: git fetch --prune --unshallow
18+
- name: Setup .NET
19+
uses: actions/setup-dotnet@v4
20+
with:
21+
dotnet-version: |
22+
5.0.x
23+
6.0.x
24+
8.0.x
25+
- name: Restore dependencies
26+
run: dotnet restore DotNetSiemensPLCToolBoxLibrary.sln
27+
- name: Build
28+
run: dotnet build DotNetSiemensPLCToolBoxLibrary.sln
29+
- name: Test
30+
run: dotnet test DotNetSiemensPLCToolBoxLibrary.sln

‎.github/workflows/release.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: .NET
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
build:
9+
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v4
14+
- name: Fetch history
15+
run: git fetch --prune --unshallow
16+
- name: Setup .NET
17+
uses: actions/setup-dotnet@v4
18+
with:
19+
dotnet-version: |
20+
5.0.x
21+
6.0.x
22+
8.0.x
23+
- name: Restore dependencies
24+
run: dotnet restore DotNetSiemensPLCToolBoxLibrary.sln
25+
- name: Update project version
26+
uses: roryprimrose/set-vs-sdk-project-version@v1
27+
with:
28+
version: ${{ github.event.release.tag_name }}
29+
assemblyVersion: ${{ github.event.release.tag_name }}
30+
fileVersion: ${{ github.event.release.tag_name }}
31+
informationalVersion: ${{ github.event.release.tag_name }}-${{ github.sha }}
32+
- name: Build
33+
run: dotnet build DotNetSiemensPLCToolBoxLibrary.sln
34+
- uses: actions/upload-artifact@v4
35+
with:
36+
path: ./**/DotNetProjects.DotNetSiemensPLCToolBoxLibrary*.nupkg
37+
# - name: Publish Nuget
38+
# run: dotnet nuget push DotNetSiemensPLCToolBoxLibrary.sln --api-key ${{secrets.NUGET_API_KEY}} --source https://api.nuget.org/v3/index.json

‎BackupRestoreBlocks/BackupRestoreBlocks.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net461</TargetFramework>
66
<UseWindowsForms>true</UseWindowsForms>
7+
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
78
<UseWPF>true</UseWPF>
89
</PropertyGroup>
910
<ItemGroup>

‎BackupS7/BackupS7.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net461</TargetFramework>
6+
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
67
</PropertyGroup>
78
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
89
<PlatformTarget>AnyCPU</PlatformTarget>
910
</PropertyGroup>
1011
<ItemGroup>
11-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
12+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1213
</ItemGroup>
1314
<ItemGroup>
1415
<ProjectReference Include="..\LibNoDaveConnectionLibrary\DotNetSiemensPLCToolBoxLibrary.csproj" />

‎CommandWhenBitSet/CommandWhenBitSet.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net461</TargetFramework>
6-
<UseWindowsForms>true</UseWindowsForms>
6+
<UseWindowsForms>true</UseWindowsForms>
7+
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
78
<ApplicationIcon />
89
<StartupObject />
910
</PropertyGroup>

‎DbfReader/DbfReader.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<TargetFramework>net461</TargetFramework>
66
<UseWindowsForms>true</UseWindowsForms>
77
<UseWPF>true</UseWPF>
8+
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
89
</PropertyGroup>
910
<ItemGroup>
1011
<ProjectReference Include="..\LibNoDaveConnectionLibrary.WinForms\DotNetSiemensPLCToolBoxLibrary.WinForms.csproj" />

‎DotNetDatenbankProtokollerV2/ConfigurationTool/JFK-ProtokollerConfigurationTool.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<UseWPF>true</UseWPF>
88
<RootNamespace>DotNetSimaticDatabaseProtokollerConfigurationTool</RootNamespace>
99
<ApplicationManifest>app.manifest</ApplicationManifest>
10+
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
1011
</PropertyGroup>
1112
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1213
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -15,8 +16,8 @@
1516
<None Remove="Images\*" />
1617
</ItemGroup>
1718
<ItemGroup>
18-
<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="4.6.97" />
19-
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
19+
<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.115" />
20+
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.122" />
2021
</ItemGroup>
2122
<ItemGroup>
2223
<ProjectReference Include="..\..\LibNoDaveConnectionLibrary.WinForms\DotNetSiemensPLCToolBoxLibrary.WinForms.csproj" />

‎DotNetDatenbankProtokollerV2/DotNetSimaticDatabaseProtokollerService/JFK-ProtokollerService.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<OutputType>WinExe</OutputType>
55
<TargetFrameworks>net462</TargetFrameworks>
66
<UseWindowsForms>true</UseWindowsForms>
7+
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
78
<UseWPF>true</UseWPF>
89
</PropertyGroup>
910
<ItemGroup>
@@ -20,6 +21,7 @@
2021
</EmbeddedResource>
2122
</ItemGroup>
2223
<ItemGroup>
24+
<Reference Include="System.Configuration.Install" />
2325
<Reference Include="System.ServiceProcess" />
2426
</ItemGroup>
2527
</Project>

‎DotNetDatenbankProtokollerV2/ProtokollerLibrary/Databases/PostgreSQL/PostgreSQLStorage.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public override void CreateOrModify_TablesAndFields(string dataTable, DatasetCon
8383
}
8484
catch (Npgsql.PostgresException ex)
8585
{
86-
if (ex.Code != "42P04")
86+
if (ex.SqlState != "42P04")
8787
{
8888
Logging.LogText("Database could not be created. Storage: " + myConfig.Name, ex, Logging.LogLevel.Error);
8989
throw ex;
@@ -103,7 +103,7 @@ public override void CreateOrModify_TablesAndFields(string dataTable, DatasetCon
103103
}
104104
catch (Npgsql.PostgresException ex)
105105
{
106-
if (ex.Code == "42P01")
106+
if (ex.SqlState == "42P01")
107107
{
108108
try
109109
{

0 commit comments

Comments
 (0)