diff --git a/.github/workflows/CodeQuality.yml b/.github/workflows/CodeQuality.yml index f3b9d0aa5..113daac92 100644 --- a/.github/workflows/CodeQuality.yml +++ b/.github/workflows/CodeQuality.yml @@ -14,19 +14,19 @@ jobs: name: Build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6.0.2 + - uses: actions/checkout@v6.0.2 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 17 - uses: actions/setup-java@v5.2.0 + - name: Set up JDK 17 + uses: actions/setup-java@v5.2.0 with: distribution: 'temurin' java-version: '17' overwrite-settings: false - - name: Setup dotnet - uses: actions/setup-dotnet@v5.1.0 + - name: Setup dotnet + uses: actions/setup-dotnet@v5.1.0 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' - name: Restore dependencies run: dotnet restore SysML2.NET.sln diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b83dfa8e5..65ec8ac05 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -12,28 +12,28 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v6.0.2 + - name: Checkout repository + uses: actions/checkout@v6.0.2 with: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. fetch-depth: 2 # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 # Override language selection by uncommenting this and choosing your languages with: languages: csharp - - name: Setup .NET Core - uses: actions/setup-dotnet@v5.1.0 + - name: Setup .NET Core + uses: actions/setup-dotnet@v5.1.0 with: - dotnet-version: 9.0.x + dotnet-version: '10.0.x' - name: Install dependencies run: dotnet restore - name: Build run: dotnet build --configuration Release --no-restore - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/nuget-reference-check.yml b/.github/workflows/nuget-reference-check.yml index 8286894ee..1918b7504 100644 --- a/.github/workflows/nuget-reference-check.yml +++ b/.github/workflows/nuget-reference-check.yml @@ -20,7 +20,7 @@ jobs: - name: Setup .NET Environment uses: actions/setup-dotnet@v5.1.0 with: - dotnet-version: 9.0.x + dotnet-version: '10.0.x' - name: Install dependencies run: dotnet restore SysML2.NET.sln diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a411eb60..7d2fab11c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v5.1.0 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' - name: Set date run: | diff --git a/README.md b/README.md index 8f24aa60a..d6964cbec 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ project [SysML2.NET](https://www.nuget.org/packages/SysML2.NET) | ![NuGet Version](https://img.shields.io/nuget/v/SysML2.NET) [SysML2.NET.Extensions](https://www.nuget.org/packages/SysML2.NET.Extensions) | ![NuGet Version](https://img.shields.io/nuget/v/SysML2.NET.Extensions) [SysML2.NET.Serializer.Json](https://www.nuget.org/packages/SysML2.NET.Serializer.Json) | ![NuGet Version](https://img.shields.io/nuget/v/SysML2.NET.Serializer.Json) +[SysML2.NET.Serializer.Json](https://www.nuget.org/packages/SysML2.NET.Serializer.Xmi) | ![NuGet Version](https://img.shields.io/nuget/v/SysML2.NET.Serializer.Xmi) [SysML2.NET.Serializer.MessagePack](https://www.nuget.org/packages/SysML2.NET.Serializer.MessagePack) | ![NuGet Version](https://img.shields.io/nuget/v/SysML2.NET.Serializer.MessagePack) [SysML2.NET.Kpar](https://www.nuget.org/packages/SysML2.NET.Kpar) | ![NuGet Version](https://img.shields.io/nuget/v/SysML2.NET.Kpar) [SysML2.NET.REST](https://www.nuget.org/packages/SysML2.NET.REST) | ![NuGet Version](https://img.shields.io/nuget/v/SysML2.NET.REST) diff --git a/SySML2.NET.REST.Tests/SySML2.NET.REST.Tests.csproj b/SySML2.NET.REST.Tests/SySML2.NET.REST.Tests.csproj index 75c997ac8..31df76fb5 100644 --- a/SySML2.NET.REST.Tests/SySML2.NET.REST.Tests.csproj +++ b/SySML2.NET.REST.Tests/SySML2.NET.REST.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 12.0 Starion Group S.A. Sam Gerene @@ -18,17 +18,17 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SySML2.NET.REST/SySML2.NET.REST.csproj b/SySML2.NET.REST/SySML2.NET.REST.csproj index 8877a6745..be62bad64 100644 --- a/SySML2.NET.REST/SySML2.NET.REST.csproj +++ b/SySML2.NET.REST/SySML2.NET.REST.csproj @@ -3,7 +3,7 @@ netstandard2.1 12.0 - 0.18.0 + 0.19.0 A .NET implementation of the OMG SysML v2 REST/HTTP PSM Client SysML2.NET.REST Starion Group S.A. @@ -14,8 +14,7 @@ Sam Gerené true - [Update] to SysML2.NET.Serializer.Json version 0.18.0 - [Regenerate] based on KerML_only_xmi.uml and SysML_only_xmi.uml from Commit f1fd2b83e460f5695e8edcd780f43909f359d299 - ST6RI-854 Updated metamodel files to latest Beta 4 version. + [Update] to SysML2.NET.Serializer.Json version 0.19.0 cdp4-icon.png README.md diff --git a/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj b/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj index 21fa94956..553e3d995 100644 --- a/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj +++ b/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 12.0 Starion Group S.A. Sam Gerene @@ -1070,21 +1070,21 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj b/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj index 16e43354b..eb2f99cc2 100644 --- a/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj +++ b/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj @@ -1,8 +1,8 @@  - net9.0 + net10.0 12.0 - 0.16.0 + 0.19.0 A Library to generate SysML v2 code. SysML2.NET Starion Group S.A. @@ -27,7 +27,7 @@ --> - + diff --git a/SysML2.NET.Dal.Tests/SysML2.NET.Dal.Tests.csproj b/SysML2.NET.Dal.Tests/SysML2.NET.Dal.Tests.csproj index 6c13b4ca4..8852b9ca7 100644 --- a/SysML2.NET.Dal.Tests/SysML2.NET.Dal.Tests.csproj +++ b/SysML2.NET.Dal.Tests/SysML2.NET.Dal.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 12.0 Starion Group S.A. Sam Gerene @@ -18,17 +18,17 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SysML2.NET.Dal/SysML2.NET.Dal.csproj b/SysML2.NET.Dal/SysML2.NET.Dal.csproj index 2464ec52f..a8aec3c16 100644 --- a/SysML2.NET.Dal/SysML2.NET.Dal.csproj +++ b/SysML2.NET.Dal/SysML2.NET.Dal.csproj @@ -3,7 +3,7 @@ netstandard2.1 12.0 - 0.18.0 + 0.19.0 A .NET implementation of the OMG SysML v2 specification data-acces-layer. SysML2.NET.Dal Starion Group S.A. @@ -14,8 +14,7 @@ Sam Gerené true - [Update] to SysML2.NET.Extensions version 0.18.0 - [Regenerate] based on KerML_only_xmi.uml and SysML_only_xmi.uml from Commit f1fd2b83e460f5695e8edcd780f43909f359d299 - ST6RI-854 Updated metamodel files to latest Beta 4 version. + [Update] to SysML2.NET.Extensions version 0.19.0 cdp4-icon.png README.md diff --git a/SysML2.NET.Extensions.Tests/SysML2.NET.Extensions.Tests.csproj b/SysML2.NET.Extensions.Tests/SysML2.NET.Extensions.Tests.csproj index 669eb6538..6f66ed147 100644 --- a/SysML2.NET.Extensions.Tests/SysML2.NET.Extensions.Tests.csproj +++ b/SysML2.NET.Extensions.Tests/SysML2.NET.Extensions.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 12.0 Starion Group S.A. Sam Gerene @@ -18,17 +18,17 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SysML2.NET.Extensions/SysML2.NET.Extensions.csproj b/SysML2.NET.Extensions/SysML2.NET.Extensions.csproj index 9e929b5cf..01b3463dc 100644 --- a/SysML2.NET.Extensions/SysML2.NET.Extensions.csproj +++ b/SysML2.NET.Extensions/SysML2.NET.Extensions.csproj @@ -3,7 +3,7 @@ netstandard2.1 12.0 - 0.18.0 + 0.19.0 A .NET implementation of the OMG SysML v2 specification Extension and Helper methods. SysML2.NET.Extensions Starion Group S.A. @@ -14,8 +14,8 @@ Sam Gerené true - [Update] to SysML2.NET version 0.18.0 - [Regenerate] based on KerML_only_xmi.uml and SysML_only_xmi.uml from Commit f1fd2b83e460f5695e8edcd780f43909f359d299 - ST6RI-854 Updated metamodel files to latest Beta 4 version. + [Update] to SysML2.NET version 0.19.0 + [Add] ModelInterchange Namespace to support kpar cdp4-icon.png README.md diff --git a/SysML2.NET.Kpar.Tests/SysML2.NET.Kpar.Tests.csproj b/SysML2.NET.Kpar.Tests/SysML2.NET.Kpar.Tests.csproj index c4afd5cf5..1b9cd8e88 100644 --- a/SysML2.NET.Kpar.Tests/SysML2.NET.Kpar.Tests.csproj +++ b/SysML2.NET.Kpar.Tests/SysML2.NET.Kpar.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 12.0 Starion Group S.A. Sam Gerene @@ -55,22 +55,22 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/SysML2.NET.Kpar/SysML2.NET.Kpar.csproj b/SysML2.NET.Kpar/SysML2.NET.Kpar.csproj index 020b0d160..b571dc28b 100644 --- a/SysML2.NET.Kpar/SysML2.NET.Kpar.csproj +++ b/SysML2.NET.Kpar/SysML2.NET.Kpar.csproj @@ -5,7 +5,7 @@ netstandard2.1 12.0 - 0.18.0 + 0.19.0 A .NET implementation of the OMG SysML v2 specification. SysML2.NET.Kpar Starion Group S.A. @@ -16,7 +16,7 @@ Sam Gerené true - [Initial] Version + [Update] to SysML2.NET.Extensions version 0.19.0 cdp4-icon.png README.md @@ -26,7 +26,6 @@ - diff --git a/SysML2.NET.Serializer.Json.Tests/SysML2.NET.Serializer.Json.Tests.csproj b/SysML2.NET.Serializer.Json.Tests/SysML2.NET.Serializer.Json.Tests.csproj index a25aaaabb..f8418d6fe 100644 --- a/SysML2.NET.Serializer.Json.Tests/SysML2.NET.Serializer.Json.Tests.csproj +++ b/SysML2.NET.Serializer.Json.Tests/SysML2.NET.Serializer.Json.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 12.0 Starion Group S.A. Sam Gerene @@ -18,17 +18,17 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SysML2.NET.Serializer.Json/SysML2.NET.Serializer.Json.csproj b/SysML2.NET.Serializer.Json/SysML2.NET.Serializer.Json.csproj index 8185ae196..fa701e1e3 100644 --- a/SysML2.NET.Serializer.Json/SysML2.NET.Serializer.Json.csproj +++ b/SysML2.NET.Serializer.Json/SysML2.NET.Serializer.Json.csproj @@ -3,7 +3,7 @@ netstandard2.1 12.0 - 0.18.0 + 0.19.0 A .NET implementation of the OMG SysML v2 JSON serializer. SysML2.NET.Serializer.Json Starion Group S.A. @@ -14,8 +14,8 @@ Sam Gerené true - [Update] to SysML2.NET.Extensions version 0.18.0 - [Regenerate] based on KerML_only_xmi.uml and SysML_only_xmi.uml from Commit f1fd2b83e460f5695e8edcd780f43909f359d299 - ST6RI-854 Updated metamodel files to latest Beta 4 version. + [Update] to SysML2.NET.Extensions version 0.19.0 + [Update] System.Text.Json to vesion 10.0.3 cdp4-icon.png README.md @@ -24,8 +24,7 @@ - - + diff --git a/SysML2.NET.Serializer.MessagePack.Tests/SysML2.NET.Serializer.MessagePack.Tests.csproj b/SysML2.NET.Serializer.MessagePack.Tests/SysML2.NET.Serializer.MessagePack.Tests.csproj index 99ebff1ea..e88683fae 100644 --- a/SysML2.NET.Serializer.MessagePack.Tests/SysML2.NET.Serializer.MessagePack.Tests.csproj +++ b/SysML2.NET.Serializer.MessagePack.Tests/SysML2.NET.Serializer.MessagePack.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 12.0 Starion Group S.A. Sam Gerene @@ -18,17 +18,17 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SysML2.NET.Serializer.MessagePack/SysML2.NET.Serializer.MessagePack.csproj b/SysML2.NET.Serializer.MessagePack/SysML2.NET.Serializer.MessagePack.csproj index 911e4e20f..6adde22e3 100644 --- a/SysML2.NET.Serializer.MessagePack/SysML2.NET.Serializer.MessagePack.csproj +++ b/SysML2.NET.Serializer.MessagePack/SysML2.NET.Serializer.MessagePack.csproj @@ -2,7 +2,7 @@ netstandard2.1 12.0 - 0.18.0 + 0.19.0 A .NET implementation of the OMG SysML v2 MessagePack serializer. SysML2.NET.Serializer.MessagePack Starion Group S.A. @@ -13,8 +13,8 @@ Sam Gerené true - [Update] to SysML2.NET.Extensions version 0.18.0 - [Regenerate] based on KerML_only_xmi.uml and SysML_only_xmi.uml from Commit f1fd2b83e460f5695e8edcd780f43909f359d299 - ST6RI-854 Updated metamodel files to latest Beta 4 version. + [Update] to SysML2.NET.Extensions version 0.19.0 + [Update] System.IO.Pipelines to version 10.0.3 cdp4-icon.png README.md @@ -29,7 +29,7 @@ - + diff --git a/SysML2.NET.Serializer.Xmi.Tests/SysML2.NET.Serializer.Xmi.Tests.csproj b/SysML2.NET.Serializer.Xmi.Tests/SysML2.NET.Serializer.Xmi.Tests.csproj index a5f37fa95..0cbcab687 100644 --- a/SysML2.NET.Serializer.Xmi.Tests/SysML2.NET.Serializer.Xmi.Tests.csproj +++ b/SysML2.NET.Serializer.Xmi.Tests/SysML2.NET.Serializer.Xmi.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 12.0 Starion Group S.A. Sam Gerene @@ -18,17 +18,17 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SysML2.NET.Serializer.Xmi/SysML2.NET.Serializer.Xmi.csproj b/SysML2.NET.Serializer.Xmi/SysML2.NET.Serializer.Xmi.csproj index 2e184079b..fc70d1ee9 100644 --- a/SysML2.NET.Serializer.Xmi/SysML2.NET.Serializer.Xmi.csproj +++ b/SysML2.NET.Serializer.Xmi/SysML2.NET.Serializer.Xmi.csproj @@ -14,6 +14,7 @@ Sam Gerené, Théate Antoine true + [Update] to SysML2.NET.Extensions version 0.19.0 cdp4-icon.png README.md diff --git a/SysML2.NET.Viewer.Tests/SysML2.NET.Viewer.Tests.csproj b/SysML2.NET.Viewer.Tests/SysML2.NET.Viewer.Tests.csproj index b264a499c..2e75a97ab 100644 --- a/SysML2.NET.Viewer.Tests/SysML2.NET.Viewer.Tests.csproj +++ b/SysML2.NET.Viewer.Tests/SysML2.NET.Viewer.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 12.0 Starion Group S.A. Sam Gerene @@ -19,18 +19,18 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SysML2.NET.Viewer/SysML2.NET.Viewer.csproj b/SysML2.NET.Viewer/SysML2.NET.Viewer.csproj index 32c03216b..2cf6b3538 100644 --- a/SysML2.NET.Viewer/SysML2.NET.Viewer.csproj +++ b/SysML2.NET.Viewer/SysML2.NET.Viewer.csproj @@ -5,11 +5,11 @@ 12.0 Starion Group S.A. SysML2 Viewer - 0.18.0 + 0.19.0 Web Application to inspect SysML2 model server Copyright © Starion Group S.A. Sam Gerené - Debug;Release + Debug;Release https://github.com/STARIONGROUP/SysML2.NET.git Git false @@ -19,11 +19,11 @@ - - - + + + - + diff --git a/SysML2.NET/SysML2.NET.csproj b/SysML2.NET/SysML2.NET.csproj index c8d3f7851..15f1e48dc 100644 --- a/SysML2.NET/SysML2.NET.csproj +++ b/SysML2.NET/SysML2.NET.csproj @@ -5,7 +5,7 @@ netstandard2.1 12.0 - 0.18.0 + 0.19.0 A .NET implementation of the OMG SysML v2 specification. SysML2.NET Starion Group S.A. @@ -16,7 +16,9 @@ Sam Gerené true - [Regenerate] based on KerML_only_xmi.uml and SysML_only_xmi.uml from Commit f1fd2b83e460f5695e8edcd780f43909f359d299 - ST6RI-854 Updated metamodel files to latest Beta 4 version. + [Add] ModelInterchange Namespace to support kpar + [Implement] containment helper methods + [Update] Microsoft.Extensions.Logging.Abstractions to version 10.0.3 cdp4-icon.png README.md @@ -25,7 +27,7 @@ - +