From 877397bee2ce5693c09642eb0f1a67952cee51cf Mon Sep 17 00:00:00 2001 From: Marta <84308731+martafullen@users.noreply.github.com> Date: Mon, 2 Sep 2024 08:51:47 +0200 Subject: [PATCH] Package Adjustments (#244) * bump version of JetBrains * bumped JetBrains.Annotations to 2024.2.0 * bumping version of Scottie * bumping CefSharp.Common.NETCore to 117.2.20 * removing CountryFlag and its functionality * bumping Microsoft.Windows.Compatibility bumping Magick.NET * bumping System.IdentityModel.Tokens.Jwt * Bumped Microsoft.AspNetCore.Components and Microsoft.AspNetCore.Components.Web as well as their dependencies to 6.0.33 (last release for dotnet6, no vulnerabilities) * bumping Avalon * *remove AasxPluginUaNetServer folder * Features and fixes: SAMM, IEC61360, AsciiDoc, Fixes, no empty lists, package format (#217) * * progress * * more working * * background worker for OPC UA client is difficult .. * * opc ua working ok w/ subscriptions * * introduce update freq and polling time * * menu actions for background operation * * need improve predef export * * update * * some updates * * update * introduce plugin for product change notifications * export AsciiDoc * * update after switch origins * * update again * * small update to generic object mapper * * update * * mapping of PCN working * * PCN panel navigate buttons * * not the best attempt for PCN display * * update * * start refactor predefined concepts * * after refactor of predefined concepts * * update markdown * * updates * plugin PCN feature complete * fixing issues with SmdExporter * * update before refactor showContent * * import of PCN XML * start serialize AAS elements from mapped classes * * update * serialize C# to AAS classes works w/ small design flaws. More work required., * * improvment SMT export * * issue #152 * * update * * some fixes for AID; however to be replaced by new branch from Siemens team * fix for OPC format (might be depulicate with fixes in other branches?!) * * working on issue 193 * * fix issue #193 * see notes there for detail * changed behaviour in FormInstance.cs:1203 * * improvement for issue # 170 * * fix issue # 33 * export generic forms with idShort Preset "{00} * * fix issue # 30 * * fix issue # 23 * * fix issue # 10 (duplicate) * * fix issue # 112 * table import should work again * * fix issue # 112 * table import semanticIds with gGlobalReference * * fix issue # 196 * bug: wrong URI for data specification * * quick fix for issue # 174 * * some bugfixes * * bug fix for new Spec for Package format * * test * * update * * update * * updates * * update * * after merge with main * * try fixing mix of main and this branch w.r.t. to package management * Update README.md Updated the links and badges * Update README.md Updated the links and badges * Update README.md Updated the links and badges * * fixes to SaveAs... * * intermediate save * * continue softening empty lists (supplSemId, Qualifiers, Extensions) * Create Contributors.md * update contributors and companies * Add contributors links to other information files * Fix minor issue with OperationVariable * Instantiate submodel list * *fix for supplementary files not appearing (#219) * * update * * continue avoid empty list * polish Operation * * polish RefElelem, RelElem * * polish SME * * various updates * fix order of paste into * Note: sequence of selection does matter * * fixes to package saving * * update before changing Submodels management * * update edinting of potentially null lists * * refacture Env.Submodels, AAS, CDs, AAS.Submodels to have accessor-methods in super-ordinate entities to provide empty-list / null - behaviour. * * update before going to SMC null / empty list challenged * * update * * update * * fixes w.r.t. to the AsciiDoc generation * Set Submodel/Kind as per action (#225) * Fixes the issue 226 (#228) * * updates for product change notifications * use more preferred name than short names from CDs * refactor use of Aas.IEnvironment instead Aas.Environment * * add PCN plugin to release * * again: build script * * improve BOM plugin functionality * * remove MsAglControl * right-click menu * * wasted another 2h in trying to export SVG. Very unsatisfying MSAGL lib!! * * options for suppl. semanticIds * * finalize BOM editing * * try change to new OPC UA client library * * resolve merge duplicated * * add SMT HierStruct V1.1 * fix BOM plugin * * migrate (copy) new OPC UA lib to MTP * basically running * * ported antique Read OPC values into Submodel to ne OPC UA client lib * * remove OPCF client references * * remove OPCF UA server * remove BlazorUI (not BlazorExplorer) * remove AasxCsharpLib_bkp * * remove superfluous Opc.Ua.SampleClient.Config.xml * * remove menu commands for OPC UA server * * improve scripting for integration testing * Fix for the issue 235 (#236) * * a little scripting for testing * Fix for GitHub Issue 201 * Instantiate Submodel List * * work on empty list for CDs * find statistics fixed * * small fixes * Instantiate list of CDs * Support for AID and AIMC Submodel Templates (#211) * A commit for AID and AIMC implementations This commit combines all implementation based on AID and AIMC. AASXPluginAID is for AID and AASXPluginAssetInterfaceDesc is majorly for AIMC. * some newlines added for code readability * * remove Lucene.Net * Revert "Support for AID and AIMC Submodel Templates (#211)" (#243) This reverts commit 51d719269edc3f7fcbfdad03870773a295f1b01a. * Update README.md * * update binary files changed by CR/LF flasg * fix bugs in predefined data * show AAS/thumbnail * * initial tinkering * * more SAMM models * CD sort order structured * box icons * * more SAMM details * editing * import TTL * * first SAMM ttl imported * * colorize Characteristics * * before refactoring becaus of anonymous instances * * de-serialize and combo box of enum types in Constraints * * editing of constraints * * temporary stage * * SAMM import extended * SAMM export to Turtle works initally * * more export * rework import * edit preferred names * create Submodel instance * * multiple SAMM versions * creat SM instance * * adding Qualifiers to the Samm SM instance creation * * update * * SMT value validation in 1st degree in UI * * checking based on CDs works first time * * fix SMT organizes * add SMT elements * working on add SAMM * * just update * * update * * create Submodel from SMT/SAMM CDs * * update sources * * update sources * * load repositories resident to find CDs for SAMM/ SMT * * bug fixes * * bugfix menu * * have Cardinality for SME but put it in Organizes as well * Add documentation (#670) (#671) Documentation is added including background information on SAMM and ESMF + Step by Step documentation how to guide Submodel creation via an aspect model. * * bug fix for SM Documents in some cases * Add new chapters to documentation (#675) * Add documentation (#670) Documentation is added including background information on SAMM and ESMF + Step by Step documentation how to guide Submodel creation via an aspect model. * Add new chapters to documentation (#674) * add documentation to src/AASxCore_Samm2_2_0 * add link to source of Movement.ttl example used in document * Add new chapter "Edit new SAMM aspect model" and new chapter "Background on Implementation" explaining data specifications and extensions * * small enhancements of guidance * Update docu with SMT-attribute-set extensions (#683) * Delete src/AasxCore.Samm2_2_0/docs directory Directory will be renamed to "documentation" * Create folder "documentation" file temp.txt will be removed later * Extend Documentation with SMT-attribute-Extensions Documentation updated, common parts extracted. SAMM and SMT-attribute extensions described * Delete src/AasxCore.Samm2_2_0/documentation/temp.txt was only created for creating a folder * Create temp.txt * Createfolder examples * Delete src/AasxCore.Samm2_2_0/documentation/src/temp.txt was for creating folder only * Add examples aasx and ttl Examples added that are used in documentation * Delete src/AasxCore.Samm2_2_0/documentation/examples/temp.txt was created to create folder only * Create folder src * Upload figures Figures for documentation added * fix table format in Annex Annex SMT Attributes Sets: fix table * Fix table of content Table of content did not match with chapter structure. * * temp commit * * issue with compiling * * .suo file was defect * * modbus v0.1 working * * HTTP and Modbus * * investigate dll error for MQTT * * continous run for http 1st gen * * first steps in async * * progress * * more working * * background worker for OPC UA client is difficult .. * * opc ua working ok w/ subscriptions * * introduce update freq and polling time * * menu actions for background operation * * need improve predef export * * update * * some updates * * update * introduce plugin for product change notifications * export AsciiDoc * * update after switch origins * * update again * * small update to generic object mapper * * update * * mapping of PCN working * * PCN panel navigate buttons * * not the best attempt for PCN display * * update * * start refactor predefined concepts * * after refactor of predefined concepts * * update markdown * * update before refactor showContent * * updates * plugin PCN feature complete * fixing issues with SmdExporter * * import of PCN XML * start serialize AAS elements from mapped classes * * update * serialize C# to AAS classes works w/ small design flaws. More work required., * * improvment SMT export * * issue #152 * * update * * some fixes for AID; however to be replaced by new branch from Siemens team * fix for OPC format (might be depulicate with fixes in other branches?!) * * working on issue 193 * * fix issue #193 * see notes there for detail * changed behaviour in FormInstance.cs:1203 * * improvement for issue # 170 * * fix issue # 33 * export generic forms with idShort Preset "{00} * * fix issue # 30 * * fix issue # 23 * * fix issue # 10 (duplicate) * * fix issue # 112 * table import should work again * * fix issue # 112 * table import semanticIds with gGlobalReference * * fix issue # 196 * bug: wrong URI for data specification * * quick fix for issue # 174 * * some bugfixes * * bug fix for new Spec for Package format * * update * * test * * update * * updates * * update * * after merge with main * * try fixing mix of main and this branch w.r.t. to package management * * fixes to SaveAs... * * intermediate save * * continue softening empty lists (supplSemId, Qualifiers, Extensions) * * update * * continue avoid empty list * polish Operation * * polish RefElelem, RelElem * * polish SME * * various updates * fix order of paste into * Note: sequence of selection does matter * * fixes to package saving * * update before changing Submodels management * * update edinting of potentially null lists * * refacture Env.Submodels, AAS, CDs, AAS.Submodels to have accessor-methods in super-ordinate entities to provide empty-list / null - behaviour. * * update before going to SMC null / empty list challenged * * update * * update * * fixes w.r.t. to the AsciiDoc generation * * updates for product change notifications * use more preferred name than short names from CDs * refactor use of Aas.IEnvironment instead Aas.Environment * * add PCN plugin to release * * again: build script * * improve BOM plugin functionality * * try change to new OPC UA client library * * remove MsAglControl * right-click menu * * wasted another 2h in trying to export SVG. Very unsatisfying MSAGL lib!! * * options for suppl. semanticIds * * finalize BOM editing * * resolve merge duplicated * * add SMT HierStruct V1.1 * fix BOM plugin * * migrate (copy) new OPC UA lib to MTP * basically running * * ported antique Read OPC values into Submodel to ne OPC UA client lib * * remove OPCF client references * * remove OPCF UA server * remove BlazorUI (not BlazorExplorer) * remove AasxCsharpLib_bkp * * remove superfluous Opc.Ua.SampleClient.Config.xml * * remove menu commands for OPC UA server * * improve scripting for integration testing * * a little scripting for testing * * work on empty list for CDs * find statistics fixed * * small fixes * * remove Lucene.Net * * after rebase to main (without AID update) and merges, push back to PR * * pending fixes from merge * * remove exception from text find/replace * add support for script log access * * trying to script copy/paste * screenshot by script * * fix for activate actions by scripting * * options for auto-size behavior of window * * select first plugin in SM for scripting --------- Co-authored-by: Michael Hoffmeister Co-authored-by: AlexanderWollbrink Co-authored-by: MichaHofft Co-authored-by: Marta <84308731+martafullen@users.noreply.github.com> Co-authored-by: martaf Co-authored-by: Oliver Co-authored-by: juileetikekar Co-authored-by: AlexanderWollbrink <68860592+AlexanderWollbrink@users.noreply.github.com> Co-authored-by: juileetikekar <99317579+juileetikekar@users.noreply.github.com> Co-authored-by: Kazeem Oladipupo <67549739+Kaz040@users.noreply.github.com> Co-authored-by: Birgit Boss <59824205+BirgitBoss@users.noreply.github.com> * bump for JetBrains in Bom * remove UaNetServer from PackageRelease.ps1 * removing UaNetServer from BuildForRelease.ps1 * fix typo in PackageRelease.ps1 --------- Co-authored-by: Alexander Wollbrink Co-authored-by: MichaelHoffmeisterFesto <65590855+MichaelHoffmeisterFesto@users.noreply.github.com> Co-authored-by: Michael Hoffmeister Co-authored-by: MichaHofft Co-authored-by: Oliver Co-authored-by: juileetikekar Co-authored-by: AlexanderWollbrink <68860592+AlexanderWollbrink@users.noreply.github.com> Co-authored-by: juileetikekar <99317579+juileetikekar@users.noreply.github.com> Co-authored-by: Kazeem Oladipupo <67549739+Kaz040@users.noreply.github.com> Co-authored-by: Birgit Boss <59824205+BirgitBoss@users.noreply.github.com> --- .DS_Store | Bin 0 -> 6148 bytes .../AasxBammRdfImExport.csproj | 2 +- .../AasxCsharpLibrary.csproj | 2 +- src/AasxFormatCst/AasxFormatCst.csproj | 2 +- .../AasxIntegrationBaseGdi.csproj | 4 +- .../AasxIntegrationBaseWpf.csproj | 2 +- .../AasxIntegrationEmptySample.csproj | 2 +- src/AasxMqtt/AasxMqtt.csproj | 2 +- src/AasxMqttClient/AasxMqttClient.csproj | 2 +- src/AasxOpenidClient/AasxOpenidClient.csproj | 2 +- src/AasxPackageExplorer.sln | 4 +- .../AasxPackageExplorer.csproj | 6 +- src/AasxPackageLogic/AasxPackageLogic.csproj | 2 +- .../AasxPluginBomStructure.csproj | 2 +- .../AasxPluginContactInformation.csproj | 3 +- .../AasxPluginDigitalNameplate.csproj | 3 +- .../AasxPluginDocumentShelf.csproj | 3 +- .../AasxPluginExportTable.csproj | 2 +- .../AasxPluginGenericForms.csproj | 2 +- .../AasxPluginImageMap.csproj | 2 +- .../AasxPluginKnownSubmodels.csproj | 2 +- .../AasxPluginPlotting.csproj | 4 +- .../AasxPluginSmdExporter.csproj | 4 +- .../AasxPluginTechnicalData.csproj | 2 +- .../AasxPluginUaNetServer.Config.xml | 224 -------------- .../AasxPluginUaNetServer.options.json | 15 - .../AasxPluginUaNetServer.plugin | 1 - src/AasxPluginUaNetServer/LICENSE.txt | 1 - src/AasxPluginUaNetServer/Plugin.cs | 277 ------------------ .../Properties/AssemblyInfo.cs | 36 --- .../UaNetServerOptions.cs | 43 --- .../AasxPluginWebBrowser.csproj | 4 +- .../AasxPredefinedConcepts.csproj | 2 +- src/AasxSchemaExport/AasxSchemaExport.csproj | 2 +- .../AasxWpfControlLibrary.csproj | 3 +- src/AasxWpfControlLibrary/AnyUiWpf.cs | 4 +- src/BuildForRelease.ps1 | 3 +- src/MsaglWpfControl/MsaglWpfControl.csproj | 2 +- src/PackageRelease.ps1 | 6 +- .../UIComponents.Flags.Blazor.csproj | 4 +- src/WpfXamlTool/WpfXamlTool.csproj | 2 +- 41 files changed, 43 insertions(+), 647 deletions(-) create mode 100644 .DS_Store delete mode 100644 src/AasxPluginUaNetServer/AasxPluginUaNetServer.Config.xml delete mode 100644 src/AasxPluginUaNetServer/AasxPluginUaNetServer.options.json delete mode 100644 src/AasxPluginUaNetServer/AasxPluginUaNetServer.plugin delete mode 100644 src/AasxPluginUaNetServer/LICENSE.txt delete mode 100644 src/AasxPluginUaNetServer/Plugin.cs delete mode 100644 src/AasxPluginUaNetServer/Properties/AssemblyInfo.cs delete mode 100644 src/AasxPluginUaNetServer/UaNetServerOptions.cs diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..989caddc1aabd86775a73d317a3b3433a3f22096 GIT binary patch literal 6148 zcmeHK%}T>S5Z-O8O({YS3Oz1(Ef`xV6fYsx7cim+m718M!I&*cY7eE5v%Zi|;`2DO zy8(+ii`W_1{pNQ!`$6`HF~+?`bj+B|7_*=ua#U&r-L;{HNk-&2Mm`S{8G`i@&Q0vE z1Acpx8{URt9xff(NXkAK~gq0qISMh8) zwfE0tS_E-A%Tz%e%^>CWI!+_G^yDIqa#ic=fYq@&Q@giX4V_V6493p7FIMA$(-$Yh z(R$sn4i1k_FQ(7QODf+qogCO!vS+Y@cTmh~Ui~ahWcmo6D!a-eBnF59Vt^RfZU)S` zV0E{f23kEaKn&C{fct}hhUgkBHL9%xI=nt(yoHDYI=&?kg+bR~sSzR|T$cjsQf{6Y zT$h7im^{~DsZp0Ru4aaD%*@r}g{#@YFH}0?u14yK0b*d2fu=TXJpa$(m#KZ^ZAfRtt0>Hq1q^E*9E>MR&*I=m;M?t?T Q2c(ODB7{0(;1?M90@LA1fdBvi literal 0 HcmV?d00001 diff --git a/src/AasxBammRdfImExport/AasxBammRdfImExport.csproj b/src/AasxBammRdfImExport/AasxBammRdfImExport.csproj index 75ddf9f2..f13f2db4 100644 --- a/src/AasxBammRdfImExport/AasxBammRdfImExport.csproj +++ b/src/AasxBammRdfImExport/AasxBammRdfImExport.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/AasxCsharpLibrary/AasxCsharpLibrary.csproj b/src/AasxCsharpLibrary/AasxCsharpLibrary.csproj index 6ea306ec..ef47300b 100644 --- a/src/AasxCsharpLibrary/AasxCsharpLibrary.csproj +++ b/src/AasxCsharpLibrary/AasxCsharpLibrary.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/AasxFormatCst/AasxFormatCst.csproj b/src/AasxFormatCst/AasxFormatCst.csproj index 7d30a7aa..00393553 100644 --- a/src/AasxFormatCst/AasxFormatCst.csproj +++ b/src/AasxFormatCst/AasxFormatCst.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/AasxIntegrationBaseGdi/AasxIntegrationBaseGdi.csproj b/src/AasxIntegrationBaseGdi/AasxIntegrationBaseGdi.csproj index a6507b57..fd2542b1 100644 --- a/src/AasxIntegrationBaseGdi/AasxIntegrationBaseGdi.csproj +++ b/src/AasxIntegrationBaseGdi/AasxIntegrationBaseGdi.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/src/AasxIntegrationBaseWpf/AasxIntegrationBaseWpf.csproj b/src/AasxIntegrationBaseWpf/AasxIntegrationBaseWpf.csproj index 4adc39bf..5318a8d6 100644 --- a/src/AasxIntegrationBaseWpf/AasxIntegrationBaseWpf.csproj +++ b/src/AasxIntegrationBaseWpf/AasxIntegrationBaseWpf.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/AasxIntegrationEmptySample/AasxIntegrationEmptySample.csproj b/src/AasxIntegrationEmptySample/AasxIntegrationEmptySample.csproj index 0a0748b7..ba3626df 100644 --- a/src/AasxIntegrationEmptySample/AasxIntegrationEmptySample.csproj +++ b/src/AasxIntegrationEmptySample/AasxIntegrationEmptySample.csproj @@ -9,6 +9,6 @@ - + diff --git a/src/AasxMqtt/AasxMqtt.csproj b/src/AasxMqtt/AasxMqtt.csproj index 7e37c597..fdd33dba 100644 --- a/src/AasxMqtt/AasxMqtt.csproj +++ b/src/AasxMqtt/AasxMqtt.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/AasxMqttClient/AasxMqttClient.csproj b/src/AasxMqttClient/AasxMqttClient.csproj index 4b751ac1..e30ab141 100644 --- a/src/AasxMqttClient/AasxMqttClient.csproj +++ b/src/AasxMqttClient/AasxMqttClient.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/AasxOpenidClient/AasxOpenidClient.csproj b/src/AasxOpenidClient/AasxOpenidClient.csproj index d784ee51..09d01fe1 100644 --- a/src/AasxOpenidClient/AasxOpenidClient.csproj +++ b/src/AasxOpenidClient/AasxOpenidClient.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/AasxPackageExplorer.sln b/src/AasxPackageExplorer.sln index 2d9cac5a..d268877f 100644 --- a/src/AasxPackageExplorer.sln +++ b/src/AasxPackageExplorer.sln @@ -44,12 +44,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AasxPluginTechnicalData", " EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9264D68F-5269-420F-A486-6B8F39BEEB8B}" ProjectSection(SolutionItems) = preProject - Notes_V3.md = Notes_V3.md - README-packages.md = README-packages.md ..\CHANGELOG.md = ..\CHANGELOG.md ..\CODE_OF_CONDUCT.md = ..\CODE_OF_CONDUCT.md ..\CONTRIBUTING.md = ..\CONTRIBUTING.md ..\CONTRIBUTORS.md = ..\CONTRIBUTORS.md + Notes_V3.md = Notes_V3.md + README-packages.md = README-packages.md ..\README.md = ..\README.md EndProjectSection EndProject diff --git a/src/AasxPackageExplorer/AasxPackageExplorer.csproj b/src/AasxPackageExplorer/AasxPackageExplorer.csproj index f85d6b9c..e1b31e5c 100644 --- a/src/AasxPackageExplorer/AasxPackageExplorer.csproj +++ b/src/AasxPackageExplorer/AasxPackageExplorer.csproj @@ -145,10 +145,10 @@ - + - - + + diff --git a/src/AasxPackageLogic/AasxPackageLogic.csproj b/src/AasxPackageLogic/AasxPackageLogic.csproj index 5b7bf663..839bac01 100644 --- a/src/AasxPackageLogic/AasxPackageLogic.csproj +++ b/src/AasxPackageLogic/AasxPackageLogic.csproj @@ -37,7 +37,7 @@ - + diff --git a/src/AasxPluginBomStructure/AasxPluginBomStructure.csproj b/src/AasxPluginBomStructure/AasxPluginBomStructure.csproj index 6784e43e..47729344 100644 --- a/src/AasxPluginBomStructure/AasxPluginBomStructure.csproj +++ b/src/AasxPluginBomStructure/AasxPluginBomStructure.csproj @@ -40,7 +40,7 @@ - + diff --git a/src/AasxPluginContactInformation/AasxPluginContactInformation.csproj b/src/AasxPluginContactInformation/AasxPluginContactInformation.csproj index 6e1901d3..760986a4 100644 --- a/src/AasxPluginContactInformation/AasxPluginContactInformation.csproj +++ b/src/AasxPluginContactInformation/AasxPluginContactInformation.csproj @@ -30,8 +30,7 @@ - - + diff --git a/src/AasxPluginDigitalNameplate/AasxPluginDigitalNameplate.csproj b/src/AasxPluginDigitalNameplate/AasxPluginDigitalNameplate.csproj index 2cc55eb2..7315aae6 100644 --- a/src/AasxPluginDigitalNameplate/AasxPluginDigitalNameplate.csproj +++ b/src/AasxPluginDigitalNameplate/AasxPluginDigitalNameplate.csproj @@ -55,8 +55,7 @@ - - + diff --git a/src/AasxPluginDocumentShelf/AasxPluginDocumentShelf.csproj b/src/AasxPluginDocumentShelf/AasxPluginDocumentShelf.csproj index 22dd8496..154eb5aa 100644 --- a/src/AasxPluginDocumentShelf/AasxPluginDocumentShelf.csproj +++ b/src/AasxPluginDocumentShelf/AasxPluginDocumentShelf.csproj @@ -34,8 +34,7 @@ - - + diff --git a/src/AasxPluginExportTable/AasxPluginExportTable.csproj b/src/AasxPluginExportTable/AasxPluginExportTable.csproj index 063d7007..161c3642 100644 --- a/src/AasxPluginExportTable/AasxPluginExportTable.csproj +++ b/src/AasxPluginExportTable/AasxPluginExportTable.csproj @@ -39,7 +39,7 @@ - + diff --git a/src/AasxPluginGenericForms/AasxPluginGenericForms.csproj b/src/AasxPluginGenericForms/AasxPluginGenericForms.csproj index 04429e19..9e3e8bef 100644 --- a/src/AasxPluginGenericForms/AasxPluginGenericForms.csproj +++ b/src/AasxPluginGenericForms/AasxPluginGenericForms.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/AasxPluginImageMap/AasxPluginImageMap.csproj b/src/AasxPluginImageMap/AasxPluginImageMap.csproj index cb5459ef..30f5d563 100644 --- a/src/AasxPluginImageMap/AasxPluginImageMap.csproj +++ b/src/AasxPluginImageMap/AasxPluginImageMap.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/AasxPluginKnownSubmodels/AasxPluginKnownSubmodels.csproj b/src/AasxPluginKnownSubmodels/AasxPluginKnownSubmodels.csproj index 560f7c20..4a50f225 100644 --- a/src/AasxPluginKnownSubmodels/AasxPluginKnownSubmodels.csproj +++ b/src/AasxPluginKnownSubmodels/AasxPluginKnownSubmodels.csproj @@ -8,7 +8,7 @@ false - + diff --git a/src/AasxPluginPlotting/AasxPluginPlotting.csproj b/src/AasxPluginPlotting/AasxPluginPlotting.csproj index 6012a4db..e8fd9bba 100644 --- a/src/AasxPluginPlotting/AasxPluginPlotting.csproj +++ b/src/AasxPluginPlotting/AasxPluginPlotting.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/src/AasxPluginSmdExporter/AasxPluginSmdExporter.csproj b/src/AasxPluginSmdExporter/AasxPluginSmdExporter.csproj index 7047e856..18f7fe95 100644 --- a/src/AasxPluginSmdExporter/AasxPluginSmdExporter.csproj +++ b/src/AasxPluginSmdExporter/AasxPluginSmdExporter.csproj @@ -32,10 +32,10 @@ - + - + diff --git a/src/AasxPluginTechnicalData/AasxPluginTechnicalData.csproj b/src/AasxPluginTechnicalData/AasxPluginTechnicalData.csproj index 062ba9a2..416af651 100644 --- a/src/AasxPluginTechnicalData/AasxPluginTechnicalData.csproj +++ b/src/AasxPluginTechnicalData/AasxPluginTechnicalData.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/AasxPluginUaNetServer/AasxPluginUaNetServer.Config.xml b/src/AasxPluginUaNetServer/AasxPluginUaNetServer.Config.xml deleted file mode 100644 index bd5e1352..00000000 --- a/src/AasxPluginUaNetServer/AasxPluginUaNetServer.Config.xml +++ /dev/null @@ -1,224 +0,0 @@ - - - - UA Core Sample Server - urn:localhost:OPCFoundation:CoreSampleServer - http://opcfoundation.org/UA/CoreSampleServer - Server_0 - - - - - - X509Store - CurrentUser\My - CN=UA Core Sample Server, C=US, S=Arizona, O=IDTA, DC=localhost - - - - - Directory - %LocalApplicationData%/OPC Foundation/pki/issuer - - - - - Directory - %LocalApplicationData%/OPC Foundation/pki/trusted - - - - - Directory - %LocalApplicationData%/OPC Foundation/pki/rejected - - - - true - - - - - - - 600000 - 1048576 - 4194304 - 65535 - 4194304 - 65535 - 300000 - 3600000 - - - - - opc.tcp://localhost:51210/UA/SampleServer - - - - - - - - - SignAndEncrypt_3 - http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256 - - - - None_1 - http://opcfoundation.org/UA/SecurityPolicy#None - - - Sign_2 - - - - SignAndEncrypt_3 - - - - - 5 - 100 - 2000 - - - - Anonymous_0 - http://opcfoundation.org/UA/SecurityPolicy#None - - - UserName_1 - - - Certificate_2 - - - - false - 100 - 10000 - 3600000 - 10 - 10 - 100 - 600000 - 100 - 3600000 - 50 - 3600000 - 100 - 100 - 1000 - 1000 - - - - opc.tcp://localhost:4840 - - opc.tcp://localhost:4840 - DiscoveryServer_3 - - opc.tcp://localhost:48400 - - - SignAndEncrypt_3 - - - - - 30000 - Opc.Ua.Server.nodes.xml - - 20 - 100 - 10000 - 10000 - - - - Standard UA Server Profile - Data Access Server Facet - Method Server Facet - - 2 - - DA - - - PFX - PEM - - 0 - false - - - - - - - - - UInt32 - 100 - UInt32 - - - Double - 100 - Double - - - - - - - - %LocalApplicationData%/Logs/Opc.Ua.CoreSampleServer.log.txt - true - - - - - - - - - - - - - - - - true - - \ No newline at end of file diff --git a/src/AasxPluginUaNetServer/AasxPluginUaNetServer.options.json b/src/AasxPluginUaNetServer/AasxPluginUaNetServer.options.json deleted file mode 100644 index e54e27db..00000000 --- a/src/AasxPluginUaNetServer/AasxPluginUaNetServer.options.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - /* This plug-ins comes with this sample options to show, how multiple Submodel semantic ids can - be matched. This could be used, e.g., to enable a general "operational data" with this feature. */ - "Args": [ - "-single-nodeids", // recommended for SiOME & Open62541 - "-single-keys", // recommended for SiOME & Open62541 - // "-add-root-item", // do not use! - "-link-root-as-component", // recommended for SiOME & Open62541 - "-simple-data-types", - "-ns", - "2", - "-ns", - "3" - ] -} \ No newline at end of file diff --git a/src/AasxPluginUaNetServer/AasxPluginUaNetServer.plugin b/src/AasxPluginUaNetServer/AasxPluginUaNetServer.plugin deleted file mode 100644 index 3beebdf2..00000000 --- a/src/AasxPluginUaNetServer/AasxPluginUaNetServer.plugin +++ /dev/null @@ -1 +0,0 @@ -This file tags the according .ddl to be a plug-in for AasxPackageExplorer. \ No newline at end of file diff --git a/src/AasxPluginUaNetServer/LICENSE.txt b/src/AasxPluginUaNetServer/LICENSE.txt deleted file mode 100644 index e41b5715..00000000 --- a/src/AasxPluginUaNetServer/LICENSE.txt +++ /dev/null @@ -1 +0,0 @@ -Please see LICENSE.txt of the AASX Package Explorer main application. \ No newline at end of file diff --git a/src/AasxPluginUaNetServer/Plugin.cs b/src/AasxPluginUaNetServer/Plugin.cs deleted file mode 100644 index 4ae0164a..00000000 --- a/src/AasxPluginUaNetServer/Plugin.cs +++ /dev/null @@ -1,277 +0,0 @@ -/* -Copyright (c) 2018-2023 Festo SE & Co. KG -Author: Michael Hoffmeister - -This source code is licensed under the Apache License 2.0 (see LICENSE.txt). - -This source code may use other Open Source software components (see LICENSE.txt). -*/ - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using AasOpcUaServer; -using AasxUaNetServer; -using AdminShellNS; -using Newtonsoft.Json; -using Opc.Ua; -using Opc.Ua.Configuration; -using Opc.Ua.Server; - -namespace AasxIntegrationBase // the namespace has to be: AasxIntegrationBase -{ - // the class names has to be: AasxPlugin and subclassing IAasxPluginInterface - // ReSharper disable once UnusedType.Global - public class AasxPlugin : AasxPluginBase - { - #region // Plug In - private AasxUaNetServer.UaNetServerOptions _options = new AasxUaNetServer.UaNetServerOptions(); - private bool _stop = false; - private UaServerWrapper _server = null; - // dead-csharp off - /* TODO (MIHO, 2021-11-17): damned, weird dependency reasons between - * - * .net6.0 and .net472 seem NOT TO ALLOW referring to AasxIntegrationBase. - * Fix */ - //private static T LoadDefaultOptionsFromAssemblyDirXXXX( - // string pluginName, Assembly assy = null, - // JsonSerializerSettings settings = null) where T : AasxPluginOptionsBase - //{ - // // expand assy? - // if (assy == null) - // assy = Assembly.GetExecutingAssembly(); - // if (pluginName == null || pluginName == "") - // return null; - - // // build fn - // var optfn = System.IO.Path.Combine( - // System.IO.Path.GetDirectoryName(assy.Location), - // pluginName + ".options.json"); - - // if (File.Exists(optfn)) - // { - // var optText = File.ReadAllText(optfn); - - // return Newtonsoft.Json.JsonConvert.DeserializeObject(optText, settings); - // } - - // // no - // return null; - //} - // dead-csharp on - - public new void InitPlugin(string[] args) - { - PluginName = "AasxPluginUaNetServer"; - _log.Info("InitPlugin() called with args = {0}", (args == null) ? "" : string.Join(", ", args)); - - // .. with built-in options - _options = AasxUaNetServer.UaNetServerOptions.CreateDefault(); - - // try load defaults options from assy directory - try - { - var newOpt = - AasxPluginOptionsBase - .LoadDefaultOptionsFromAssemblyDir( - this.GetPluginName(), Assembly.GetExecutingAssembly()); - if (newOpt != null) - this._options = newOpt; - } - catch (Exception ex) - { - _log?.Error(ex, "Exception when reading default options {1}"); - } - - // index them! - _options.IndexListOfRecords(_options.Records); - } - - public new AasxPluginActionDescriptionBase[] ListActions() - { - var res = ListActionsBasicHelper( - enableCheckVisualExt: false, - enableLicenses: true); - res.Add(new AasxPluginActionDescriptionBase("server-start", "Start OPC UA Server for AASX.")); - res.Add(new AasxPluginActionDescriptionBase("server-stop", "Stops server function.")); - return res.ToArray(); - } - - public new AasxPluginResultBase ActivateAction(string action, params object[] args) - { - if (action == "get-licenses") - { - var lic = new AasxPluginResultLicense(); - lic.shortLicense = - "This application uses the OPC Foundation .NET Standard stack. See: OPC REDISTRIBUTABLES " - + "Agreement of Use." + Environment.NewLine + - "The OPC UA Example Code of OPC UA Standard is licensed under the MIT license (MIT)."; - - lic.isStandardLicense = true; - lic.longLicense = AasxPluginHelper.LoadLicenseTxtFromAssemblyDir( - "LICENSE.txt", Assembly.GetExecutingAssembly()); - - return lic; - } - - if (action == "server-stop") - this._stop = true; - - if (action == "server-start") - { - // init - this._stop = false; - _log.Info("Starting OPC UA AASX Server. Based on the OPC Foundation UA Net Standard stack."); - _log.Info("Copyright (c) 2018-2023 Festo SE & Co. KG " + - ", author: Michael Hoffmeister."); - _log.Info("Portions copyright (c) by OPC Foundation, Inc. and licensed under the Reciprocal " - + "Community License (RCL)."); - _log.Info("See https://opcfoundation.org/license/rcl.html."); - - // access AASX - if (args == null || args.Length < 1) - { - _log.Info("No AASX package environment passed to plug-in. Stopping..."); - System.Threading.Thread.Sleep(5000); - return null; - } - - var package = args[0] as AdminShellPackageEnv; - if (package == null) - { - _log.Info("No AASX package environment passed to plug-in. Stopping..."); - System.Threading.Thread.Sleep(5000); - return null; - } - _log.Info("AASX package env has filename {0}", package.Filename); - - // configure UA here a little bit - ApplicationInstance.MessageDlg = new ApplicationMessageDlg(_log); - - // arguments - var externalOptions = new List(); - if (_options?.Args != null) - foreach (var o1 in _options.Args) - externalOptions.Add(o1); - - if (args.Length >= 2 && args[1] is string[]) - { - var pluginArgs = args[1] as string[]; - if (pluginArgs != null && pluginArgs.Length > 0) - { - foreach (var o2 in pluginArgs) - externalOptions.Add(o2); - } - } - - // debug - var lstr = $"Taking over {externalOptions.Count} arguments: "; - foreach (var ls in externalOptions) - lstr += ls + " "; - _log.Info("{0}", lstr); - - // parse - var internalOptions = new AasOpcUaServer.AasxUaServerOptions(); - internalOptions.ParseArgs(externalOptions.ToArray()); - - // run the server - try - { - this._server = new UaServerWrapper(_stopTimeout: 0, _aasxEnv: package, logger: _log, _serverOptions: internalOptions); - this._server.Run(); - } - catch (Exception ex) - { - _log.Info("Exception whenn running server: {0}", ex.Message); - } - - // do as long as user wants - int i = 0; - while (true) - { - if (this._stop) - { - _log.Info("Stopping ..."); - if (this._server != null) - this._server.Stop(); - break; - } - - //TODO (MIHO, 0000-00-00): Temporary disabled - // seems not to work anymore - ////if (this.server != null && this.server.IsNotRunningAnymore()) - //// break; - - // new option - if (true == this._server?.FinallyStopped) - break; - - System.Threading.Thread.Sleep(50); - if (i % 200 == 0) - _log.Info("Heartbeat {0} x 50ms ..", i); - i++; - } - _log.Info("Stopped."); - } - - var res = new AasxPluginResultBase(); - return res; - } - - } - - #endregion - - #region // taken form Net46 Console Server - // - // - // - - public class ApplicationMessageDlg : IApplicationMessageDlg - { - private LogInstance logger = null; - private string message = string.Empty; - private bool ask = false; - - public ApplicationMessageDlg(LogInstance logger) - { - this.logger = logger; - } - - public override void Message(string text, bool ask = false) - { - this.message = text; - this.ask = ask; - } - - public override async Task ShowAsync() - { - if (ask) - { - message += " (y/n, default y): "; - logger.Info("{0}", message); - Console.Write(message); - } - else - { - logger.Info("{0}", message); - Console.WriteLine(message); - } - if (ask) - { - // always say yes! - return await Task.FromResult(true); - } - return await Task.FromResult(true); - } - } - - - - #endregion -} diff --git a/src/AasxPluginUaNetServer/Properties/AssemblyInfo.cs b/src/AasxPluginUaNetServer/Properties/AssemblyInfo.cs deleted file mode 100644 index 754b62d7..00000000 --- a/src/AasxPluginUaNetServer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die einer Assembly zugeordnet sind. -[assembly: AssemblyTitle("AasxPluginUaNetServer")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("AasxPluginUaNetServer")] -[assembly: AssemblyCopyright("Copyright © 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly -// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von -// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen. -[assembly: ComVisible(false)] - -// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("32eede14-8622-42e6-81ae-33941b7a6efc")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -// indem Sie "*" wie unten gezeigt eingeben: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/AasxPluginUaNetServer/UaNetServerOptions.cs b/src/AasxPluginUaNetServer/UaNetServerOptions.cs deleted file mode 100644 index f3f9ac14..00000000 --- a/src/AasxPluginUaNetServer/UaNetServerOptions.cs +++ /dev/null @@ -1,43 +0,0 @@ -/* -Copyright (c) 2018-2023 Festo SE & Co. KG -Author: Michael Hoffmeister - -This source code is licensed under the Apache License 2.0 (see LICENSE.txt). - -This source code may use other Open Source software components (see LICENSE.txt). -*/ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Aas = AasCore.Aas3_0; -using AdminShellNS; -using AasxIntegrationBase; - -// ReSharper disable ClassNeverInstantiated.Global -// ReSharper disable UnassignedField.Global - -namespace AasxUaNetServer -{ - public class UaNetServerOptionsRecord : AasxPluginOptionsLookupRecordBase - { - } - - public class UaNetServerOptions : AasxPluginLookupOptionsBase - { - public string[] Args; - - public List Records = new List(); - - /// - /// Create a set of minimal options - /// - public static UaNetServerOptions CreateDefault() - { - var opt = new UaNetServerOptions(); - return opt; - } - } -} diff --git a/src/AasxPluginWebBrowser/AasxPluginWebBrowser.csproj b/src/AasxPluginWebBrowser/AasxPluginWebBrowser.csproj index 771f2803..7098dabf 100644 --- a/src/AasxPluginWebBrowser/AasxPluginWebBrowser.csproj +++ b/src/AasxPluginWebBrowser/AasxPluginWebBrowser.csproj @@ -60,9 +60,9 @@ - + - + diff --git a/src/AasxPredefinedConcepts/AasxPredefinedConcepts.csproj b/src/AasxPredefinedConcepts/AasxPredefinedConcepts.csproj index 9f198fdc..f93a089b 100644 --- a/src/AasxPredefinedConcepts/AasxPredefinedConcepts.csproj +++ b/src/AasxPredefinedConcepts/AasxPredefinedConcepts.csproj @@ -40,7 +40,7 @@ - + diff --git a/src/AasxSchemaExport/AasxSchemaExport.csproj b/src/AasxSchemaExport/AasxSchemaExport.csproj index e434278d..610bd8ba 100644 --- a/src/AasxSchemaExport/AasxSchemaExport.csproj +++ b/src/AasxSchemaExport/AasxSchemaExport.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/AasxWpfControlLibrary/AasxWpfControlLibrary.csproj b/src/AasxWpfControlLibrary/AasxWpfControlLibrary.csproj index e386c20a..8068d998 100644 --- a/src/AasxWpfControlLibrary/AasxWpfControlLibrary.csproj +++ b/src/AasxWpfControlLibrary/AasxWpfControlLibrary.csproj @@ -41,8 +41,7 @@ - - + diff --git a/src/AasxWpfControlLibrary/AnyUiWpf.cs b/src/AasxWpfControlLibrary/AnyUiWpf.cs index b03ff8fe..4e0a55ee 100644 --- a/src/AasxWpfControlLibrary/AnyUiWpf.cs +++ b/src/AasxWpfControlLibrary/AnyUiWpf.cs @@ -887,7 +887,7 @@ private void InitRenderRecs() } }), - new RenderRec(typeof(AnyUiCountryFlag), typeof(CountryFlag.Wpf.CountryFlag), (a, b, mode, rd) => + /*new RenderRec(typeof(AnyUiCountryFlag), typeof(CountryFlag.Wpf.CountryFlag), (a, b, mode, rd) => { if (a is AnyUiCountryFlag cntl && b is CountryFlag.Wpf.CountryFlag wpf && mode == AnyUiRenderMode.All) @@ -900,7 +900,7 @@ private void InitRenderRecs() // dead-csharp on wpf.CountryCode = cntl.ISO3166Code; } - }), + }),*/ new RenderRec(typeof(AnyUiTextBox), typeof(TextBox), (a, b, mode, rd) => { diff --git a/src/BuildForRelease.ps1 b/src/BuildForRelease.ps1 index d9e5ee24..09b815f5 100644 --- a/src/BuildForRelease.ps1 +++ b/src/BuildForRelease.ps1 @@ -49,11 +49,10 @@ function Main "AasxPluginDigitalNameplate", "AasxPluginMtpViewer", "AasxPluginPlotting", - "AasxPluginProductChangeNotifications", + "AasxPluginProductChangeNotifications", "AasxPluginSmdExporter", "AasxPluginTechnicalData", "AasxPluginUaNetClient", - "AasxPluginUaNetServer", "AasxPluginWebBrowser", "BlazorExplorer" ) diff --git a/src/MsaglWpfControl/MsaglWpfControl.csproj b/src/MsaglWpfControl/MsaglWpfControl.csproj index 1d5a541f..7ea9a3a2 100644 --- a/src/MsaglWpfControl/MsaglWpfControl.csproj +++ b/src/MsaglWpfControl/MsaglWpfControl.csproj @@ -18,6 +18,6 @@ - + diff --git a/src/PackageRelease.ps1 b/src/PackageRelease.ps1 index 75a5e2b3..2807bbb3 100644 --- a/src/PackageRelease.ps1 +++ b/src/PackageRelease.ps1 @@ -42,11 +42,10 @@ function PackageRelease($outputDir) "AasxPluginImageMap", "AasxPluginMtpViewer", "AasxPluginPlotting", - "AasxPluginProductChangeNotifications", + "AasxPluginProductChangeNotifications", "AasxPluginSmdExporter", "AasxPluginTechnicalData" - "AasxPluginUaNetClient", - "AasxPluginUaNetServer" + "AasxPluginUaNetClient" ) $blazorPlugins = $( @@ -64,7 +63,6 @@ function PackageRelease($outputDir) "AasxPluginSmdExporter", "AasxPluginTechnicalData", "AasxPluginUaNetClient", - "AasxPluginUaNetServer", "AasxPluginWebBrowser" ) diff --git a/src/UIComponents.Flags.Blazor/UIComponents.Flags.Blazor.csproj b/src/UIComponents.Flags.Blazor/UIComponents.Flags.Blazor.csproj index 6688620a..843d0637 100644 --- a/src/UIComponents.Flags.Blazor/UIComponents.Flags.Blazor.csproj +++ b/src/UIComponents.Flags.Blazor/UIComponents.Flags.Blazor.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/WpfXamlTool/WpfXamlTool.csproj b/src/WpfXamlTool/WpfXamlTool.csproj index 5d520071..c27d110f 100644 --- a/src/WpfXamlTool/WpfXamlTool.csproj +++ b/src/WpfXamlTool/WpfXamlTool.csproj @@ -13,7 +13,7 @@ - +