Skip to content

Commit

Permalink
[Update] to Logging Abstractions to version 8.0.0
Browse files Browse the repository at this point in the history
[Update] test projects to net8.0

[Update] SonarQube GH action to include proper Java version
  • Loading branch information
samatstariongroup committed Dec 7, 2023
1 parent 4ac698a commit 8fa1ffd
Show file tree
Hide file tree
Showing 6 changed files with 99 additions and 93 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/CodeQuality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@v2
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: Restore dependencies
run: dotnet restore ReqIFSharp.sln
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Company>RHEA System S.A.</Company>
<Authors>Sam Gerene</Authors>
<Description>Nunit test suite for the ReqIFSharp.Extensions library</Description>
Expand All @@ -13,9 +13,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />

Expand Down
2 changes: 1 addition & 1 deletion ReqIFSharp.Extensions/ReqIFSharp.Extensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>2.0.1</Version>
<Version>2.1.0</Version>
<Description>A .NET library that provides extenions and services to operate on ReqIF documents.</Description>
<PackageId>ReqIFSharp.Extensions</PackageId>
<Company>RHEA System S.A.</Company>
Expand Down
168 changes: 84 additions & 84 deletions ReqIFSharp.Tests/ReqIFSharp.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,89 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Company>RHEA System S.A.</Company>
<Authors>Sam Gerene, Naron Phou</Authors>
<Description>Nunit test suite for the ReqIFSharp library</Description>
<Copyright>Copyright 2017-2022 RHEA System S.A.</Copyright>
<RepositoryUrl>https://github.com/RHEAGROUP/reqifsharp.git</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
<Nullable>disable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<None Remove="driver.xsd" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\driver.xsd" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />

<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ReqIFSharp\ReqIFSharp.csproj"></ProjectReference>
</ItemGroup>

<ItemGroup>
<None Update="TestData\Datatype-Demo.reqif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\DefaultValueDemo.reqif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<?xml version="1.0" encoding="utf-8"?>

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Company>RHEA System S.A.</Company>
<Authors>Sam Gerene, Naron Phou</Authors>
<Description>Nunit test suite for the ReqIFSharp library</Description>
<Copyright>Copyright 2017-2022 RHEA System S.A.</Copyright>
<RepositoryUrl>https://github.com/RHEAGROUP/reqifsharp.git</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
<Nullable>disable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<None Remove="driver.xsd" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\driver.xsd" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit.Console" Version="3.16.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />

<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ReqIFSharp\ReqIFSharp.csproj"></ProjectReference>
</ItemGroup>

<ItemGroup>
<None Update="TestData\Datatype-Demo.reqif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\DefaultValueDemo.reqif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\large-sample.reqif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\output.reqif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="output.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="output.zip">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\ProR_Traceability-Template-v1.0.reqif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\requirements-and-objects.reqifz">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</None>
<None Update="TestData\output.reqif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="output.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="output.zip">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\ProR_Traceability-Template-v1.0.reqif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\requirements-and-objects.reqifz">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\sampleGH43.zip">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\sample_debug.reqif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\Spielwiese.reqifz">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\test-multiple-reqif.reqifz">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\testreqif.reqif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="testreqif.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</None>
<None Update="TestData\sample_debug.reqif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\Spielwiese.reqifz">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\test-multiple-reqif.reqifz">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="TestData\testreqif.reqif">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="testreqif.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions ReqIFSharp/ReqIFSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>7.0.1</Version>
<Version>7.1.0</Version>
<Description>A .NET library to deserialize (read) and serialize (write) OMG ReqIF documents.</Description>
<PackageId>ReqIFSharp</PackageId>
<Company>RHEA System S.A.</Company>
Expand Down Expand Up @@ -89,7 +89,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
</ItemGroup>

</Project>

0 comments on commit 8fa1ffd

Please sign in to comment.