Skip to content

Commit

Permalink
[NEW-FEATURE] Update to apax 2.0.0 (#246)
Browse files Browse the repository at this point in the history
* Create draft PR for #245

* fix after update to apax 2.0.0

---------

Co-authored-by: PTKu <PTKu@users.noreply.github.com>
Co-authored-by: Peter <61538034+PTKu@users.noreply.github.com>
  • Loading branch information
3 people committed Oct 10, 2023
1 parent 2df3b77 commit ad72d25
Show file tree
Hide file tree
Showing 22 changed files with 28 additions and 18 deletions.
2 changes: 1 addition & 1 deletion cake/BuildContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public void UploadTestPlc(string workingDirectory, string targetIp,

this.ProcessRunner.Start(Helpers.GetApaxCommand(), new ProcessSettings()
{
Arguments = " install -L",
Arguments = " install",
WorkingDirectory = workingDirectory,
RedirectStandardOutput = false,
RedirectStandardError = false,
Expand Down
2 changes: 1 addition & 1 deletion cake/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ private static void ProvisionProjectWideTools(BuildContext context)

context.ProcessRunner.Start(Helpers.GetApaxCommand(), new Cake.Core.IO.ProcessSettings()
{
Arguments = $" install -L -c",
Arguments = $" install -c",
WorkingDirectory = Path.Combine(context.ScrDir, "apax"),
RedirectStandardOutput = false,
RedirectStandardError = false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"OutputProjectFolder":"ix","UseBase":false}
{"OutputProjectFolder":"ix","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"ax_blazor_example.csproj"}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"Id":"ax_blazor_example","Version":"0.0.0"}
9 changes: 7 additions & 2 deletions src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ private void EnsureCsProjFile()
var defaultCsProjectWhenNotProvidedByTemplate =
$@"<Project Sdk=""Microsoft.NET.Sdk"">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFrameworks>net7.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand All @@ -123,7 +123,12 @@ private void EnsureCsProjFile()
</ItemGroup>
<ItemGroup>
<Compile Include="".g\**"" />
<Compile Include="".g\**"" />
</ItemGroup>
<ItemGroup>
<Folder Include="".meta\"" />
<Content Include="".meta\**"" />
</ItemGroup>
</Project>";

Expand Down
2 changes: 1 addition & 1 deletion src/AXSharp.compiler/src/ixd/tests/samples/ax/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ scripts:
echo "Environment variable AXTARGET not defined!!!"
fi
do-it-all:
- apax install -L
- apax install
- apax build
- apax check+download

2 changes: 1 addition & 1 deletion src/AXSharp.compiler/src/ixr/tests/samples/ax/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ scripts:
echo "Environment variable AXTARGET not defined!!!"
fi
do-it-all:
- apax install -L
- apax install
- apax build
- apax check+download

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"OutputProjectFolder":"ix","UseBase":false}
{"OutputProjectFolder":"ix","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"ax_test_project.csproj"}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"Id":"ax_test_project","Version":"0.0.0"}
2 changes: 1 addition & 1 deletion src/AXSharp.connectors/tests/ax-test-project/go.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ $targetIP = [Environment]::GetEnvironmentVariable('AX_WEBAPI_TARGET')
$targetInput = [Environment]::GetEnvironmentVariable('AXTARGETPLATFORMINPUT')
$targetIP
$targetInput
apax install -L
apax install
apax build
apax sld --accept-security-disclaimer -t $targetIP -i $targetInput -r --default-server-interface
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"OutputProjectFolder":"ix","UseBase":false}
{"OutputProjectFolder":"ix","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"hello_world_console_plc.csproj"}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"Id":"hello_world_console_plc","Version":"0.0.0"}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ $TARGET_IP = "192.168.0.1"
$TARGET_PLATFORM = ".\bin\1500"

# Installs dependencies
apax install -L
apax install

# Runs ixc compiler directly from source
dotnet run --project ..\..\..\AXSharp.compiler\src\ixc\AXSharp.ixc.csproj --framework net7.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ scripts:
- dotnet ixc -o ..\\ixsharpblazor.twin
postbuild: apax ixc
download :
- apax install -L
- 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dotnet tool restore
cd ax
apax install -L
apax install
apax build
axcode .
axcode -g ..\README.md:0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dotnet tool restore
cd ax
apax install -L
apax install
apax build
axcode .
axcode -g ..\README.md:0
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"OutputProjectFolder":"ix","UseBase":false}
{"OutputProjectFolder":"ix","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"ix_integration_plc.csproj"}
2 changes: 1 addition & 1 deletion src/sanbox/integration/ix-integration-plc/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ scripts:
echo "Environment variable AXTARGET not defined!!!"
fi
do-it-all:
- apax install -L
- apax install
- apax build
- apax check+download

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"Id":"ix_integration_plc","Version":"0.0.0"}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"OutputProjectFolder":"..\\integrated.twin","UseBase":false}
{"OutputProjectFolder":"..\\integrated.twin","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"integrated.csproj"}
2 changes: 1 addition & 1 deletion src/tests.integrations/integrated/src/ax/apax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ scripts:
..\\..\\..\\..\\AXSharp.compiler\\src\\ixc\\AXSharp.ixc.csproj --framework
net7.0
download:
- apax install -L
- 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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"Id":"integrated","Version":"0.0.0"}

0 comments on commit ad72d25

Please sign in to comment.