[Update] dependencies

[Update] to net8
STARIONGROUP · Apr 14, 2024 · 9c20e01 · 9c20e01
1 parent 207fe4a
commit 9c20e01
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 41 deletions.
diff --git a/.github/workflows/CodeQuality.yml b/.github/workflows/CodeQuality.yml
@@ -13,10 +13,16 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          overwrite-settings: false
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
 
       - name: Restore dependencies
         run: dotnet restore

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -29,7 +29,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/DEH-REQIF-APP/DEH-REQIF.Console.csproj b/DEH-REQIF-APP/DEH-REQIF.Console.csproj
@@ -2,12 +2,12 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>DEHReqIF.Console</RootNamespace>
         <Version>0.2.0</Version>
         <Description>A Commandline application used to convert an E-TM-10-25 data source into a ReqIF document.</Description>
         <Company>RHEA System S.A.</Company>
-        <Copyright>Copyright 2022-2023 RHEA System S.A.</Copyright>
+        <Copyright>Copyright 2022-2024 RHEA System S.A.</Copyright>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
         <RepositoryUrl>https://github.com/RHEAGROUP/DEH-REQIF.git</RepositoryUrl>
         <RepositoryType>Git</RepositoryType>
@@ -25,13 +25,13 @@
 
     <ItemGroup>
         <PackageReference Include="Autofac" Version="7.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+
+        <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
-        <PackageReference Include="NLog" Version="5.0.1" />
-        <PackageReference Include="NLog.Extensions.Logging" Version="5.0.1" />
+        <PackageReference Include="NLog" Version="5.2.8" />
+        <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/DEH-REQIF.Console.Tests/DEH-REQIF.Console.Tests.csproj b/DEH-REQIF.Console.Tests/DEH-REQIF.Console.Tests.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Description>Unit tests for the DEH-ReqIF Console application.</Description>
         <Company>RHEA System S.A.</Company>
-        <Copyright>Copyright 2022-2023 RHEA System S.A.</Copyright>
+        <Copyright>Copyright 2022-2024 RHEA System S.A.</Copyright>
         <RepositoryUrl>https://github.com/RHEAGROUP/DEH-REQIF.git</RepositoryUrl>
         <RepositoryType>Git</RepositoryType>
         <RootNamespace>DEHReqIF.Console.Tests</RootNamespace>
@@ -13,20 +13,20 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
-        <PackageReference Include="Moq" Version="4.18.4" />
-        <PackageReference Include="NUnit" Version="3.13.3" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="Moq" Version="4.20.70" />
+        <PackageReference Include="NUnit" Version="4.1.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-        <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+        <PackageReference Include="NUnit.Analyzers" Version="4.1.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="NUnit.Console" Version="3.16.3" />
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
+        <PackageReference Include="NUnit.Console" Version="3.17.0" />
+        <PackageReference Include="coverlet.collector" Version="6.0.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.msbuild" Version="6.0.0">
+        <PackageReference Include="coverlet.msbuild" Version="6.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/DEH-REQIF.Tests/DEH-REQIF.Tests.csproj b/DEH-REQIF.Tests/DEH-REQIF.Tests.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Description>Unit tests for the DEH-ReqIF library.</Description>
         <Company>RHEA System S.A.</Company>
-        <Copyright>Copyright 2022-2023 RHEA System S.A.</Copyright>
+        <Copyright>Copyright 2022-2024 RHEA System S.A.</Copyright>
         <RepositoryUrl>https://github.com/RHEAGROUP/DEH-REQIF.git</RepositoryUrl>
         <RepositoryType>Git</RepositoryType>
         <RootNamespace>DEHReqIF.Tests</RootNamespace>
@@ -13,20 +13,20 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
-        <PackageReference Include="Moq" Version="4.18.4" />
-        <PackageReference Include="NUnit" Version="3.13.3" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="Moq" Version="4.20.70" />
+        <PackageReference Include="NUnit" Version="4.1.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-        <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+        <PackageReference Include="NUnit.Analyzers" Version="4.1.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="NUnit.Console" Version="3.16.3" />
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
+        <PackageReference Include="NUnit.Console" Version="3.17.0" />
+        <PackageReference Include="coverlet.collector" Version="6.0.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.msbuild" Version="6.0.0">
+        <PackageReference Include="coverlet.msbuild" Version="6.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/DEH-REQIF.Tests/MappingRules/ParameterTypes/ScalarParameterTypeMappingRuleTestFixture.cs b/DEH-REQIF.Tests/MappingRules/ParameterTypes/ScalarParameterTypeMappingRuleTestFixture.cs
@@ -48,7 +48,9 @@ public class ScalarParameterTypeMappingRuleTestFixture
         [SetUp]
         public void SetUp()
         {
-            this.assembler = new Assembler(this.uri);
+            var messagebus = new CDPMessageBus();
+
+            this.assembler = new Assembler(this.uri, messagebus);
 
             this.scalarParameterTypeMappingRule = new ScalarParameterTypeMappingRule();
         }

diff --git a/DEH-REQIF.Tests/ReqIFBuilderTestFixture.cs b/DEH-REQIF.Tests/ReqIFBuilderTestFixture.cs
@@ -96,13 +96,28 @@ public async Task Setup()
             this.engineeringModelIid = Guid.NewGuid();
             this.iterationIid = Guid.NewGuid();
 
-            this.assembler = new Assembler(this.uri);
+            var messagebus = new CDPMessageBus();
+
+            this.assembler = new Assembler(this.uri, messagebus);
 
             this.CreateExportSettings();
             await this.CreateTemplateReqIF();
             this.PopulateRequirementsData();
         }
 
+        [TearDown]
+        public void TearDown()
+        {
+            this.memoryTarget.Dispose();
+
+            this.iteration.Dispose();
+            this.requirementsGroup1.Dispose();
+            this.requirementsGroup2.Dispose();
+            this.requirement0.Dispose();
+            this.requirement1.Dispose();
+            this.requirement2.Dispose();
+        }
+
         private void CreateExportSettings()
         {
             var referenceMap = new ExternalIdentifierMap();
@@ -415,7 +430,7 @@ public void Verify_that_alternative_id_tags_are_added()
             stream.Position = 0;
             var reqIfXml = new StreamReader(stream).ReadToEnd();
 
-            Assert.IsTrue(reqIfXml.ToLower().Contains("<alternative-id")); 
+            Assert.That(reqIfXml.ToLower().Contains("<alternative-id"), Is.True); 
         }
 
         [Test]

diff --git a/DEH-REQIF.sln.DotSettings b/DEH-REQIF.sln.DotSettings
@@ -2,7 +2,7 @@
 	<s:String x:Key="/Default/CodeEditing/GenerateMemberBody/DocumentationGenerationKind/@EntryValue">Copy</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/ThisQualifier/INSTANCE_MEMBERS_QUALIFY_MEMBERS/@EntryValue">Field, Property, Event, Method</s:String>
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue"> -------------------------------------------------------------------------------------------------
- &lt;copyright file="$FILENAME$" company="RHEA System S.A."&gt;
+ &lt;copyright file="${File.FileName}" company="RHEA System S.A."&gt;
 
    Copyright 2022 RHEA System S.A.
 
@@ -22,4 +22,5 @@
  -------------------------------------------------------------------------------------------------</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=DEHREQIF/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/DEH-REQIF/DEH-REQIF.csproj b/DEH-REQIF/DEH-REQIF.csproj
@@ -7,13 +7,15 @@
         <Description>A .NET library to conver ECSS-E-TM-10-25 requirements to an OMG ReqIF file.</Description>
         <PackageId>DEH-ReqIF</PackageId>
         <Company>RHEA System S.A.</Company>
-        <Copyright>Copyright 2022-2023 RHEA System S.A.</Copyright>
+        <Copyright>Copyright 2022-2024 RHEA System S.A.</Copyright>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
         <RepositoryUrl>https://github.com/RHEAGROUP/DEH-REQIF.git</RepositoryUrl>
         <RepositoryType>Git</RepositoryType>
-        <PackageTags>ReqIF ECSS-E-TM-10-25 COMET</PackageTags>
+        <PackageTags>ReqIF ECSS-E-TM-10-25 CDP4-COMET</PackageTags>
         <Authors>Sam Gerené</Authors>
         <RequireLicenseAcceptance>false</RequireLicenseAcceptance>
+        <IncludeSource>true</IncludeSource>
+        <IncludeSymbols>true</IncludeSymbols>
         <PackageReleaseNotes>
             [Initial Version]
         </PackageReleaseNotes>
@@ -27,11 +29,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="CDP4ServicesDal-CE" Version="9.0.0" />
-        <PackageReference Include="NLog" Version="5.0.1" />
-        <PackageReference Include="NLog.Extensions.Logging" Version="5.0.1" />
-        <PackageReference Include="ReqIFSharp.Extensions" Version="2.0.0" />
-        <PackageReference Include="System.Text.Json" Version="7.0.2" />
+        <PackageReference Include="CDP4ServicesDal-CE" Version="26.6.1" />
+        <PackageReference Include="NLog" Version="5.2.8" />
+        <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+        <PackageReference Include="ReqIFSharp.Extensions" Version="2.1.1" />
+        <PackageReference Include="System.Text.Json" Version="8.0.3" />
     </ItemGroup>
 
 </Project>
diff --git a/DEH-REQIF/Services/SessionDataRetriever.cs b/DEH-REQIF/Services/SessionDataRetriever.cs
@@ -58,7 +58,9 @@ public async Task<ISession> OpenSessionAndRetrieveData(string userName, string p
             var dal = new CDP4ServicesDal.CdpServicesDal();
             var credentials = new Credentials(userName, password, new Uri(dataSource));
 
-            var session = new Session(dal, credentials);
+            var messagebus = new CDPMessageBus();
+
+            var session = new Session(dal, credentials, messagebus);
             await session.Open(false);
 
             var siteDirectory = session.RetrieveSiteDirectory();