diff --git a/src/abstractions/src/AXOpen.Abstractions/ix_ax_axopen_abstractions.csproj b/src/abstractions/src/AXOpen.Abstractions/ix_ax_axopen_abstractions.csproj index b258cde01..683757b3f 100644 --- a/src/abstractions/src/AXOpen.Abstractions/ix_ax_axopen_abstractions.csproj +++ b/src/abstractions/src/AXOpen.Abstractions/ix_ax_axopen_abstractions.csproj @@ -12,8 +12,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/base/src/AXOpen.Base.Abstractions/AXOpen.Base.Abstractions.csproj b/src/base/src/AXOpen.Base.Abstractions/AXOpen.Base.Abstractions.csproj index 1d4f603e2..5c55699c0 100644 --- a/src/base/src/AXOpen.Base.Abstractions/AXOpen.Base.Abstractions.csproj +++ b/src/base/src/AXOpen.Base.Abstractions/AXOpen.Base.Abstractions.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/core/src/AXOpen.Core.Blazor/axopen_core_blazor.csproj b/src/core/src/AXOpen.Core.Blazor/axopen_core_blazor.csproj index 142deb44f..5bb507618 100644 --- a/src/core/src/AXOpen.Core.Blazor/axopen_core_blazor.csproj +++ b/src/core/src/AXOpen.Core.Blazor/axopen_core_blazor.csproj @@ -22,8 +22,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/core/src/AXOpen.Core/ix_ax_axopen_core.csproj b/src/core/src/AXOpen.Core/ix_ax_axopen_core.csproj index 44537bdf7..c47fb021f 100644 --- a/src/core/src/AXOpen.Core/ix_ax_axopen_core.csproj +++ b/src/core/src/AXOpen.Core/ix_ax_axopen_core.csproj @@ -8,8 +8,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/data/src/AXOpen.Data/DataExchange/AxoDataExchange.cs b/src/data/src/AXOpen.Data/DataExchange/AxoDataExchange.cs index c263720fa..d483f6498 100644 --- a/src/data/src/AXOpen.Data/DataExchange/AxoDataExchange.cs +++ b/src/data/src/AXOpen.Data/DataExchange/AxoDataExchange.cs @@ -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; diff --git a/src/data/src/AXOpen.Data/ix_ax_axopen_data.csproj b/src/data/src/AXOpen.Data/ix_ax_axopen_data.csproj index 8b3501c4b..36b79fb69 100644 --- a/src/data/src/AXOpen.Data/ix_ax_axopen_data.csproj +++ b/src/data/src/AXOpen.Data/ix_ax_axopen_data.csproj @@ -12,8 +12,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/integrations/src/AXOpen.Integrations.Blazor/Pages/FetchData.razor b/src/integrations/src/AXOpen.Integrations.Blazor/Pages/FetchData.razor index 8a8eb2b1b..b2cb5b8b6 100644 --- a/src/integrations/src/AXOpen.Integrations.Blazor/Pages/FetchData.razor +++ b/src/integrations/src/AXOpen.Integrations.Blazor/Pages/FetchData.razor @@ -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 @@ -53,6 +53,6 @@ else public void CreateToast() { - DialogService.AddAlertDialog("Success", "Test", "test", 30); + DialogService.AddAlertDialog(eAlertDialogType.Success, "Test", "test", 30); } } diff --git a/src/integrations/src/AXOpen.Integrations.Blazor/Pages/Index.razor b/src/integrations/src/AXOpen.Integrations.Blazor/Pages/Index.razor index 1dcc3ad95..5803b3717 100644 --- a/src/integrations/src/AXOpen.Integrations.Blazor/Pages/Index.razor +++ b/src/integrations/src/AXOpen.Integrations.Blazor/Pages/Index.razor @@ -1,5 +1,4 @@ @page "/" -@using AXSharp.Abstractions.Dialogs.AlertDialog; @*@using AXSharp.Presentation.Blazor.Controls.Dialogs.AlertDialog;*@ @*@inject IAlertDialogService DialogService*@ diff --git a/src/integrations/src/AXOpen.Integrations.Blazor/Program.cs b/src/integrations/src/AXOpen.Integrations.Blazor/Program.cs index 306d1a00b..9449287cd 100644 --- a/src/integrations/src/AXOpen.Integrations.Blazor/Program.cs +++ b/src/integrations/src/AXOpen.Integrations.Blazor/Program.cs @@ -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 { diff --git a/src/integrations/src/AXOpen.Integrations.Blazor/VMTestView/VMTestServiceView.razor b/src/integrations/src/AXOpen.Integrations.Blazor/VMTestView/VMTestServiceView.razor index 8fa40616d..1e5385399 100644 --- a/src/integrations/src/AXOpen.Integrations.Blazor/VMTestView/VMTestServiceView.razor +++ b/src/integrations/src/AXOpen.Integrations.Blazor/VMTestView/VMTestServiceView.razor @@ -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); } diff --git a/src/integrations/src/AXOpen.Integrations.Blazor/axopen_integrations_blazor.csproj b/src/integrations/src/AXOpen.Integrations.Blazor/axopen_integrations_blazor.csproj index 4fa53b83d..f8227f944 100644 --- a/src/integrations/src/AXOpen.Integrations.Blazor/axopen_integrations_blazor.csproj +++ b/src/integrations/src/AXOpen.Integrations.Blazor/axopen_integrations_blazor.csproj @@ -38,7 +38,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/integrations/src/AXOpen.Integrations/axopen_integrations.csproj b/src/integrations/src/AXOpen.Integrations/axopen_integrations.csproj index 6f12ece2a..ad93e0bb4 100644 --- a/src/integrations/src/AXOpen.Integrations/axopen_integrations.csproj +++ b/src/integrations/src/AXOpen.Integrations/axopen_integrations.csproj @@ -10,9 +10,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/src/integrations/tests/AXOpen.Integration.Data.Blazor.Tests/AxoDataViewModelTests.cs b/src/integrations/tests/AXOpen.Integration.Data.Blazor.Tests/AxoDataViewModelTests.cs index 70d11d219..e82260e69 100644 --- a/src/integrations/tests/AXOpen.Integration.Data.Blazor.Tests/AxoDataViewModelTests.cs +++ b/src/integrations/tests/AXOpen.Integration.Data.Blazor.Tests/AxoDataViewModelTests.cs @@ -4,7 +4,7 @@ using AXOpen.Data; using AXSharp.Connector; using AXOpen.Data.InMemory; -using AXSharp.Abstractions.Dialogs.AlertDialog; + namespace integration.data.blazor.tests { diff --git a/src/probers/src/AXOpen.Probers/ix_ax_axopen_probers.csproj b/src/probers/src/AXOpen.Probers/ix_ax_axopen_probers.csproj index 6217335d3..eb57ac7be 100644 --- a/src/probers/src/AXOpen.Probers/ix_ax_axopen_probers.csproj +++ b/src/probers/src/AXOpen.Probers/ix_ax_axopen_probers.csproj @@ -12,8 +12,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/probers/tests/AXOpen.Probers.Tests/axopen_probers_tests.csproj b/src/probers/tests/AXOpen.Probers.Tests/axopen_probers_tests.csproj index 8a2505622..c7b302501 100644 --- a/src/probers/tests/AXOpen.Probers.Tests/axopen_probers_tests.csproj +++ b/src/probers/tests/AXOpen.Probers.Tests/axopen_probers_tests.csproj @@ -27,7 +27,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/security/src/AXOpen.Security.Blazor/AXOpen.Security.Blazor.csproj b/src/security/src/AXOpen.Security.Blazor/AXOpen.Security.Blazor.csproj index de1f0565c..9df25b621 100644 --- a/src/security/src/AXOpen.Security.Blazor/AXOpen.Security.Blazor.csproj +++ b/src/security/src/AXOpen.Security.Blazor/AXOpen.Security.Blazor.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/templates.simple/axosimple.app/Pages/UI/ManipulatorExample2.razor b/src/templates.simple/axosimple.app/Pages/UI/ManipulatorExample2.razor index 571ee0938..b12f2c1e3 100644 --- a/src/templates.simple/axosimple.app/Pages/UI/ManipulatorExample2.razor +++ b/src/templates.simple/axosimple.app/Pages/UI/ManipulatorExample2.razor @@ -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 diff --git a/src/templates.simple/axosimple.app/Program.cs b/src/templates.simple/axosimple.app/Program.cs index 2d396d619..64cba2b16 100644 --- a/src/templates.simple/axosimple.app/Program.cs +++ b/src/templates.simple/axosimple.app/Program.cs @@ -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; diff --git a/src/templates.simple/axosimple.twin/Entry.cs b/src/templates.simple/axosimple.twin/Entry.cs index 7b74a40cd..84794064b 100644 --- a/src/templates.simple/axosimple.twin/Entry.cs +++ b/src/templates.simple/axosimple.twin/Entry.cs @@ -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. diff --git a/src/templates.simple/axosimple.twin/axosimple.csproj b/src/templates.simple/axosimple.twin/axosimple.csproj index 40c351b54..0d8245157 100644 --- a/src/templates.simple/axosimple.twin/axosimple.csproj +++ b/src/templates.simple/axosimple.twin/axosimple.csproj @@ -5,9 +5,9 @@ enable - - - + + + diff --git a/src/templates.simple/ctrl/apax.yml b/src/templates.simple/ctrl/apax.yml index 4ab71c1fb..8c35d6354 100644 --- a/src/templates.simple/ctrl/apax.yml +++ b/src/templates.simple/ctrl/apax.yml @@ -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 diff --git a/src/utils/src/AXOpen.Utils/ix_ax_axopen_utils.csproj b/src/utils/src/AXOpen.Utils/ix_ax_axopen_utils.csproj index fd77f41a0..8c3e27d7c 100644 --- a/src/utils/src/AXOpen.Utils/ix_ax_axopen_utils.csproj +++ b/src/utils/src/AXOpen.Utils/ix_ax_axopen_utils.csproj @@ -12,8 +12,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + +