Skip to content

Commit

Permalink
[UPDATE] Update to AX# v0.14.0-alpha.115 (#141)
Browse files Browse the repository at this point in the history 
* updates to AX# v0.14.0-alpha.115
---------

Co-authored-by: PTKu <PTKu@users.noreply.github.com>
Co-authored-by: PTKu <61538034+PTKu@users.noreply.github.com>
  • Loading branch information
@IX-BOT @PTKu
3 people authored Jul 25, 2023
1 parent d610a1c commit 507c4fd
Show file tree
Hide file tree
Showing 22 changed files with 28 additions and 34 deletions.
4 changes: 2 additions & 2 deletions src/abstractions/src/AXOpen.Abstractions/ix_ax_axopen_abstractions.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.115" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.115" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/base/src/AXOpen.Base.Abstractions/AXOpen.Base.Abstractions.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.7" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.115" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/core/src/AXOpen.Core.Blazor/axopen_core_blazor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="AXSharp.Presentation.Blazor" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Presentation.Blazor.Controls" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Presentation.Blazor" Version="0.14.0-alpha.115" />
<PackageReference Include="AXSharp.Presentation.Blazor.Controls" Version="0.14.0-alpha.115" />
<PackageReference Include="Humanizer" Version="2.14.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.3" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.8" />
Expand Down
4 changes: 2 additions & 2 deletions src/core/src/AXOpen.Core/ix_ax_axopen_core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.115" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.115" />
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
1 change: 0 additions & 1 deletion src/data/src/AXOpen.Data/DataExchange/AxoDataExchange.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
using System.Reflection;
using System.Security.Claims;
using AXOpen.Base.Data;
using AXSharp.Abstractions.Dialogs.AlertDialog;
using AXSharp.Connector;
using static System.Runtime.InteropServices.JavaScript.JSType;

Expand Down
4 changes: 2 additions & 2 deletions src/data/src/AXOpen.Data/ix_ax_axopen_data.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.115" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.115" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/integrations/src/AXOpen.Integrations.Blazor/Pages/FetchData.razor
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@page "/fetchdata"
@using AXSharp.Abstractions.Dialogs.AlertDialog;
@*@using AXSharp.Presentation.Blazor.Controls.Dialogs.AlertDialog;*@
@using axopen_integrations_blazor.Data
@using AXOpen.Base.Dialogs
@inject IAlertDialogService DialogService
@inject WeatherForecastService ForecastService

Expand Down Expand Up @@ -53,6 +53,6 @@ else

public void CreateToast()
{
DialogService.AddAlertDialog("Success", "Test", "test", 30);
DialogService.AddAlertDialog(eAlertDialogType.Success, "Test", "test", 30);
}
}
1 change: 0 additions & 1 deletion src/integrations/src/AXOpen.Integrations.Blazor/Pages/Index.razor
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@page "/"
@using AXSharp.Abstractions.Dialogs.AlertDialog;
@*@using AXSharp.Presentation.Blazor.Controls.Dialogs.AlertDialog;*@
@*@inject IAlertDialogService DialogService*@

Expand Down
2 changes: 0 additions & 2 deletions src/integrations/src/AXOpen.Integrations.Blazor/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
using Microsoft.AspNetCore.Components.Web;
using Pocos.IntegrationAxoDataFramentsExchange;
using Serilog;
//using AXSharp.Presentation.Blazor.Controls.Dialogs.AlertDialog;
using AXSharp.Abstractions.Dialogs.AlertDialog;

namespace axopen_integrations_blazor
{
Expand Down
2 changes: 1 addition & 1 deletion src/integrations/src/AXOpen.Integrations.Blazor/VMTestView/VMTestServiceView.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

public void CreateToast()
{
AlertDialogService.AddAlertDialog("Success", "Test", "test", 30);
//AlertDialogService.AddAlertDialog("Success", "Test", "test", 30);
//_toastService.AddToast("Success", "Test", "test", 30);
}

Expand Down
2 changes: 1 addition & 1 deletion src/integrations/src/AXOpen.Integrations.Blazor/axopen_integrations_blazor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="AXSharp.Presentation.Blazor.Controls" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Presentation.Blazor.Controls" Version="0.14.0-alpha.115" />
</ItemGroup>
<!--REF_PCKG_END-->
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/integrations/src/AXOpen.Integrations/axopen_integrations.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.115" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.115" />
<PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.14.0-alpha.115" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/integrations/tests/AXOpen.Integration.Data.Blazor.Tests/AxoDataViewModelTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using AXOpen.Data;
using AXSharp.Connector;
using AXOpen.Data.InMemory;
using AXSharp.Abstractions.Dialogs.AlertDialog;


namespace integration.data.blazor.tests
{
Expand Down
4 changes: 2 additions & 2 deletions src/probers/src/AXOpen.Probers/ix_ax_axopen_probers.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.115" />
<PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.14.0-alpha.115" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/probers/tests/AXOpen.Probers.Tests/axopen_probers_tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.14.0-alpha.115" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion src/security/src/AXOpen.Security.Blazor/AXOpen.Security.Blazor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.115" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.5" />
Expand Down
1 change: 0 additions & 1 deletion src/templates.simple/axosimple.app/Pages/UI/ManipulatorExample2.razor
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@page "/ui/ManipulatorExample2"
@using AXOpen.Core.Blazor.AxoDialogs;
@using AXOpen.Core.Blazor.Dialogs
@using AXSharp.Abstractions.Dialogs.AlertDialog;
@using axosimple.hmi.Components;
@using AXOpen.Data;
@using AXOpen.Messaging.Static
Expand Down
1 change: 0 additions & 1 deletion src/templates.simple/axosimple.app/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Identity;
using Serilog;
using AXSharp.Abstractions.Dialogs.AlertDialog;
using System.Security.Principal;
using AXOpen.Core;
using AXOpen.Core.Blazor.AxoDialogs.Hubs;
Expand Down
2 changes: 1 addition & 1 deletion src/templates.simple/axosimple.twin/Entry.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace axosimple
{
public static class Entry
{
private const string TargetIp = "172.20.30.110"; // <- replace by your IP
private const string TargetIp = "10.10.10.100"; // <- replace by your IP
private const string UserName = "Everybody"; //<- replace by user name you have set up in your WebAPI settings
private const string Pass = ""; // <- Pass in the password that you have set up for the user. NOT AS PLAIN TEXT! Use user secrets instead.
private const bool IgnoreSslErrors = true; // <- When you have your certificates in order set this to false.
Expand Down
6 changes: 3 additions & 3 deletions src/templates.simple/axosimple.twin/axosimple.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.115" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.115" />
<PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.14.0-alpha.115" />
</ItemGroup>
<ItemGroup>
<Compile Include=".g\**" />
Expand Down
2 changes: 1 addition & 1 deletion src/templates.simple/ctrl/apax.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ scripts:
- 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 172.20.30.110 -i .\\bin\\plcsim\\
- apax sld --accept-security-disclaimer -t 10.10.10.100 -i .\\bin\\plcsim\\
-r --default-server-interface
4 changes: 2 additions & 2 deletions src/utils/src/AXOpen.Utils/ix_ax_axopen_utils.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.112" />
<PackageReference Include="AXSharp.Abstractions" Version="0.14.0-alpha.115" />
<PackageReference Include="AXSharp.Connector" Version="0.14.0-alpha.115" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 507c4fd

Please sign in to comment.