From f31d97d326a03065a57202693410a450f979e49e Mon Sep 17 00:00:00 2001 From: PTKu Date: Tue, 13 Jun 2023 05:32:42 +0200 Subject: [PATCH 1/2] Create draft PR for #103 From a454a5e3429405e3c2289e26f1b4324356e949e4 Mon Sep 17 00:00:00 2001 From: Peter <61538034+PTKu@users.noreply.github.com> Date: Tue, 13 Jun 2023 05:39:27 +0200 Subject: [PATCH 2/2] Updates to "@ax/sdk": ^4.0.2 and latest --- src/abstractions/ctrl/apax.yml | 6 +++--- src/core/ctrl/apax.yml | 8 +++---- src/data/ctrl/apax.yml | 10 ++++----- src/integrations/ctrl/apax.yml | 19 +++++++++-------- src/probers/ctrl/apax.yml | 8 +++---- src/simatic1500/ctrl/apax.yml | 8 +++---- src/templates.simple/ctrl/apax.yml | 34 +++++++++++++++--------------- src/utils/ctrl/apax.yml | 6 +++--- 8 files changed, 50 insertions(+), 49 deletions(-) diff --git a/src/abstractions/ctrl/apax.yml b/src/abstractions/ctrl/apax.yml index 9c8169e44..d302a5fab 100644 --- a/src/abstractions/ctrl/apax.yml +++ b/src/abstractions/ctrl/apax.yml @@ -1,14 +1,14 @@ name: "@ix-ax/axopen.abstractions" -version : '0.1.4-alpha.79' +version: '0.1.4-alpha.79' type: lib targets: - axunit-llvm files: - src devDependencies: - "@ax/sdk": ^3.0.18 + "@ax/sdk": ^4.0.2 dependencies: - "@ax/system-strings": ^4.2.3 + "@ax/system-strings": ^5.0.12 scripts: postbuild: - dotnet ixc diff --git a/src/core/ctrl/apax.yml b/src/core/ctrl/apax.yml index da07c8616..76cee60f6 100644 --- a/src/core/ctrl/apax.yml +++ b/src/core/ctrl/apax.yml @@ -1,15 +1,15 @@ name: "@ix-ax/axopen.core" -version : '0.1.4-alpha.79' +version: '0.1.4-alpha.79' type: lib targets: - axunit-llvm files: - src devDependencies: - "@ax/sdk": ^3.0.18 + "@ax/sdk": ^4.0.2 scripts: postbuild: - dotnet ixc dependencies: - "@ax/system-timer": ^3.0.9 - "@ix-ax/axopen.abstractions" : '0.1.4-alpha.79' + "@ax/system-timer": ^4.0.1 + "@ix-ax/axopen.abstractions": '0.1.4-alpha.79' diff --git a/src/data/ctrl/apax.yml b/src/data/ctrl/apax.yml index c79a52591..f41efec0e 100644 --- a/src/data/ctrl/apax.yml +++ b/src/data/ctrl/apax.yml @@ -1,14 +1,14 @@ name: "@ix-ax/axopen.data" -version : '0.1.4-alpha.79' +version: '0.1.4-alpha.79' type: lib targets: - axunit-llvm files: - src dependencies: - "@ix-ax/axopen.core" : '0.1.4-alpha.79' + "@ix-ax/axopen.core": '0.1.4-alpha.79' devDependencies: - "@ax/sdk": ^3.0.18 -scripts: - postbuild: + "@ax/sdk": ^4.0.2 +scripts: + postbuild: - dotnet ixc diff --git a/src/integrations/ctrl/apax.yml b/src/integrations/ctrl/apax.yml index a933c802a..8208d2adf 100644 --- a/src/integrations/ctrl/apax.yml +++ b/src/integrations/ctrl/apax.yml @@ -1,17 +1,17 @@ name: "axopen.integrations" -version : '0.1.4-alpha.79' +version: '0.1.4-alpha.79' type: app targets: - "1500" - - plcsim + - plcsim - axunit-llvm devDependencies: - "@ax/sdk": ^3.0.18 - "@ax/sld": ^0.15.9 -dependencies: - "@ix-ax/axopen.data" : '0.1.4-alpha.79' - "@ix-ax/axopen.probers" : '0.1.4-alpha.79' - "@ix-ax/axopen.simatic1500" : '0.1.4-alpha.79' + "@ax/sdk": ^4.0.2 + "@ax/sld": ^0.15.9 +dependencies: + "@ix-ax/axopen.data": '0.1.4-alpha.79' + "@ix-ax/axopen.probers": '0.1.4-alpha.79' + "@ix-ax/axopen.simatic1500": '0.1.4-alpha.79' variables: APAX_BUILD_ARGS: [ -d ] @@ -45,7 +45,8 @@ scripts: postbuild: - apax ixc watch: - - dotnet watch --project ..\\src\\AXOpen.Integrations.Blazor\\axopen_integrations_blazor.csproj + - dotnet watch --project + ..\\src\\AXOpen.Integrations.Blazor\\axopen_integrations_blazor.csproj rr: - apax build - apax download diff --git a/src/probers/ctrl/apax.yml b/src/probers/ctrl/apax.yml index 471e656bd..535ffdcd2 100644 --- a/src/probers/ctrl/apax.yml +++ b/src/probers/ctrl/apax.yml @@ -1,16 +1,16 @@ name: "@ix-ax/axopen.probers" -version : '0.1.4-alpha.79' +version: '0.1.4-alpha.79' type: lib targets: - axunit-llvm files: - src dependencies: - "@ix-ax/axopen.core" : '0.1.4-alpha.79' + "@ix-ax/axopen.core": '0.1.4-alpha.79' devDependencies: - "@ax/sdk": ^3.0.18 + "@ax/sdk": ^4.0.2 variables: - APAX_BUILD_ARGS: [ -d ] + APAX_BUILD_ARGS: [ -d ] scripts: ixc: diff --git a/src/simatic1500/ctrl/apax.yml b/src/simatic1500/ctrl/apax.yml index 5e8c1018c..e900b0838 100644 --- a/src/simatic1500/ctrl/apax.yml +++ b/src/simatic1500/ctrl/apax.yml @@ -1,15 +1,15 @@ name: "@ix-ax/axopen.simatic1500" -version : '0.1.4-alpha.79' +version: '0.1.4-alpha.79' type: lib targets: - axunit-llvm files: - src dependencies: - "@ax/simatic-1500": ^3.0.2 - "@ix-ax/axopen.abstractions" : '0.1.4-alpha.79' + "@ax/simatic-1500": ^4.0.8 + "@ix-ax/axopen.abstractions": '0.1.4-alpha.79' devDependencies: - "@ax/sdk": ^3.0.18 + "@ax/sdk": ^4.0.2 scripts: postbuild: diff --git a/src/templates.simple/ctrl/apax.yml b/src/templates.simple/ctrl/apax.yml index 39ededb82..c7c32d6e7 100644 --- a/src/templates.simple/ctrl/apax.yml +++ b/src/templates.simple/ctrl/apax.yml @@ -1,31 +1,31 @@ name: "axosimple" -version : '0.1.4-alpha.79' +version: '0.1.4-alpha.79' type: app registries: - '@ix-ax': https://npm.pkg.github.com/ + '@ix-ax': https://npm.pkg.github.com/ targets: - "1500" - plcsim - - axunit-llvm + - axunit-llvm devDependencies: - "@ax/sdk": ^3.0.18 - "@ax/sld": ^0.15.9 -dependencies: - "@ix-ax/axopen.data" : '0.1.4-alpha.79' - "@ix-ax/axopen.simatic1500" : '0.1.4-alpha.79' + "@ax/sdk": ^4.0.2 + "@ax/sld": ^0.15.9 +dependencies: + "@ix-ax/axopen.data": '0.1.4-alpha.79' + "@ix-ax/axopen.simatic1500": '0.1.4-alpha.79' variables: - APAX_BUILD_ARGS: [ -d ] + APAX_BUILD_ARGS: [ -d ] scripts: - ixc: - - dotnet tool restore --no-cache - - dotnet ixc - - dotnet ixr + ixc: + - dotnet tool restore --no-cache + - dotnet ixc + - dotnet ixr postbuild: apax ixc - download : - - apax install + download: + - apax install - apax build # Here you will need to set the argumen -t to your plc OP and -i to platfrom you are dowloading to # --default-server-interface is a must if you are using WebAPI - - apax sld --accept-security-disclaimer -t 192.168.0.4 -i .\\bin\\plcsim\\ -r --default-server-interface - + - apax sld --accept-security-disclaimer -t 192.168.0.4 -i .\\bin\\plcsim\\ + -r --default-server-interface diff --git a/src/utils/ctrl/apax.yml b/src/utils/ctrl/apax.yml index 43f2804e8..e48dd5449 100644 --- a/src/utils/ctrl/apax.yml +++ b/src/utils/ctrl/apax.yml @@ -1,14 +1,14 @@ name: "@ix-ax/axopen.utils" -version : '0.1.4-alpha.79' +version: '0.1.4-alpha.79' type: lib targets: - axunit-llvm files: - src devDependencies: - "@ax/sdk": ^3.0.18 + "@ax/sdk": ^4.0.2 scripts: postbuild: - dotnet ixc dependencies: - "@ax/system-serde": ^1.3.13 + "@ax/system-serde": ^2.0.2