Skip to content

Commit

Permalink
[Update] to net8.0
Browse files Browse the repository at this point in the history
[Update] dependencies (ClosedXML, NuGet.Packaging, Spectre.Console)
  • Loading branch information
samatrhea committed Apr 14, 2024
1 parent f1b4b1a commit 35b3222
Show file tree
Hide file tree
Showing 24 changed files with 55 additions and 47 deletions.
17 changes: 10 additions & 7 deletions .github/workflows/CodeQuality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,19 @@ jobs:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- 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@v1
uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.x'
dotnet-version: '8.0.x'

- name: Restore dependencies
run: dotnet restore
Expand All @@ -38,7 +44,4 @@ jobs:
- name: Sonarqube end
run: dotnet sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Codecov
uses: codecov/codecov-action@v1
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10 changes: 5 additions & 5 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,27 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
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@v1
uses: github/codeql-action/init@v2
# Override language selection by uncommenting this and choosing your languages
with:
languages: csharp

- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
dotnet-version: 8.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@v1
uses: github/codeql-action/analyze@v2
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Net-Project-Package-Extractor
Copyright 2022 RHEA System S.A.
Copyright 2022-2024 RHEA System S.A.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ExtractCommandTestFixture.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<Company>RHEA System S.A.</Company>
<Authors>Sam Gerené, Alexander van Delft</Authors>
<Copyright>Copyright 2022 RHEA System S.A.</Copyright>
<Copyright>Copyright 2022-2024 RHEA System S.A.</Copyright>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.Console" Version="3.15.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
<PackageReference Include="coverlet.collector" Version="3.2.0">
<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="NUnit.Console" Version="3.17.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="3.2.0">
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ResourceLoaderTestFixture.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="NuGetReaderTestFixture.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="PackageToExcelWriterTestFixture.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ProjectFileExtractorTestFixture.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ProjectFileParserTestFixture.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion NetProjectPackageExtractor/Commands/ExtractCommand.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ExtractCommand.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion NetProjectPackageExtractor/Model/Package.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="Package.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
17 changes: 11 additions & 6 deletions NetProjectPackageExtractor/NetProjectPackageExtractor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@
<PropertyGroup Label="Package">
<Title>NET Project Package Extractor</Title>
<Description>A command line application that extracts all nuget information from csproj files in a nested directory structure and saves the result to a spreadsheet.</Description>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
<PackAsTool>true</PackAsTool>
<PackageId>nppe</PackageId>
<ToolCommandName>nppe</ToolCommandName>
<PackageOutputPath>./nupkg</PackageOutputPath>
<Version>1.0.1</Version>
<Version>2.0.0</Version>
<ImplicitUsings>disable</ImplicitUsings>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<PropertyGroup Label="Copyright">
<Company>RHEA System S.A.</Company>
<Copyright>Copyright 2022 RHEA System S.A.</Copyright>
<Copyright>Copyright 2022-2024 RHEA System S.A.</Copyright>
<Authors>Sam Gerené, Alexander van Delft</Authors>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<RequireLicenseAcceptance>true</RequireLicenseAcceptance>
Expand All @@ -37,15 +38,19 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="ClosedXML" Version="0.97.0" />
<PackageReference Include="NuGet.Packaging" Version="6.4.0" />
<PackageReference Include="ClosedXML" Version="0.102.2" />
<PackageReference Include="NuGet.Packaging" Version="6.9.1" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
<PackageReference Include="Spectre.Console" Version="0.45.1-preview.0.36" />
<PackageReference Include="Spectre.Console" Version="0.48.0" />
</ItemGroup>

<ItemGroup>
<Folder Include="Commands\" />
</ItemGroup>

<ItemGroup>
<None Include="..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion NetProjectPackageExtractor/Program.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="Program.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion NetProjectPackageExtractor/Resources/ResourceLoader.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ResourceLoader.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion NetProjectPackageExtractor/Resources/ascii-art.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
███████╗██╔╝ ██╗ ██║ ██║ ██║██║ ██║╚██████╗ ██║ ╚██████╔╝██║ ██║
╚══════╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝

copyright 2022 RHEA Group S.A. https://www.rheagroup.com
copyright 2022-2024 RHEA Group S.A. https://www.rheagroup.com
email: [email protected]

NET PROJECT EXTRACTOR version: NetProjectExtractorVersion
Expand Down
2 changes: 1 addition & 1 deletion NetProjectPackageExtractor/Services/INuGetReader.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="INuGetReader.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="IPackageToExcelWriter.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="IProjectFileExtractor.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion NetProjectPackageExtractor/Services/IProjectFileParser.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="IProjectFileParser.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion NetProjectPackageExtractor/Services/NuGetReader.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="NuGetReader.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="PackageToExcelWriter.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ProjectFileExtractor.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion NetProjectPackageExtractor/Services/ProjectFileParser.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ProjectFileParser.cs" company="RHEA System S.A.">
//
// Copyright 2022 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down

0 comments on commit 35b3222

Please sign in to comment.