Skip to content

Fix browser and bump nugets #307

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

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

Fix browser and bump nugets #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e525dbb
* update
festo-i40 Nov 9, 2025
0439f52
* update
festo-i40 Nov 10, 2025
04b29f7
* set nugets to newer versions
festo-i40 Nov 10, 2025
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
2 changes: 1 addition & 1 deletion src/AasCore.Aas3_0/AasCore.Aas3_0.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
<PackageTags>aas;asset administration shell;iiot;industry internet of things;industrie 4.0;i4.0</PackageTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions src/AasxAmlImExport/AasxAmlImExport.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<EmbeddedResource Include="Resources\AssetAdministrationShellLib.aml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Aml.Engine" Version="2.0.9" />
<PackageReference Include="dotNetRDF" Version="2.7.5" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="Aml.Engine" Version="4.4.4" />
<PackageReference Include="dotNetRDF" Version="3.4.1" />
<PackageReference Include="System.Drawing.Common" Version="9.0.10" />
<PackageReference Include="System.IO.Packaging" Version="9.0.10" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.Json" Version="9.0.2" />
<PackageReference Include="System.Text.Json" Version="9.0.10" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions src/AasxBammRdfImExport/AasxBammRdfImExport.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<ProjectReference Include="..\AasxIntegrationBase\AasxIntegrationBase.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="dotNetRDF" Version="2.7.5" />
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="dotNetRDF" Version="3.4.1" />
<PackageReference Include="JetBrains.Annotations" Version="2025.2.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="System.Drawing.Common" Version="9.0.10" />
<PackageReference Include="System.IO.Packaging" Version="9.0.10" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/AasxCore.Samm2_2_0/AasxCore.Samm2_2_0.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="System.IO.Packaging" Version="9.0.10" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/AasxCsharpLibrary/AasxCsharpLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
<EmbeddedResource Include="Resources\schemaV201\aas.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.0.2" />
<PackageReference Include="Namotion.Reflection" Version="2.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NJsonSchema" Version="10.8.0" />
<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="JetBrains.Annotations" Version="2025.2.2" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
<PackageReference Include="Namotion.Reflection" Version="3.4.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="NJsonSchema" Version="11.5.2" />
<PackageReference Include="System.ComponentModel.Composition" Version="9.0.10" />
<PackageReference Include="System.IO.Packaging" Version="9.0.10" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AasCore.Aas3_0\AasCore.Aas3_0.csproj" />
Expand Down
6 changes: 3 additions & 3 deletions src/AasxDictionaryImport/AasxDictionaryImport.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<ProjectReference Include="..\AasxWpfControlLibrary\AasxWpfControlLibrary.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ExcelDataReader" Version="3.6.0" />
<PackageReference Include="ExcelDataReader" Version="3.8.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
<PackageReference Include="RestSharp" Version="112.1.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.2" />
<PackageReference Include="System.Text.Json" Version="9.0.2" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
<PackageReference Include="System.Text.Json" Version="9.0.10" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions src/AasxFileServerRestLibrary/AasxFileServerRestLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<Using Include="AasCore.Aas3_0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="JsonSubTypes" Version="1.9.0" />
<PackageReference Include="JsonSubTypes" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="RestSharp" Version="112.1.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.2" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.10" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AasCore.Aas3_0\AasCore.Aas3_0.csproj" />
Expand Down
6 changes: 3 additions & 3 deletions src/AasxFormatCst/AasxFormatCst.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<ProjectReference Include="..\AasxIntegrationBase\AasxIntegrationBase.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="JetBrains.Annotations" Version="2025.2.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="System.IO.Packaging" Version="9.0.10" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/AasxIntegrationBase/AasxIntegrationBase.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ProjectReference Include="..\AnyUi\AnyUi.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="System.IO.Packaging" Version="9.0.10" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions src/AasxIntegrationBaseGdi/AasxIntegrationBaseGdi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.10.0" />
<PackageReference Include="Magick.NET.Core" Version="13.10.0" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.9.1" />
<PackageReference Include="Magick.NET.Core" Version="14.9.1" />
<PackageReference Include="System.Drawing.Common" Version="9.0.10" />
<PackageReference Include="System.IO.Packaging" Version="9.0.10" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/AasxIntegrationBaseWpf/AasxIntegrationBaseWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ExhaustiveMatching.Analyzer" Version="0.5.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.10" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.2" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
</ItemGroup>
<ItemGroup>
<Page Remove="OriginalResources\FormSmaller.xaml" />
Expand Down
4 changes: 2 additions & 2 deletions src/AasxIntegrationEmptySample/AasxIntegrationEmptySample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ProjectReference Include="..\AasxIntegrationBase\AasxIntegrationBase.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="JetBrains.Annotations" Version="2025.2.2" />
<PackageReference Include="System.IO.Packaging" Version="9.0.10" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/AasxMqtt/AasxMqtt.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<ProjectReference Include="..\AasxIntegrationBase\AasxIntegrationBase.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
<PackageReference Include="JetBrains.Annotations" Version="2025.2.2" />
<PackageReference Include="MQTTnet" Version="3.0.5" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="System.IO.Packaging" Version="9.0.10" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions src/AasxMqttClient/AasxMqttClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Grapevine" Version="4.2.2" />
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
<PackageReference Include="MQTTnet" Version="4.1.1.318" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="JetBrains.Annotations" Version="2025.2.2" />
<PackageReference Include="MQTTnet" Version="3.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="System.IO.Packaging" Version="9.0.10" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/AasxMqttClient/MqttClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ This source code may use other Open Source software components (see LICENSE.txt)
using Extensions;
using MQTTnet;
using MQTTnet.Client;
using MQTTnet.Client.Options;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion src/AasxOpcUa2Client/AasxOpcUa2Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="System.IO.Packaging" Version="9.0.10" />
<PackageReference Include="Workstation.UaClient" Version="3.2.3" />
</ItemGroup>

Expand Down
10 changes: 5 additions & 5 deletions src/AasxOpenidClient/AasxOpenidClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="IdentityModel" Version="6.0.0" />
<PackageReference Include="jose-jwt" Version="4.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.1.2" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0" />
<PackageReference Include="System.Text.Json" Version="9.0.2" />
<PackageReference Include="jose-jwt" Version="5.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
<PackageReference Include="System.IO.Packaging" Version="9.0.10" />
<PackageReference Include="System.Text.Json" Version="9.0.10" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AasxIntegrationBase\AasxIntegrationBase.csproj" />
Expand Down
18 changes: 9 additions & 9 deletions src/AasxPackageExplorer/AasxPackageExplorer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,21 +149,21 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="AvalonEdit" Version="6.2.0.78" />
<PackageReference Include="AvalonEdit" Version="6.3.1.120" />
<PackageReference Include="ExhaustiveMatching.Analyzer" Version="0.5.0" />
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
<PackageReference Include="jose-jwt" Version="4.0.1" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.10.0" />
<PackageReference Include="Magick.NET.Core" Version="13.10.0" />
<PackageReference Include="JetBrains.Annotations" Version="2025.2.2" />
<PackageReference Include="jose-jwt" Version="5.2.0" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.9.1" />
<PackageReference Include="Magick.NET.Core" Version="14.9.1" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="RestSharp" Version="112.1.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.10" />
<PackageReference Include="SSharp.Net" Version="1.0.1" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.2" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
<PackageReference Include="System.Text.Json" Version="9.0.2" />
<PackageReference Include="System.Text.Json" Version="9.0.10" />
<PackageReference Include="Workstation.UaClient" Version="3.2.3" />
</ItemGroup>
<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/AasxPackageExplorer/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ This source code may use other Open Source software components (see LICENSE.txt)
using J2N;
using Microsoft.Win32;
using Newtonsoft.Json;
using NPOI.POIFS.Properties;
using System;
using System.Collections;
using System.Collections.Generic;
Expand Down
7 changes: 5 additions & 2 deletions src/AasxPackageExplorer/options-debug.MIHO.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// "AasxToLoad": "http://localhost:8081/shells/aHR0cHM6Ly9hZG1pbi1zaGVsbC1pby9pZHRhL2Fhcy9Qcm9kdWN0Q2hhbmdlTm90aWZpY2F0aW9ucy8xLzA"
// "AasxToLoad": "http://localhost:8081/shells/aHR1cHM6Ly9hZG1pbi1zaGVsbC1pby9pZHRhL2Fhcy9Qcm9kdWN0Q2hhbmdlTm90aWZpY2F0aW9ucy8xLzA"
// "AasxToLoad": "C:\\Users\\Micha\\Desktop\\test-smt-on-basyx\\IDTA_02036-1-0_SMT_ProductChangeNotification_Draft_v35_manual_fixes.aasx"
"AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\SMT\\IDTA 02036-1-0_Submodel_ProductChangeNotification\\IDTA_02036-1-0_SMT_ProductChangeNotification_Draft_v40_add_podman.aasx"
"AasxToLoad": "C:\\HOMI\\Develop\\Aasx\\SMT\\IDTA 02036-1-0_Submodel_ProductChangeNotification\\IDTA_02036-1-0_SMT_ProductChangeNotification_Draft_v41_check_IRDIs.aasx"
/* This file shall be loaded as aux package at start of application | Arg: <path> */,
"AuxToLoad": null
/* List of pathes to a JSON, defining a set of AasxPackage-Files, which serve as repository. | Arg: <path> */,
Expand All @@ -19,7 +19,10 @@
"C:\\HOMI\\Develop\\Aasx\\repo\\phoenix-api-key.json",
"C:\\HOMI\\Develop\\Aasx\\repo\\local-basyx.json",
"C:\\HOMI\\Develop\\Aasx\\repo\\reg-of-reg-voyager.json",
"C:\\HOMI\\Develop\\Aasx\\repo\\phoenix-big.json"
"C:\\HOMI\\Develop\\Aasx\\repo\\phoenix-big.json",
"C:\\HOMI\\Develop\\Aasx\\repo\\Festo-basyx.json",
"C:\\HOMI\\Develop\\Aasx\\repo\\Festo-apigee.json",
"C:\\HOMI\\Develop\\Aasx\\repo\\reg-of-reg-plugfest3.json"
]
/* When connecting to given URIs, auto-authenticate by matching with known endpoints. */,
"AutoAuthenticateUris": true
Expand Down
14 changes: 7 additions & 7 deletions src/AasxPackageLogic/AasxPackageLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="dotNetRdf" Version="3.1.1" />
<PackageReference Include="dotNetRdf" Version="3.4.1" />
<PackageReference Include="IdentityModel" Version="6.0.0" />
<PackageReference Include="jose-jwt" Version="4.0.1" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.74.0" />
<PackageReference Include="jose-jwt" Version="5.2.0" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.78.0" />
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="RestSharp" Version="112.1.0" />
<PackageReference Include="SSharp.Net" Version="1.0.1" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.2" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.1.2" />
<PackageReference Include="System.Text.Json" Version="9.0.2" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
<PackageReference Include="System.Text.Json" Version="9.0.10" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/AasxPackageLogic/DispEditHelperBasics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2651,7 +2651,8 @@ public void EntityListUpDownDeleteHelper<T>(
if (list.Count < 1)
setOutputList?.Invoke(null);

await postActionHookAsync?.Invoke(theMenu?.ElementAt(buttonNdx)?.Name, ticket);
if (postActionHookAsync != null)
await postActionHookAsync.Invoke(theMenu?.ElementAt(buttonNdx)?.Name, ticket);

this.AddDiaryEntry(entityRf,
new DiaryEntryStructChange(StructuralChangeReason.Delete),
Expand Down
5 changes: 5 additions & 0 deletions src/AasxPackageLogic/PackageCentral/KnownEndpointDescription.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@ public class SecurityAccessUserInfo
/// Note: Default is rather short because of secure by design
/// </summary>
public int RenewPeriodMins = 5;

/// <summary>
/// Scope to be send with the token generation access to be embedded into
/// </summary>
public string Scope = "";
}

public class KnownEndpointDescription
Expand Down
Loading
Loading