* update for check with Marta

admin-shell-io · Aug 2, 2023 · aba6762 · aba6762
1 parent e045cd0
commit aba6762
Show file tree

Hide file tree

Showing 7 changed files with 1,994 additions and 1,993 deletions.
diff --git a/src/AasxPackageExplorer.sln b/src/AasxPackageExplorer.sln
diff --git a/src/AasxPackageExplorer/AasxPackageExplorer.csproj b/src/AasxPackageExplorer/AasxPackageExplorer.csproj
@@ -13,8 +13,9 @@
 	        * Dotnet CLI will only recognize "Platform",
 			* Visual Studio will only recognize "Platforms".
 	-->
-	<Platforms>x64;AnyCPU</Platforms>
+	<Platforms>x64</Platforms>
 	<Platform>x64</Platform>
+  <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>aasx.ico</ApplicationIcon>

diff --git a/src/AasxPackageExplorer/AasxPackageExplorer.options-for-debug.json b/src/AasxPackageExplorer/AasxPackageExplorer.options-for-debug.json
@@ -39,5 +39,5 @@
     "..\\..\\..\\..\\..\\Sample_AAS\\Example_AAS_ServoDCMotor.aasx",
     "..\\..\\..\\..\\..\\Sample_AAS\\Example_AAS_ForTesting_v07_with_reuse_submodel.aasx"
   ],
-  "PluginDir": "."
+  "PluginDir": ".\\plugins"
 }
diff --git a/src/AasxPackageExplorer/MainWindow.xaml b/src/AasxPackageExplorer/MainWindow.xaml
@@ -588,7 +588,7 @@
                         </TabItem>
                         <TabItem Header="Agents" x:Name="TabItemConcurrentAgents" BorderThickness="0.0" 
                                  Background="{DynamicResource LightAccentColor}">
-                            <main:MainWindowAgentsView x:Name="UserControlAgentsView" Background="#c0000977"/>
+                            <main:MainWindowAgentsView x:Name="UserControlAgentsView" Background="#0035D5"/>
                         </TabItem>
                     </TabControl>
                 </Grid>

diff --git a/src/AasxPackageExplorer/options-debug.MIHO.json b/src/AasxPackageExplorer/options-debug.MIHO.json
@@ -85,7 +85,7 @@
   "PluginPrefer": "ANYUI",
   "PluginDll": [
     {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginUaNetServer\\bin\\Debug\\net6.0-windows\\AasxPluginUaNetServer.dll",
+      "Path": "..\\..\\..\\..\\..\\..\\AasxPluginUaNetServer\\bin\\Debug\\net6.0-windows\\AasxPluginUaNetServer.dll",
       "Args": [
         "-single-nodeids",
         "-single-keys",
@@ -108,51 +108,51 @@
     },
     */
     {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginKnownSubmodels\\bin\\Debug\\net6.0-windows\\AasxPluginKnownSubmodels.dll",
+      "Path": "..\\..\\..\\..\\..\\..\\AasxPluginKnownSubmodels\\bin\\Debug\\net6.0-windows\\AasxPluginKnownSubmodels.dll",
       "Args": []
     },
     {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginDigitalNameplate\\bin\\Debug\\net6.0-windows\\AasxPluginDigitalNameplate.dll",
+      "Path": "..\\..\\..\\..\\..\\..\\AasxPluginDigitalNameplate\\bin\\Debug\\net6.0-windows\\AasxPluginDigitalNameplate.dll",
       "Args": []
     },
     {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginDocumentShelf\\bin\\Debug\\net6.0-windows\\AasxPluginDocumentShelf.dll",
+      "Path": "..\\..\\..\\..\\..\\..\\AasxPluginDocumentShelf\\bin\\Debug\\net6.0-windows\\AasxPluginDocumentShelf.dll",
       "Args": []
     },
     {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginGenericForms\\bin\\Debug\\net6.0-windows\\AasxPluginGenericForms.dll",
+      "Path": "..\\..\\..\\..\\..\\..\\AasxPluginGenericForms\\bin\\Debug\\net6.0-windows\\AasxPluginGenericForms.dll",
       "Args": []
     },
     {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginAdvancedTextEditor\\bin\\Debug\\net6.0-windows\\AasxPluginAdvancedTextEditor.dll",
+      "Path": "..\\..\\..\\..\\..\\..\\AasxPluginAdvancedTextEditor\\bin\\Debug\\net6.0-windows\\AasxPluginAdvancedTextEditor.dll",
       "Args": []
     },
     {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginTechnicalData\\bin\\Debug\\net6.0-windows\\AasxPluginTechnicalData.dll",
+      "Path": "..\\..\\..\\..\\..\\..\\AasxPluginTechnicalData\\bin\\Debug\\net6.0-windows\\AasxPluginTechnicalData.dll",
       "Args": []
     },
     {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginBomStructure\\bin\\Debug\\net6.0-windows\\AasxPluginBomStructure.dll",
+      "Path": "..\\..\\..\\..\\..\\..\\AasxPluginBomStructure\\bin\\Debug\\net6.0-windows\\AasxPluginBomStructure.dll",
       "Args": []
     },
     {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginPlotting\\bin\\Debug\\net6.0-windows\\AasxPluginPlotting.dll",
+      "Path": "..\\..\\..\\..\\..\\..\\AasxPluginPlotting\\bin\\Debug\\net6.0-windows\\AasxPluginPlotting.dll",
       "Args": []
     },
     {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginImageMap\\bin\\Debug\\net6.0-windows\\AasxPluginImageMap.dll",
+      "Path": "..\\..\\..\\..\\..\\..\\AasxPluginImageMap\\bin\\Debug\\net6.0-windows\\AasxPluginImageMap.dll",
       "Args": []
     },
     {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginMtpViewer\\bin\\Debug\\net6.0-windows\\AasxPluginMtpViewer.dll",
+      "Path": "..\\..\\..\\..\\..\\..\\AasxPluginMtpViewer\\bin\\Debug\\net6.0-windows\\AasxPluginMtpViewer.dll",
       "Args": []
     },
     {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginExportTable\\bin\\Debug\\net6.0-windows\\AasxPluginExportTable.dll",
+      "Path": "..\\..\\..\\..\\..\\..\\AasxPluginExportTable\\bin\\Debug\\net6.0-windows\\AasxPluginExportTable.dll",
       "Args": []
     },
     {
-      "Path": "..\\..\\..\\..\\..\\AasxPluginWebBrowser\\bin\\x64\\Debug\\net6.0-windows\\AasxPluginWebBrowser.dll",
+      "Path": "..\\..\\..\\..\\..\\..\\AasxPluginWebBrowser\\bin\\x64\\Debug\\net6.0-windows\\AasxPluginWebBrowser.dll",
       "Args": []
     }
 

diff --git a/src/AasxPluginWebBrowser/AasxPluginWebBrowser.csproj b/src/AasxPluginWebBrowser/AasxPluginWebBrowser.csproj
@@ -4,7 +4,7 @@
     <OutputType>library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
-    <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
 
     <!-- force NuGet / Build to put required.dll and more to bin folder -->
     <!-- Drawback: puts all other *.dll as well :-( -->
@@ -15,9 +15,9 @@
 	        * Dotnet CLI will only recognize "Platform",
 			* Visual Studio will only recognize "Platforms". 
 	-->
-	  <Platforms>x64;AnyCPU</Platforms>
+	  <Platforms>x64</Platforms>
 	  <Platform>x64</Platform>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
 
     <CefSharpBuildAction>Content</CefSharpBuildAction>
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>

diff --git a/src/AasxPluginWebBrowser/Plugin.cs b/src/AasxPluginWebBrowser/Plugin.cs
@@ -146,7 +146,7 @@ public class AasxPlugin : AasxPluginBase
                 }
             }
 
-            if (action == "gset-zoom-level" && args != null && args.Length >= 1 && args[0] is double)
+            if (action == "set-zoom-level" && args != null && args.Length >= 1 && args[0] is double)
             {
                 // args
                 var zoom = (double)args[0];