Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Eclipse Licence adjustments #230

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Eclipse Licence adjustments #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b16a415
bumped version of Aml.Engine to 3.2.1
AlexanderWollbrink Jul 12, 2024
61076fc
removing opc related nugets
AlexanderWollbrink Jul 12, 2024
918b526
remove AasxPluginUaNetServer
AlexanderWollbrink Jul 12, 2024
6dfa006
remove AasxPluginUaNetClient
AlexanderWollbrink Jul 12, 2024
6bcc6d2
remove AasxUaNetServer
AlexanderWollbrink Jul 12, 2024
2d5396a
remove AasxUaNetConsoleServer
AlexanderWollbrink Jul 12, 2024
74541b6
remove AasxRestConsoleServer
AlexanderWollbrink Jul 12, 2024
c8fc647
remove AasxRestServerLibrary
AlexanderWollbrink Jul 12, 2024
4459782
remove WpfMtpControl
AlexanderWollbrink Jul 12, 2024
084ecb6
WpfMtpVisuViewer.csproj
AlexanderWollbrink Jul 12, 2024
b3fa722
remove AasxPluginMtpViewer
AlexanderWollbrink Jul 12, 2024
1a12f9a
removed OPC UA from Server menu
AlexanderWollbrink Aug 11, 2024
0a420c4
removing OPC UA Client entries from menu
AlexanderWollbrink Aug 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added src/.DS_Store
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/AasxAmlImExport/AasxAmlImExport.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
</PropertyGroup>
<ItemGroup>
<Using Include="AasCore.Aas3_0"/>
<Using Include="AasCore.Aas3_0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AasxIntegrationBase\AasxIntegrationBase.csproj" />
Expand All @@ -15,7 +15,7 @@
<EmbeddedResource Include="Resources\AssetAdministrationShellLib.aml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Aml.Engine" Version="2.0.9" />
<PackageReference Include="Aml.Engine" Version="3.2.1" />
<PackageReference Include="dotNetRDF" Version="2.7.5" />
</ItemGroup>
</Project>
326 changes: 2 additions & 324 deletions src/AasxPackageExplorer.sln
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions src/AasxPackageLogic/ExplorerMenuFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public static AasxMenu CreateMainMenu()
.AddSeparator()
.AddMenu(header: "Further connect options …", childs: (new AasxMenu())
.AddWpfBlazor(name: "ConnectSecure", header: "Secure Connect …", inputGesture: "Ctrl+Shift+S")
.AddWpfBlazor(name: "ConnectOpcUa", header: "Connect via OPC-UA …")
//.AddWpfBlazor(name: "ConnectOpcUa", header: "Connect via OPC-UA …")
.AddWpfBlazor(name: "ConnectRest", header: "Connect via REST …", inputGesture: "F6"))
.AddSeparator()
.AddMenu(header: "AASX File Repository …", childs: (new AasxMenu())
Expand Down Expand Up @@ -158,8 +158,8 @@ public static AasxMenu CreateMainMenu()
help: "Import OPC UA nodeset.xml into an existing Submodel.",
args: new AasxMenuListOfArgDefs()
.Add("File", "OPC UA Nodeset file."))
.AddWpfBlazor(name: "OPCRead", header: "Read OPC values into SubModel …",
help: "Use Qualifiers attributed in a Submodel to read actual OPC UA values.")
/*.AddWpfBlazor(name: "OPCRead", header: "Read OPC values into SubModel …",
help: "Use Qualifiers attributed in a Submodel to read actual OPC UA values.")*/
.AddWpfBlazor(name: "RDFRead", header: "Import BAMM RDF into AASX …",
help: "Import BAMM RDF into AASX.",
args: new AasxMenuListOfArgDefs()
Expand Down Expand Up @@ -195,13 +195,13 @@ public static AasxMenu CreateMainMenu()
args: new AasxMenuListOfArgDefs()
.Add("File", "OPC UA Nodeset2.xml file to write.")
.Add("Location", "Location selection", hidden: true))
.AddWpfBlazor(name: "OpcUaExportNodeSetUaPlugin",
/*.AddWpfBlazor(name: "OpcUaExportNodeSetUaPlugin",
header: "Export OPC UA Nodeset2.xml (via UA server plug-in) …",
help: "Export OPC UA Nodeset2.xml format by starting OPC UA server in plugin and " +
"execute a post-process command.",
args: new AasxMenuListOfArgDefs()
.Add("File", "OPC UA Nodeset2.xml file to write.")
.Add("Location", "Location selection", hidden: true))
.Add("Location", "Location selection", hidden: true))*/
.AddWpfBlazor(name: "CopyClipboardElementJson",
header: "Copy selected element JSON to clipboard", inputGesture: "Shift+Ctrl+C")
.AddWpfBlazor(name: "ExportGenericForms",
Expand Down Expand Up @@ -233,7 +233,7 @@ public static AasxMenu CreateMainMenu()
.AddWpf(name: "MQTTPub", header: "Publish AAS via MQTT …")
.AddSeparator()
.AddWpf(name: "ServerPluginEmptySample", header: "Plugin: Empty Sample …")
.AddWpf(name: "ServerPluginOPCUA", header: "Plugin: OPC UA …")
//.AddWpf(name: "ServerPluginOPCUA", header: "Plugin: OPC UA …")
.AddWpf(name: "ServerPluginMQTT", header: "Plugin: MQTT …"))
.AddSeparator(filter: AasxMenuFilter.NotBlazor)
.AddMenu(header: "System …", filter: AasxMenuFilter.NotBlazor,
Expand Down
41 changes: 0 additions & 41 deletions src/AasxPluginMtpViewer/AasxPluginMtpViewer.csproj
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions src/AasxPluginMtpViewer/AasxPluginMtpViewer.options.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/AasxPluginMtpViewer/AasxPluginMtpViewer.plugin
View file
Open in desktop

This file was deleted.

Loading
Loading