diff --git a/src/AasxIntegrationBaseGdi/AasxIntegrationBaseGdi.csproj b/src/AasxIntegrationBaseGdi/AasxIntegrationBaseGdi.csproj index a6507b57c..b359d5811 100644 --- a/src/AasxIntegrationBaseGdi/AasxIntegrationBaseGdi.csproj +++ b/src/AasxIntegrationBaseGdi/AasxIntegrationBaseGdi.csproj @@ -1,7 +1,7 @@  - net6.0-windows + net6.0 diff --git a/src/AasxIntegrationBaseWpf/Properties/AssemblyInfo.cs b/src/AasxIntegrationBaseWpf/Properties/AssemblyInfo.cs index ff8d702d0..d409370bb 100644 --- a/src/AasxIntegrationBaseWpf/Properties/AssemblyInfo.cs +++ b/src/AasxIntegrationBaseWpf/Properties/AssemblyInfo.cs @@ -30,12 +30,12 @@ //// [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] [assembly: ThemeInfo( - ResourceDictionaryLocation.None, //Speicherort der designspezifischen Ressourcenwörterbücher - //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird, - // oder in den Anwendungsressourcen-Wörterbüchern nicht gefunden werden kann.) - ResourceDictionaryLocation.SourceAssembly //Speicherort des generischen Ressourcenwörterbuchs - //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird, - // designspezifischen Ressourcenwörterbuch nicht gefunden werden kann.) + ResourceDictionaryLocation.None, //Speicherort der designspezifischen Ressourcenwörterbücher + //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird, + // oder in den Anwendungsressourcen-Wörterbüchern nicht gefunden werden kann.) + ResourceDictionaryLocation.SourceAssembly //Speicherort des generischen Ressourcenwörterbuchs + //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird, + // designspezifischen Ressourcenwörterbuch nicht gefunden werden kann.) )] diff --git a/src/AasxOpenidClient/AasxOpenidClient.csproj b/src/AasxOpenidClient/AasxOpenidClient.csproj index d784ee510..a52da638a 100644 --- a/src/AasxOpenidClient/AasxOpenidClient.csproj +++ b/src/AasxOpenidClient/AasxOpenidClient.csproj @@ -1,10 +1,11 @@  - net6.0-windows + net6.0 Library false + false diff --git a/src/AasxOpenidClient/OpenIDCLient.cs b/src/AasxOpenidClient/OpenIDCLient.cs index c3f85e564..5ec18e743 100644 --- a/src/AasxOpenidClient/OpenIDCLient.cs +++ b/src/AasxOpenidClient/OpenIDCLient.cs @@ -14,7 +14,7 @@ using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading.Tasks; -using System.Windows.Forms; +// using System.Windows.Forms; /* Copyright (c) 2020 see https://github.com/IdentityServer/IdentityServer4 @@ -38,6 +38,7 @@ static public bool AcceptAllCertifications( public class UiLambdaSet { + /* public delegate DialogResult ShowMessageDelegate( string content, string text, string caption, MessageBoxButtons buttons = 0); public ShowMessageDelegate MesssageBox; @@ -50,6 +51,7 @@ public static DialogResult MesssageBoxShow( return lambdaSet.MesssageBox(content, text, caption, buttons); return System.Windows.Forms.MessageBox.Show(content + text, caption, buttons); } + */ } public static string authServer = "https://localhost:50001"; @@ -112,6 +114,7 @@ public static async Task Run(string tag, string value, UiLambdaSet uiLambda = nu "\nConinue?"; // Displays the MessageBox. + /* var result = UiLambdaSet.MesssageBoxShow( uiLambda, message, "", caption, MessageBoxButtons.YesNo); if (result != System.Windows.Forms.DialogResult.Yes) @@ -122,6 +125,7 @@ public static async Task Run(string tag, string value, UiLambdaSet uiLambda = nu UiLambdaSet.MesssageBoxShow(uiLambda, "", "Access Aasx Server at " + dataServer, "Data Server", MessageBoxButtons.OK); + */ var handler = new HttpClientHandler(); handler.DefaultProxyCredentials = CredentialCache.DefaultCredentials; @@ -147,8 +151,10 @@ public static async Task Run(string tag, string value, UiLambdaSet uiLambda = nu while (operation != "") { + /* UiLambdaSet.MesssageBoxShow(uiLambda, "", "operation: " + operation + value + "\ntoken: " + token, "Operation", MessageBoxButtons.OK); + */ switch (operation) { @@ -174,8 +180,10 @@ public static async Task Run(string tag, string value, UiLambdaSet uiLambda = nu StringSplitOptions.RemoveEmptyEntries); Console.WriteLine("Redirect to:" + splitResult[0]); authServer = splitResult[0]; + /* UiLambdaSet.MesssageBoxShow( uiLambda, authServer, "", "Redirect to", MessageBoxButtons.OK); + */ lastOperation = operation; operation = "authenticate"; continue; @@ -190,9 +198,11 @@ public static async Task Run(string tag, string value, UiLambdaSet uiLambda = nu switch (operation) { case "/server/listaas/": + /* UiLambdaSet.MesssageBoxShow(uiLambda, "", "SelectFromListFlyoutItem missing", "SelectFromListFlyoutItem missing", MessageBoxButtons.OK); + */ value = "0"; operation = "/server/getaasx2/"; break; @@ -247,9 +257,10 @@ public static async Task Run(string tag, string value, UiLambdaSet uiLambda = nu client.SetBearerToken(token); response.Show(); + /* UiLambdaSet.MesssageBoxShow(uiLambda, response.AccessToken, "", "Access Token", MessageBoxButtons.OK); - + */ operation = lastOperation; lastOperation = ""; } @@ -261,8 +272,10 @@ public static async Task Run(string tag, string value, UiLambdaSet uiLambda = nu } break; case "error": + /* UiLambdaSet.MesssageBoxShow(uiLambda, "", $"Can not perform: {lastOperation}", "Error", MessageBoxButtons.OK); + */ operation = ""; break; } @@ -280,7 +293,7 @@ public static async Task RequestTokenAsync( var disco = await client.GetDiscoveryDocumentAsync(authServer); if (disco.IsError) throw new Exception(disco.Error); - UiLambdaSet.MesssageBoxShow(uiLambda, disco.Raw, "", "Discovery JSON", MessageBoxButtons.OK); + // UiLambdaSet.MesssageBoxShow(uiLambda, disco.Raw, "", "Discovery JSON", MessageBoxButtons.OK); List rootCertSubject = new List(); dynamic discoObject = null; @@ -301,7 +314,7 @@ public static async Task RequestTokenAsync( Console.ResetColor(); Console.WriteLine(clientToken + "\n"); - UiLambdaSet.MesssageBoxShow(uiLambda, clientToken, "", "Client Token", MessageBoxButtons.OK); + // UiLambdaSet.MesssageBoxShow(uiLambda, clientToken, "", "Client Token", MessageBoxButtons.OK); var response = await client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest { @@ -376,12 +389,13 @@ private static string CreateClientToken(SigningCredentials credential, string cl if (credential == null) { + /* var res = UiLambdaSet.MesssageBoxShow(uiLambda, "", "Select certificate chain from certificate store? \n" + "(otherwise use file Andreas_Orzelski_Chain.pfx)", "Select certificate chain", MessageBoxButtons.YesNo); - - if (res == DialogResult.No) + */ + if (false /*res == DialogResult.No*/) { certFileName = "Andreas_Orzelski_Chain.pfx"; password = "i40"; @@ -416,10 +430,13 @@ private static string CreateClientToken(SigningCredentials credential, string cl if (rootCertFound) fcollection = fcollection2; + /* X509Certificate2Collection scollection = X509Certificate2UI.SelectFromCollection(fcollection, "Test Certificate Select", "Select a certificate from the following list to get information on that certificate", X509SelectionFlag.SingleSelection); + */ + X509Certificate2Collection scollection = new X509Certificate2Collection(fcollection); if (scollection.Count != 0) { certificate = scollection[0]; @@ -477,7 +494,7 @@ private static string CreateClientToken(SigningCredentials credential, string cl Convert.ToBase64String(certificate.RawData, Base64FormattingOptions.InsertLineBreaks)); builder.AppendLine("-----END CERTIFICATE-----"); - UiLambdaSet.MesssageBoxShow(uiLambda, builder.ToString(), "", "Client Certificate", MessageBoxButtons.OK); + // UiLambdaSet.MesssageBoxShow(uiLambda, builder.ToString(), "", "Client Certificate", MessageBoxButtons.OK); credential = new X509SigningCredentials(certificate); // oz end diff --git a/src/AasxOpenidClient/OpenIDClientInstance.cs b/src/AasxOpenidClient/OpenIDClientInstance.cs index 51bf1a422..515510a7c 100644 --- a/src/AasxOpenidClient/OpenIDClientInstance.cs +++ b/src/AasxOpenidClient/OpenIDClientInstance.cs @@ -494,10 +494,13 @@ private string CreateClientToken(SigningCredentials credential, string clientId, if (rootCertFound) fcollection = fcollection2; + /* X509Certificate2Collection scollection = X509Certificate2UI.SelectFromCollection(fcollection, "Test Certificate Select", "Select a certificate from the following list to get information on that certificate", X509SelectionFlag.SingleSelection); + */ + X509Certificate2Collection scollection = new X509Certificate2Collection(fcollection); if (scollection.Count != 0) { certificate = scollection[0]; diff --git a/src/AasxPackageExplorer/Properties/AssemblyInfo.cs b/src/AasxPackageExplorer/Properties/AssemblyInfo.cs index 357eb1baa..14d72b229 100644 --- a/src/AasxPackageExplorer/Properties/AssemblyInfo.cs +++ b/src/AasxPackageExplorer/Properties/AssemblyInfo.cs @@ -31,12 +31,12 @@ [assembly: ThemeInfo( - ResourceDictionaryLocation.None, //Speicherort der designspezifischen Ressourcenwörterbücher - //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird, - // oder in den Anwendungsressourcen-Wörterbüchern nicht gefunden werden kann.) - ResourceDictionaryLocation.SourceAssembly //Speicherort des generischen Ressourcenwörterbuchs - //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird, - // designspezifischen Ressourcenwörterbuch nicht gefunden werden kann.) + ResourceDictionaryLocation.None, //Speicherort der designspezifischen Ressourcenwörterbücher + //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird, + // oder in den Anwendungsressourcen-Wörterbüchern nicht gefunden werden kann.) + ResourceDictionaryLocation.SourceAssembly //Speicherort des generischen Ressourcenwörterbuchs + //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird, + // designspezifischen Ressourcenwörterbuch nicht gefunden werden kann.) )] diff --git a/src/AasxPackageLogic/AasxPackageLogic.csproj b/src/AasxPackageLogic/AasxPackageLogic.csproj index fea93b71c..478a02093 100644 --- a/src/AasxPackageLogic/AasxPackageLogic.csproj +++ b/src/AasxPackageLogic/AasxPackageLogic.csproj @@ -1,10 +1,10 @@  - net6.0-windows + net6.0 Library false - true - true + @@ -43,12 +43,10 @@ - - diff --git a/src/AasxPackageLogic/AasxScript.cs b/src/AasxPackageLogic/AasxScript.cs index 846793480..d57583d0c 100644 --- a/src/AasxPackageLogic/AasxScript.cs +++ b/src/AasxPackageLogic/AasxScript.cs @@ -215,6 +215,7 @@ public override async Task Invoke(IScriptContext context, object[] args) // invoke action // https://stackoverflow.com/questions/39438441/ Task x = null; + /* if (Application.Current != null) { // WPF case @@ -228,6 +229,7 @@ public override async Task Invoke(IScriptContext context, object[] args) Log.Singleton.Silent("" + x); } else + */ { // Blazor case await _script?.Remote?.Tool(args); @@ -269,14 +271,17 @@ public override object Invoke(IScriptContext context, object[] args) Console.WriteLine($"Execute Select " + string.Join(",", args)); // which application + /* if (Application.Current == null) { Log.Singleton.Error("For script execution, Application.Current for Blazor is not available."); } + */ // invoke action // https://stackoverflow.com/questions/39438441/ Aas.IReferable x = null; + /* if (Application.Current != null) { // WPF case @@ -288,6 +293,7 @@ public override object Invoke(IScriptContext context, object[] args) Log.Singleton.Silent("" + x.IdShort); } else + */ { // Blazor?? case x = _script.Remote?.Select(args); @@ -337,6 +343,7 @@ public async override Task Invoke(IScriptContext context, object[] args) // invoke action // https://stackoverflow.com/questions/39438441/ bool x = false; + /* if (Application.Current != null) { // WPF case @@ -347,6 +354,7 @@ public async override Task Invoke(IScriptContext context, object[] args) Log.Singleton.Silent("" + x); } else + */ { // Blazor case x = await _script.Remote?.Location(args); diff --git a/src/AasxPackageLogic/AdminShellEvents/AasEventCompressor.cs b/src/AasxPackageLogic/AdminShellEvents/AasEventCompressor.cs index 7ec6de95e..ab2360979 100644 --- a/src/AasxPackageLogic/AdminShellEvents/AasEventCompressor.cs +++ b/src/AasxPackageLogic/AdminShellEvents/AasEventCompressor.cs @@ -11,8 +11,8 @@ This source code may use other Open Source software components (see LICENSE.txt) using System; using System.Collections.Generic; using System.Linq; -using System.Windows.Annotations; -using static System.Windows.Forms.AxHost; +// using System.Windows.Annotations; +// using static System.Windows.Forms.AxHost; using Aas = AasCore.Aas3_0; namespace AasxIntegrationBase.AdminShellEvents diff --git a/src/AasxPackageLogic/DispEditHelperEntities.cs b/src/AasxPackageLogic/DispEditHelperEntities.cs index 523345447..2f8ddfa19 100644 --- a/src/AasxPackageLogic/DispEditHelperEntities.cs +++ b/src/AasxPackageLogic/DispEditHelperEntities.cs @@ -20,8 +20,8 @@ This source code may use other Open Source software components (see LICENSE.txt) using System.Linq; using System.Runtime.Intrinsics.X86; using System.Text; -using System.Windows.Documents; -using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window; +// using System.Windows.Documents; +// using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window; using Aas = AasCore.Aas3_0; namespace AasxPackageLogic diff --git a/src/AasxPackageLogic/MainWindowHeadless.cs b/src/AasxPackageLogic/MainWindowHeadless.cs index e5c7e6d4c..b85c6639c 100644 --- a/src/AasxPackageLogic/MainWindowHeadless.cs +++ b/src/AasxPackageLogic/MainWindowHeadless.cs @@ -15,7 +15,7 @@ This source code may use other Open Source software components (see LICENSE.txt) using AasxPackageLogic.PackageCentral; using AasxPredefinedConcepts; using AasxPredefinedConcepts.Convert; -using AasxSignature; +// using AasxSignature; using AdminShellNS; using AnyUi; using Extensions; @@ -230,25 +230,31 @@ public async Task CommandBinding_GeneralDispatchHeadless( } // do + /* PackageHelper.SignAll( sourceFn, certFn, invokeMessage: (ticket.InvokeMessage == null) ? StandardInvokeMessageDelegate : ticket.InvokeMessage); + */ } if (cmd == "validatecertificate") { // arguments + /* if (!(ticket["Source"] is string sourceFn)) { LogErrorToTicket(ticket, "Validate: source package filename invalid."); return; } + */ // do + /* PackageHelper.Validate(sourceFn, invokeMessage: (ticket.InvokeMessage == null) ? StandardInvokeMessageDelegate : ticket.InvokeMessage); + */ } if (cmd == "encrypt") diff --git a/src/AasxPackageLogic/MenuFunction/MenuFuncCompareSmt.cs b/src/AasxPackageLogic/MenuFunction/MenuFuncCompareSmt.cs index 568108eca..b59875ca0 100644 --- a/src/AasxPackageLogic/MenuFunction/MenuFuncCompareSmt.cs +++ b/src/AasxPackageLogic/MenuFunction/MenuFuncCompareSmt.cs @@ -20,7 +20,7 @@ This source code may use other Open Source software components (see LICENSE.txt) using AnyUi; using Extensions; using Jose; -using Microsoft.VisualBasic.ApplicationServices; +// using Microsoft.VisualBasic.ApplicationServices; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Org.Webpki.JsonCanonicalizer; @@ -38,13 +38,13 @@ This source code may use other Open Source software components (see LICENSE.txt) using System.Threading; using System.Threading.Tasks; using static AasxPredefinedConcepts.ConceptModel.ConceptModelZveiTechnicalData; -using System.Windows.Forms; +// using System.Windows.Forms; using VDS.RDF.Ontology; using VDS.RDF.Query.Paths; using static System.Net.Mime.MediaTypeNames; using Aas = AasCore.Aas3_0; using VDS.RDF.Query.Algebra; -using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; +// using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; namespace AasxPackageExplorer { diff --git a/src/AasxPackageLogic/MenuFunction/MenuFuncValidateSmt.cs b/src/AasxPackageLogic/MenuFunction/MenuFuncValidateSmt.cs index f65c44deb..e8406cbd6 100644 --- a/src/AasxPackageLogic/MenuFunction/MenuFuncValidateSmt.cs +++ b/src/AasxPackageLogic/MenuFunction/MenuFuncValidateSmt.cs @@ -20,7 +20,7 @@ This source code may use other Open Source software components (see LICENSE.txt) using AnyUi; using Extensions; using Jose; -using Microsoft.VisualBasic.ApplicationServices; +// using Microsoft.VisualBasic.ApplicationServices; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Org.Webpki.JsonCanonicalizer; @@ -38,13 +38,13 @@ This source code may use other Open Source software components (see LICENSE.txt) using System.Threading; using System.Threading.Tasks; using static AasxPredefinedConcepts.ConceptModel.ConceptModelZveiTechnicalData; -using System.Windows.Forms; +// using System.Windows.Forms; using VDS.RDF.Ontology; using VDS.RDF.Query.Paths; using static System.Net.Mime.MediaTypeNames; using Aas = AasCore.Aas3_0; using VDS.RDF.Query.Algebra; -using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; +// using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; namespace AasxPackageExplorer { diff --git a/src/AasxPackageLogic/Plugins.cs b/src/AasxPackageLogic/Plugins.cs index 4122fc730..e1e197dbc 100644 --- a/src/AasxPackageLogic/Plugins.cs +++ b/src/AasxPackageLogic/Plugins.cs @@ -54,7 +54,14 @@ public object BasicInvokeMethod(string mname, params object[] args) var mi = plugType.GetMethod(mname); if (mi == null) return null; - return mi.Invoke(plugObj, args); + try + { + return mi.Invoke(plugObj, args); + } + catch + { + return null; + } } public async Task BasicInvokeMethodAsync(string mname, params object[] args) diff --git a/src/AasxSignature/AasxSignature.csproj b/src/AasxSignature/AasxSignature.csproj index 0d77cc629..cb3b343a4 100644 --- a/src/AasxSignature/AasxSignature.csproj +++ b/src/AasxSignature/AasxSignature.csproj @@ -1,12 +1,13 @@  - net6.0-windows + net6.0 Library De.Zvei.Aasx true false + false diff --git a/src/AasxUaNetConsoleServer/AasxUaNetConsoleServer.csproj b/src/AasxUaNetConsoleServer/AasxUaNetConsoleServer.csproj index 2cbd80c56..6e6bb5d45 100644 --- a/src/AasxUaNetConsoleServer/AasxUaNetConsoleServer.csproj +++ b/src/AasxUaNetConsoleServer/AasxUaNetConsoleServer.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/BlazorExplorer/AasxMenuBlazor.cs b/src/BlazorExplorer/AasxMenuBlazor.cs index c1b6ba111..02f4ac68e 100644 --- a/src/BlazorExplorer/AasxMenuBlazor.cs +++ b/src/BlazorExplorer/AasxMenuBlazor.cs @@ -36,6 +36,7 @@ protected DoubleSidedDict _blazorItems public AasxMenu Menu { get => _menu; } private AasxMenu _menu = new AasxMenu(); + /* private void RenderItemCollection( AasxMenu topMenu, AasxMenu menuItems, object blazorItems, @@ -92,7 +93,7 @@ public void LoadAndRender( } - + */ public bool IsChecked(string name) { diff --git a/src/BlazorExplorer/BlazorExplorer.csproj b/src/BlazorExplorer/BlazorExplorer.csproj index 4d78b9b52..365ab523d 100644 --- a/src/BlazorExplorer/BlazorExplorer.csproj +++ b/src/BlazorExplorer/BlazorExplorer.csproj @@ -1,133 +1,133 @@ - - - - net6.0-windows - false - false - - - - - - - - BlazorExplorer.options.json - PreserveNewest - - - - - - - BlazorExplorer.options.json - PreserveNewest - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - - - - - - PreserveNewest - - - PreserveNewest - - - TextTemplatingFileGenerator - StylePile.txt - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - + + + + net6.0 + + false + + + + + + + + BlazorExplorer.options.json + PreserveNewest + + + + + + + BlazorExplorer.options.json + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + + + + + + PreserveNewest + + + PreserveNewest + + + TextTemplatingFileGenerator + StylePile.txt + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + PreserveNewest - - - True - True - StylePile.cs - - - - - - - - - - - - - ES2015 - React - ES6 - True - False - False - - - False - True - True - - - - - + + + True + True + StylePile.cs + + + + + + + + + + + + + ES2015 + React + ES6 + True + False + False + + + False + True + True + + + + + diff --git a/src/BlazorExplorer/BlazorVisualElements.cs b/src/BlazorExplorer/BlazorVisualElements.cs index 4825a6446..0c18de1ee 100644 --- a/src/BlazorExplorer/BlazorVisualElements.cs +++ b/src/BlazorExplorer/BlazorVisualElements.cs @@ -31,7 +31,7 @@ This source code may use other Open Source software components (see LICENSE.txt) using AasxIntegrationBase; using AnyUi; using BlazorUI.Data; -using System.Windows.Controls; +// using System.Windows.Controls; using AasxPackageExplorer; namespace BlazorUI diff --git a/src/BlazorExplorer/Data/AasxInfoBox.cs b/src/BlazorExplorer/Data/AasxInfoBox.cs index bae6f77b8..04c596b47 100644 --- a/src/BlazorExplorer/Data/AasxInfoBox.cs +++ b/src/BlazorExplorer/Data/AasxInfoBox.cs @@ -15,7 +15,7 @@ This source code may use other Open Source software components (see LICENSE.txt) using System.Globalization; using System.Threading; using System.Threading.Tasks; -using System.Windows.Media.Imaging; +// using System.Windows.Media.Imaging; using AasxIntegrationBase; using AasxPackageExplorer; using AasxPackageLogic; diff --git a/src/BlazorExplorer/Data/BlazorInputFileHandler.cs b/src/BlazorExplorer/Data/BlazorInputFileHandler.cs index 0661c8641..f831dad1c 100644 --- a/src/BlazorExplorer/Data/BlazorInputFileHandler.cs +++ b/src/BlazorExplorer/Data/BlazorInputFileHandler.cs @@ -8,7 +8,7 @@ This source code may use other Open Source software components (see LICENSE.txt) */ using AnyUi; using BlazorInputFile; -using static System.Windows.Forms.VisualStyles.VisualStyleElement; +// using static System.Windows.Forms.VisualStyles.VisualStyleElement; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; diff --git a/src/BlazorExplorer/Data/BlazorSession.CommandBindings.cs b/src/BlazorExplorer/Data/BlazorSession.CommandBindings.cs index b0953693d..0a97c6213 100644 --- a/src/BlazorExplorer/Data/BlazorSession.CommandBindings.cs +++ b/src/BlazorExplorer/Data/BlazorSession.CommandBindings.cs @@ -16,7 +16,7 @@ This source code may use other Open Source software components (see LICENSE.txt) using System.Linq; using System.Threading; using System.Threading.Tasks; -using System.Windows.Media.Imaging; +// using System.Windows.Media.Imaging; using AasxIntegrationBase; using AasxPackageExplorer; using AasxPackageLogic; diff --git a/src/BlazorExplorer/Data/BlazorSession.MainWindow.cs b/src/BlazorExplorer/Data/BlazorSession.MainWindow.cs index a90523310..9cf1b80a9 100644 --- a/src/BlazorExplorer/Data/BlazorSession.MainWindow.cs +++ b/src/BlazorExplorer/Data/BlazorSession.MainWindow.cs @@ -16,7 +16,7 @@ This source code may use other Open Source software components (see LICENSE.txt) using System.Text; using System.Threading; using System.Threading.Tasks; -using System.Windows.Media.Imaging; +// using System.Windows.Media.Imaging; using AasxIntegrationBase; using AasxPackageExplorer; using AasxPackageLogic; diff --git a/src/BlazorExplorer/Data/BlazorSession.cs b/src/BlazorExplorer/Data/BlazorSession.cs index cdde63a1a..b0f46f15d 100644 --- a/src/BlazorExplorer/Data/BlazorSession.cs +++ b/src/BlazorExplorer/Data/BlazorSession.cs @@ -18,8 +18,8 @@ This source code may use other Open Source software components (see LICENSE.txt) using System.Threading; using System.Threading.Tasks; using System.Windows; -using System.Windows.Media; -using System.Windows.Media.Imaging; +// using System.Windows.Media; +// using System.Windows.Media.Imaging; using AasxIntegrationBase; using AasxIntegrationBaseGdi; using AasxPackageExplorer; @@ -28,7 +28,7 @@ This source code may use other Open Source software components (see LICENSE.txt) using AdminShellNS; using AnyUi; using BlazorExplorer; -using ExhaustiveMatching; +// using ExhaustiveMatching; using Extensions; using Microsoft.JSInterop; using System.Linq; @@ -218,7 +218,7 @@ public BlazorSession() // Main menu MainMenu = new AasxMenuBlazor(); - MainMenu.LoadAndRender(logicalMainMenu, null, null); + // MainMenu.LoadAndRender(logicalMainMenu, null, null); // show Logo? if (Options.Curr.LogoFile != null) diff --git a/src/BlazorExplorer/Pages/AnyUiFlyoutModalPanel.razor b/src/BlazorExplorer/Pages/AnyUiFlyoutModalPanel.razor index 2ad588e75..27b8c88d5 100644 --- a/src/BlazorExplorer/Pages/AnyUiFlyoutModalPanel.razor +++ b/src/BlazorExplorer/Pages/AnyUiFlyoutModalPanel.razor @@ -31,6 +31,7 @@
@{ + /* var layout = MessageBoxFlyout.LayoutButtons(ddmp.DialogButtons, ddmp.ExtraButtons); foreach (var btn in layout) { @@ -43,6 +44,7 @@ } } + */ }
} diff --git a/src/BlazorExplorer/Pages/AnyUiRenderElem.razor b/src/BlazorExplorer/Pages/AnyUiRenderElem.razor index 97c0e9f59..09571fa5f 100644 --- a/src/BlazorExplorer/Pages/AnyUiRenderElem.razor +++ b/src/BlazorExplorer/Pages/AnyUiRenderElem.razor @@ -6,7 +6,7 @@ @using AnyUi @using BlazorUI.Data @using BlazorUI.Pages -@using UIComponents.Flags +@* @using UIComponents.Flags *@ @inject BlazorUI.Data.AASService SubmodelService @inject BlazorUI.Data.BlazorSession bi @@ -489,8 +489,8 @@ style.SetMinMaxWidthHeight(Element); - var country = Country.DE; - var size = FlagSize.Small; + // var country = Country.DE; + // var size = FlagSize.Small;