Skip to content

Commit a720793

Browse files
PTKuPTKu
authored
Merge pull request #468 from Inxton/467-new-feature-update-httpsgithubcomsiemenssimatic-s7-webserver-apireleasestagv333
[NEW-FEATURE] Update https://github.com/siemens/simatic-s7-webserver-api/releases/tag/v3.3.3
2 parents 7333070 + 3dd5321 commit a720793

35 files changed

Lines changed: 127 additions & 89 deletions

File tree

‎.github/workflows/dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.publish == 'false' }}
3636
env:
3737
GH_TOKEN : ${{ secrets.GH_TOKEN }}
38-
run: dotnet run --project cake/Build.csproj --do-test --do-pack --test-level 2 --framework net9.0
38+
run: dotnet run --project cake/Build.csproj --do-test --do-pack --test-level 2
3939
- name: "Publish packages"
4040
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.publish == 'true' }}
4141
env:
4242
GH_TOKEN: ${{ secrets.GH_TOKEN }}
4343
GH_USER: ${{ secrets.GH_USER }}
44-
run: dotnet run --project cake/Build.csproj --do-test --do-pack --test-level 2 --do-publish --do-publish-release --framework net9.0
44+
run: dotnet run --project cake/Build.csproj --do-test --do-pack --test-level 2 --do-publish --do-publish-release
4545
# - name: Test Report
4646
# uses: dorny/test-reporter@v1
4747
# if: success() || failure()

‎.github/workflows/master.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: "Run build script"
3636
env:
3737
GH_TOKEN : ${{ secrets.GH_TOKEN }}
38-
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 100 --do-publish true --do-publish-release true --framework net9.0
38+
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 100 --do-publish true --do-publish-release true
3939
- name: Test Report
4040
uses: dorny/test-reporter@v1
4141
if: success() || failure()

‎.github/workflows/pr-dev.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: dotnet build cake/Build.csproj
2828

2929
- name: "Run build script"
30-
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 1 --framework net9.0
30+
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 1
3131
- name: Test Report
3232
uses: dorny/test-reporter@v1
3333
if: success() || failure()

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: "Run build script"
3636
env:
3737
GH_TOKEN : ${{ secrets.GH_TOKEN }}
38-
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 2 --do-publish true --do-publish-release true --framework net9.0
38+
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 2 --do-publish true --do-publish-release true
3939
- name: Test Report
4040
uses: dorny/test-reporter@v1
4141
if: success() || failure()

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
3+
<TargetFramework>net10.0</TargetFramework>
44
<!-- Define output directories based on project names
55
<OutputPath>$(MSBuildThisFileDirectory)\.builds\bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
66
<IntermediateOutputPath>$(MSBuildThisFileDirectory)\.builds\obj\$(MSBuildProjectName)\$(Configuration)\</IntermediateOutputPath> -->

‎Directory.Packages.props‎

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<PackageVersion Include="Irony.Interpreter" Version="1.5.3" />
3434
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
3535
<PackageVersion Include="LibGit2Sharp" Version="0.30.0" />
36-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
36+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
3737
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
3838
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
3939
<PackageVersion Include="YamlDotNet" Version="16.2.0" />
@@ -45,7 +45,7 @@
4545
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
4646
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
4747
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
48-
<PackageVersion Include="Siemens.Simatic.S7.Webserver.API" Version="3.2.1" />
48+
<PackageVersion Include="Siemens.Simatic.S7.Webserver.API" Version="3.3.3" />
4949
<PackageVersion Include="nunit" Version="4.3.2" />
5050
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
5151
<PackageVersion Include="NSubstitute" Version="5.3.0" />
@@ -57,37 +57,17 @@
5757
<PackageVersion Include="MSTest.TestFramework" Version="3.6.3" />
5858
<PackageVersion Include="Moq" Version="4.20.72" />
5959
<PackageVersion Include="System.Interactive" Version="6.0.1" />
60-
</ItemGroup>
61-
62-
<!-- .NET 9.0 Specific Packages -->
63-
<ItemGroup>
64-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" Condition="'$(TargetFramework)' == 'net9.0'" />
65-
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
66-
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
67-
<PackageVersion Include="System.IO.Packaging" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
68-
<PackageVersion Include="System.Text.Encodings.Web" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
69-
<PackageVersion Include="System.Text.Json" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
70-
<PackageVersion Include="System.Speech" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
71-
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
72-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
73-
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
74-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
75-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
76-
</ItemGroup>
77-
78-
<!-- .NET 10.0 Specific Packages -->
79-
<ItemGroup>
80-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
81-
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
82-
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
83-
<PackageVersion Include="System.IO.Packaging" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
84-
<PackageVersion Include="System.Text.Encodings.Web" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
85-
<PackageVersion Include="System.Text.Json" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
86-
<PackageVersion Include="System.Speech" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
87-
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
88-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
89-
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
90-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
91-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
60+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
61+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
62+
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0" />
63+
<PackageVersion Include="System.IO.Packaging" Version="10.0.0" />
64+
<PackageVersion Include="System.Text.Encodings.Web" Version="10.0.0" />
65+
<PackageVersion Include="System.Text.Json" Version="10.0.0" />
66+
<PackageVersion Include="System.Speech" Version="10.0.0" />
67+
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.0" />
68+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" />
69+
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.0" />
70+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
71+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" />
9272
</ItemGroup>
9373
</Project>

‎build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# run build
2-
dotnet run --project cake/Build.csproj --framework net9.0 -- $args
2+
dotnet run --project cake/Build.csproj -- $args
33
exit $LASTEXITCODE;

‎cake/Build.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFrameworks>net9.0</TargetFrameworks>
2+
<PropertyGroup>
43
<OutputType>Exe</OutputType>
54
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
65
<IsPackable>false</IsPackable>

‎cake/BuildContext.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public BuildContext(ICakeContext context, BuildParameters buildParameters)
9191
DotNetRunSettings = new DotNetRunSettings()
9292
{
9393
Verbosity = buildParameters.Verbosity,
94-
Framework = "net9.0",
94+
Framework = "net10.0",
9595
Configuration = buildParameters.Configuration,
9696
NoBuild = true,
9797
NoRestore = true,
@@ -185,7 +185,7 @@ public void PushNugetPackages(string artifactDirectory)
185185
//}
186186
}
187187

188-
public IEnumerable<string> TargetFrameworks { get; } = new List<string>() { "net10.0", "net9.0" };
188+
public IEnumerable<string> TargetFrameworks { get; } = new List<string>() { "net10.0" };
189189
public string ApaxSignKey { get; set; } = System.Environment.GetEnvironmentVariable("APAX_KEY");
190190
public string GitHubUser { get; set; } = System.Environment.GetEnvironmentVariable("GH_USER");
191191
public string GitHubToken { get; set; } = System.Environment.GetEnvironmentVariable("GH_TOKEN");

‎pack-only.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# run build
22

3-
dotnet run --project cake/Build.csproj --do-pack --test-level 1 --framework net9.0
3+
dotnet run --project cake/Build.csproj --do-pack --test-level 1
44
exit $LASTEXITCODE;

0 commit comments

Comments
 (0)