[NEW-FEATURE] Update https://github.com/siemens/simatic-s7-webserver-api/releases/tag/v3.3.3

.github/workflows/dev.yml

@@ -35,13 +35,13 @@ jobs:
       if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.publish == 'false' }}
       env:
           GH_TOKEN : ${{ secrets.GH_TOKEN }}
-      run: dotnet run --project cake/Build.csproj --do-test --do-pack --test-level 2 --framework net9.0   
+      run: dotnet run --project cake/Build.csproj --do-test --do-pack --test-level 2
     - name: "Publish packages"
       if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.publish == 'true' }}
       env:
         GH_TOKEN: ${{ secrets.GH_TOKEN }}
         GH_USER: ${{ secrets.GH_USER }}
-      run: dotnet run --project cake/Build.csproj --do-test --do-pack --test-level 2 --do-publish --do-publish-release --framework net9.0
+      run: dotnet run --project cake/Build.csproj --do-test --do-pack --test-level 2 --do-publish --do-publish-release 
     # - name: Test Report
     #   uses: dorny/test-reporter@v1
     #   if: success() || failure()

.github/workflows/master.yml

@@ -35,7 +35,7 @@ jobs:
     - name: "Run build script"
       env:
           GH_TOKEN : ${{ secrets.GH_TOKEN }}
-      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  
+      run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 100 --do-publish true  --do-publish-release true 
     - name: Test Report
       uses: dorny/test-reporter@v1
       if: success() || failure()

.github/workflows/pr-dev.yml

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

.github/workflows/release.yml

@@ -35,7 +35,7 @@ jobs:
     - name: "Run build script"
       env:
           GH_TOKEN : ${{ secrets.GH_TOKEN }}
-      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
+      run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 2 --do-publish true  --do-publish-release true
     - name: Test Report
       uses: dorny/test-reporter@v1
       if: success() || failure()

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-   <TargetFrameworks>net9.0;net10.0</TargetFrameworks>  
+   <TargetFramework>net10.0</TargetFramework>  
     <!-- Define output directories based on project names 
     <OutputPath>$(MSBuildThisFileDirectory)\.builds\bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>$(MSBuildThisFileDirectory)\.builds\obj\$(MSBuildProjectName)\$(Configuration)\</IntermediateOutputPath>  -->

Directory.Packages.props

@@ -33,7 +33,7 @@
     <PackageVersion Include="Irony.Interpreter" Version="1.5.3" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="LibGit2Sharp" Version="0.30.0" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="YamlDotNet" Version="16.2.0" />
@@ -45,7 +45,7 @@
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
-    <PackageVersion Include="Siemens.Simatic.S7.Webserver.API" Version="3.2.1" />
+    <PackageVersion Include="Siemens.Simatic.S7.Webserver.API" Version="3.3.3" />
     <PackageVersion Include="nunit" Version="4.3.2" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
@@ -57,37 +57,17 @@
     <PackageVersion Include="MSTest.TestFramework" Version="3.6.3" />
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="System.Interactive" Version="6.0.1" />
-  </ItemGroup>
-
-  <!-- .NET 9.0 Specific Packages -->
-  <ItemGroup>
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageVersion Include="System.Collections.Immutable" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageVersion Include="System.IO.Packaging" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageVersion Include="System.Text.Encodings.Web" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageVersion Include="System.Speech" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
-  </ItemGroup>
-
-  <!-- .NET 10.0 Specific Packages -->
-  <ItemGroup>
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
-    <PackageVersion Include="System.Collections.Immutable" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
-    <PackageVersion Include="System.IO.Packaging" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
-    <PackageVersion Include="System.Text.Encodings.Web" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
-    <PackageVersion Include="System.Text.Json" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
-    <PackageVersion Include="System.Speech" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
-    <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
+    <PackageVersion Include="System.Collections.Immutable" Version="10.0.0" />
+    <PackageVersion Include="System.IO.Packaging" Version="10.0.0" />
+    <PackageVersion Include="System.Text.Encodings.Web" Version="10.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.0" />
+    <PackageVersion Include="System.Speech" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" />
   </ItemGroup>
 </Project>

build.ps1

@@ -1,3 +1,3 @@
 # run build
-dotnet run --project cake/Build.csproj --framework net9.0 -- $args
+dotnet run --project cake/Build.csproj -- $args
 exit $LASTEXITCODE;

cake/Build.csproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net9.0</TargetFrameworks>
+  <PropertyGroup>    
     <OutputType>Exe</OutputType>    
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
 	  <IsPackable>false</IsPackable>

cake/BuildContext.cs

@@ -91,7 +91,7 @@ public BuildContext(ICakeContext context, BuildParameters buildParameters)
         DotNetRunSettings = new DotNetRunSettings()
         {
             Verbosity = buildParameters.Verbosity,
-            Framework = "net9.0",
+            Framework = "net10.0",
             Configuration = buildParameters.Configuration,
             NoBuild = true,
             NoRestore = true,
@@ -185,7 +185,7 @@ public void PushNugetPackages(string artifactDirectory)
         //}
     }
 
-    public IEnumerable<string> TargetFrameworks { get; } = new List<string>() { "net10.0", "net9.0" };
+    public IEnumerable<string> TargetFrameworks { get; } = new List<string>() { "net10.0" };
     public string ApaxSignKey { get; set; } = System.Environment.GetEnvironmentVariable("APAX_KEY");
     public string GitHubUser { get; set; } = System.Environment.GetEnvironmentVariable("GH_USER");
     public string GitHubToken { get; set; } = System.Environment.GetEnvironmentVariable("GH_TOKEN");

pack-only.ps1

@@ -1,4 +1,4 @@
 # run build
 
-dotnet run --project cake/Build.csproj --do-pack --test-level 1 --framework net9.0
+dotnet run --project cake/Build.csproj --do-pack --test-level 1
 exit $LASTEXITCODE;

src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs

@@ -138,7 +138,7 @@ private void EnsureCsProjFile()
             var defaultCsProjectWhenNotProvidedByTemplate =
                 $@"<Project Sdk=""Microsoft.NET.Sdk"">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
+		<TargetFrameworks>net10.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
@@ -709,7 +709,7 @@ internal static (Dictionary<string,string> properties, List<string> targetFramew
             if (frameworks.Count == 0)
             {
                 // default fallback
-                frameworks.Add("net9.0");
+                frameworks.Add("net10.0");
             }
             return (props, frameworks);
         }

src/AXSharp.compiler/src/ixc/apax.yml

@@ -18,11 +18,11 @@ bugs:
 license: "MIT"  
 author: "https://github.com/Inxton/axsharp/graphs/contributors"
 files:
-  - "bin/Release/net9.0/**"
-  - "!bin/Release/net9.0/.apax/.apax/**"
+  - "bin/Release/net10.0/**"
+  - "!bin/Release/net10.0/.apax/.apax/**"
 contributedCommands:
   ixc:
-    bin: "bin/Release/net9.0/AXSharp.ixc.exe"
+    bin: "bin/Release/net10.0/AXSharp.ixc.exe"
     description: "AX#Sharp twin compiler"
     hidden: false
 

src/AXSharp.compiler/src/ixd/apax.yml

@@ -18,10 +18,10 @@ bugs:
 license: "MIT"  
 author: "https://github.com/Inxton/axsharp/graphs/contributors"
 files:
-  - "bin/Release/net9.0/**"  
-  - "!bin/Release/net9.0/.apax/.apax/**"  
+  - "bin/Release/net10.0/**"  
+  - "!bin/Release/net10.0/.apax/.apax/**"  
 contributedCommands:
   ixd:
-    bin: "bin/Release/net9.0/AXSharp.ixd.exe"
+    bin: "bin/Release/net10.0/AXSharp.ixd.exe"
     description: "AX#Sharp documentation compiler"
     hidden: false

src/AXSharp.compiler/src/ixr/apax.yml

@@ -18,10 +18,10 @@ bugs:
 license: "MIT"  
 author: "https://github.com/Inxton/axsharp/graphs/contributors"
 files:
-  - "bin/Release/net9.0/**"  
-  - "!bin/Release/net9.0/.apax/.apax/**"  
+  - "bin/Release/net10.0/**"  
+  - "!bin/Release/net10.0/.apax/.apax/**"  
 contributedCommands:
   ixr:
-    bin: "bin/Release/net9.0/AXSharp.ixr.exe"
+    bin: "bin/Release/net10.0/AXSharp.ixr.exe"
     description: "AX#Sharp resources compiler"
     hidden: false        

src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/ax/units.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
+		<TargetFrameworks>net10.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>

src/AXSharp.compiler/tests/AXSharp.Compiler.CsTests/samples/units/expected/tia/units.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
+		<TargetFrameworks>net10.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>

src/AXSharp.compiler/tests/AXSharp.CompilerTests/ConditionalDependenciesTests.cs

@@ -33,13 +33,13 @@ public void should_respect_itemgroup_condition_targetframework()
         var csproj = """
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
     <PackageReference Include="PkgOnlyNet8" Version="1.0.0" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="PkgOnlyNet9" Version="2.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
+    <PackageReference Include="PkgOnlyNet10" Version="2.0.0" />
   </ItemGroup>
 </Project>
 """;
@@ -48,9 +48,8 @@ public void should_respect_itemgroup_condition_targetframework()
         var ax = new AXSharpProject(new AxProject(projDir), Array.Empty<Type>(), typeof(CsProject), new CompilerTestOptions(){ OutputProjectFolder = projDir});
         var target = (CsProject)ax.TargetProject;
         var refs = target.LoadReferences().OfType<PackageReference>().ToList();
-        Assert.Contains(refs, r => r.Include == "PkgOnlyNet8");
-       // Assert.Contains(refs, r => r.Include == "PkgOnlyNet9"); we only use single target framework in this test, so net9.0 package should not be included
-        Assert.DoesNotContain(refs, r => r.Include == "PkgOnlyNet9");
+        Assert.DoesNotContain(refs, r => r.Include == "PkgOnlyNet8");
+        Assert.Contains(refs, r => r.Include == "PkgOnlyNet10");
     }
 
     [Fact]
@@ -69,8 +68,7 @@ public void should_respect_element_condition_inside_itemgroup()
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AlwaysPkg" Version="1.0.0" />
-    <PackageReference Include="CondPkg" Version="1.2.3" Condition="'$(TargetFramework)'=='net8.0'" />
-    <PackageReference Include="SkippedPkg" Version="3.0.0" Condition="'$(TargetFramework)'=='net9.0'" />
+    <PackageReference Include="CondPkg" Version="1.2.3" />
   </ItemGroup>
 </Project>
 """;

src/AXSharp.compiler/tests/integration/actual/app/samples/units/ix/ax/app.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
+		<TargetFrameworks>net10.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>

src/AXSharp.compiler/tests/integration/actual/app/samples/units/ix/tia/app.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
+		<TargetFrameworks>net10.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>

src/AXSharp.compiler/tests/integration/actual/lib1/samples/units/ix/ax/lib1.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
+		<TargetFrameworks>net10.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>

src/AXSharp.compiler/tests/integration/actual/lib1/samples/units/ix/tia/lib1.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
+		<TargetFrameworks>net10.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>

src/AXSharp.compiler/tests/integration/actual/lib2/samples/units/ix/ax/lib2.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
+		<TargetFrameworks>net10.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>

src/AXSharp.compiler/tests/integration/actual/lib2/samples/units/ix/tia/lib2.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
+		<TargetFrameworks>net10.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>

src/AXSharp.connectors/tests/ax-test-project/apax.yml

@@ -83,8 +83,8 @@ variables:
   HWCONFIG: "HWC"
   COM_CERT_PATH: .\certs\Communication.cer
 scripts:
-  ixc: dotnet run --project ..//..//..//AXSharp.compiler//src//ixc//AXSharp.ixc.csproj --framework net9.0
-  ixd: dotnet run --project ..\\..\\..\\AXSharp.compiler\\src\\ixr\\AXSharp.ixr.csproj --framework net9.0
+  ixc: dotnet run --project ..//..//..//AXSharp.compiler//src//ixc//AXSharp.ixc.csproj --framework net10.0
+  ixd: dotnet run --project ..\\..\\..\\AXSharp.compiler\\src\\ixr\\AXSharp.ixr.csproj --framework net10.0
   postbuild:
     - apax ixc
     - apax ixd