[NEW-FEATURE] Update to apax 2.0.0 (#246)

IX-BOT · PTKu · web-flow · commit ad72d25c341d · 2023-10-10T06:45:59.000+02:00
* 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>
diff --git a/cake/BuildContext.cs b/cake/BuildContext.cs
@@ -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,
diff --git a/cake/Program.cs b/cake/Program.cs
@@ -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,
diff --git a/src/AXSharp.blazor/tests/sandbox/ax-blazor-example/AXSharp.config.json b/src/AXSharp.blazor/tests/sandbox/ax-blazor-example/AXSharp.config.json
@@ -1 +1 @@
-{"OutputProjectFolder":"ix","UseBase":false}
+{"OutputProjectFolder":"ix","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"ax_blazor_example.csproj"}
diff --git a/src/AXSharp.blazor/tests/sandbox/ax-blazor-example/axsharp.companion.json b/src/AXSharp.blazor/tests/sandbox/ax-blazor-example/axsharp.companion.json
@@ -0,0 +1 @@
+{"Id":"ax_blazor_example","Version":"0.0.0"}
diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs
@@ -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>
@@ -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>";
 
diff --git a/src/AXSharp.compiler/src/ixd/tests/samples/ax/apax.yml b/src/AXSharp.compiler/src/ixd/tests/samples/ax/apax.yml
@@ -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
 
diff --git a/src/AXSharp.compiler/src/ixr/tests/samples/ax/apax.yml b/src/AXSharp.compiler/src/ixr/tests/samples/ax/apax.yml
@@ -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
 
diff --git a/src/AXSharp.connectors/tests/ax-test-project/AXSharp.config.json b/src/AXSharp.connectors/tests/ax-test-project/AXSharp.config.json
@@ -1 +1 @@
-{"OutputProjectFolder":"ix","UseBase":false}
+{"OutputProjectFolder":"ix","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"ax_test_project.csproj"}
diff --git a/src/AXSharp.connectors/tests/ax-test-project/axsharp.companion.json b/src/AXSharp.connectors/tests/ax-test-project/axsharp.companion.json
@@ -0,0 +1 @@
+{"Id":"ax_test_project","Version":"0.0.0"}
diff --git a/src/AXSharp.connectors/tests/ax-test-project/go.ps1 b/src/AXSharp.connectors/tests/ax-test-project/go.ps1
@@ -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
diff --git a/src/AXSharp.examples/hello.world.console/hello.world.console.plc/AXSharp.config.json b/src/AXSharp.examples/hello.world.console/hello.world.console.plc/AXSharp.config.json
@@ -1 +1 @@
-{"OutputProjectFolder":"ix","UseBase":false}
+{"OutputProjectFolder":"ix","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"hello_world_console_plc.csproj"}
diff --git a/src/AXSharp.examples/hello.world.console/hello.world.console.plc/axsharp.companion.json b/src/AXSharp.examples/hello.world.console/hello.world.console.plc/axsharp.companion.json
@@ -0,0 +1 @@
+{"Id":"hello_world_console_plc","Version":"0.0.0"}
diff --git a/src/AXSharp.examples/hello.world.console/hello.world.console.plc/run.ps1 b/src/AXSharp.examples/hello.world.console/hello.world.console.plc/run.ps1
@@ -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
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/apax.yml b/src/AXSharp.templates/working/templates/axsharpblazor/ax/apax.yml
@@ -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      
diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/install.ps1 b/src/AXSharp.templates/working/templates/axsharpblazor/install.ps1
@@ -1,6 +1,6 @@
 dotnet tool restore
 cd ax
-apax install -L
+apax install
 apax build
 axcode .
 axcode -g ..\README.md:0
diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/install.ps1 b/src/AXSharp.templates/working/templates/axsharpconsole/install.ps1
@@ -1,6 +1,6 @@
 dotnet tool restore
 cd ax
-apax install -L
+apax install
 apax build
 axcode .
 axcode -g ..\README.md:0
diff --git a/src/sanbox/integration/ix-integration-plc/AXSharp.config.json b/src/sanbox/integration/ix-integration-plc/AXSharp.config.json
@@ -1 +1 @@
-{"OutputProjectFolder":"ix","UseBase":false}
+{"OutputProjectFolder":"ix","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"ix_integration_plc.csproj"}
diff --git a/src/sanbox/integration/ix-integration-plc/apax.yml b/src/sanbox/integration/ix-integration-plc/apax.yml
@@ -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
 
diff --git a/src/sanbox/integration/ix-integration-plc/axsharp.companion.json b/src/sanbox/integration/ix-integration-plc/axsharp.companion.json
@@ -0,0 +1 @@
+{"Id":"ix_integration_plc","Version":"0.0.0"}
diff --git a/src/tests.integrations/integrated/src/ax/AXSharp.config.json b/src/tests.integrations/integrated/src/ax/AXSharp.config.json
@@ -1 +1 @@
-{"OutputProjectFolder":"..\\integrated.twin","UseBase":false}
+{"OutputProjectFolder":"..\\integrated.twin","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"integrated.csproj"}
diff --git a/src/tests.integrations/integrated/src/ax/apax.yml b/src/tests.integrations/integrated/src/ax/apax.yml
@@ -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      
diff --git a/src/tests.integrations/integrated/src/ax/axsharp.companion.json b/src/tests.integrations/integrated/src/ax/axsharp.companion.json
@@ -0,0 +1 @@
+{"Id":"integrated","Version":"0.0.0"}

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public void UploadTestPlc(string workingDirectory, string targetIp,`
`100`	`100`
`101`	`101`	`this.ProcessRunner.Start(Helpers.GetApaxCommand(), new ProcessSettings()`
`102`	`102`	`{`
`103`		`- Arguments = " install -L",`
	`103`	`+ Arguments = " install",`
`104`	`104`	`WorkingDirectory = workingDirectory,`
`105`	`105`	`RedirectStandardOutput = false,`
`106`	`106`	`RedirectStandardError = false,`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ private static void ProvisionProjectWideTools(BuildContext context)`
`96`	`96`
`97`	`97`	`context.ProcessRunner.Start(Helpers.GetApaxCommand(), new Cake.Core.IO.ProcessSettings()`
`98`	`98`	`{`
`99`		`- Arguments = $" install -L -c",`
	`99`	`+ Arguments = $" install -c",`
`100`	`100`	`WorkingDirectory = Path.Combine(context.ScrDir, "apax"),`
`101`	`101`	`RedirectStandardOutput = false,`
`102`	`102`	`RedirectStandardError = false,`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"OutputProjectFolder":"ix","UseBase":false}`
	`1`	`+{"OutputProjectFolder":"ix","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"ax_blazor_example.csproj"}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"Id":"ax_blazor_example","Version":"0.0.0"}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"Id":"ax_test_project","Version":"0.0.0"}`