From 5122365e6f7dfea6394dc062fc6d0a418ca99557 Mon Sep 17 00:00:00 2001 From: Malavika Date: Mon, 23 Sep 2024 08:45:59 +0530 Subject: [PATCH 1/4] bug fixes --- src/LCT.PackageIdentifier/PythonProcessor.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/LCT.PackageIdentifier/PythonProcessor.cs b/src/LCT.PackageIdentifier/PythonProcessor.cs index 851c4160..ea7fc45f 100644 --- a/src/LCT.PackageIdentifier/PythonProcessor.cs +++ b/src/LCT.PackageIdentifier/PythonProcessor.cs @@ -125,14 +125,21 @@ private static List GetPackagesFromTOMLFile(string filePath, List foreach (TomlNode node in tomlTable["package"]) { + if(!string.IsNullOrWhiteSpace(node["category"].ToString())) + { + var cc = node["category"].ToString(); + var ccc= node["Malavika"].ToString(); + bool val = (node["category"].ToString() != "main" && node["category"].ToString() != "Tommy.TomlLazy"); + } PythonPackage pythonPackage = new() { Name = node["name"].ToString(), Version = node["version"].ToString(), PurlID = Dataconstant.PurlCheck()["PYTHON"] + "/" + node["name"].ToString() + "@" + node["version"].ToString(), - Isdevdependent = node["category"].ToString() != "main", + Isdevdependent = (node["category"].ToString() != "main" && node["category"].ToString() != "Tommy.TomlLazy"), FoundType = Dataconstant.Discovered }; + //tod: get the input file that will work if (pythonPackage.Isdevdependent) BomCreator.bomKpiData.DevDependentComponents++; From 281a3b771b0471aca4bd70278f1b8f5d9874afa7 Mon Sep 17 00:00:00 2001 From: Sumanth Kb Date: Tue, 22 Oct 2024 15:42:34 +0530 Subject: [PATCH 2/4] Resolve review comments --- src/LCT.PackageIdentifier/PythonProcessor.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/LCT.PackageIdentifier/PythonProcessor.cs b/src/LCT.PackageIdentifier/PythonProcessor.cs index ea7fc45f..4ff02b43 100644 --- a/src/LCT.PackageIdentifier/PythonProcessor.cs +++ b/src/LCT.PackageIdentifier/PythonProcessor.cs @@ -125,17 +125,12 @@ private static List GetPackagesFromTOMLFile(string filePath, List foreach (TomlNode node in tomlTable["package"]) { - if(!string.IsNullOrWhiteSpace(node["category"].ToString())) - { - var cc = node["category"].ToString(); - var ccc= node["Malavika"].ToString(); - bool val = (node["category"].ToString() != "main" && node["category"].ToString() != "Tommy.TomlLazy"); - } PythonPackage pythonPackage = new() { Name = node["name"].ToString(), Version = node["version"].ToString(), PurlID = Dataconstant.PurlCheck()["PYTHON"] + "/" + node["name"].ToString() + "@" + node["version"].ToString(), + // By Default Tommy.TomlLazy is coming instead of Null or empty Isdevdependent = (node["category"].ToString() != "main" && node["category"].ToString() != "Tommy.TomlLazy"), FoundType = Dataconstant.Discovered }; From 2fe7915a0f993c3df2d5373463dd390be76b300d Mon Sep 17 00:00:00 2001 From: sumanthkb Date: Wed, 27 Nov 2024 17:35:30 +0530 Subject: [PATCH 3/4] Changed Poetry lock Dev Dependency identification logic. --- .github/workflows/compile.yml | 16 ++++++++-------- src/LCT.PackageIdentifier/PythonProcessor.cs | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index d7f33255..7eaac3e6 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -96,7 +96,7 @@ jobs: $sourceFolder = Join-Path $env:GITHUB_WORKSPACE "out" | Join-Path -ChildPath "*" $outFolder = Join-Path $env:GITHUB_WORKSPACE "out" | Join-Path -ChildPath "continuous-clearing" New-Item -ItemType Directory -Force -Path $outFolder - $fileName = "continuous-clearing-v7.0.0.zip" + $fileName = "continuous-clearing-v7.0.1.zip" Write-Host "Filename: '$fileName'" Write-Host "sourceFolder: '$sourceFolder'" Write-Host "Outfolder: '$outFolder'" @@ -129,8 +129,8 @@ jobs: - name: Create Nuget Packages id: createNupkg run: | - nuget pack CA.nuspec -Version 7.0.0 - Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing.7.0.0.nupkg" + nuget pack CA.nuspec -Version 7.0.1 + Write-Host "::set-output name=nupkg-LicenseClearingTool::continuous-clearing.7.0.1.nupkg" - name: Archive NuGet Packages uses: actions/upload-artifact@v4 @@ -164,9 +164,9 @@ jobs: #if: ${{ false }} # disable for now run: | echo "Files in directory:" - docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v7.0.0 - docker save ${{ github.repository }}:continuous-clearing-v7.0.0 -o continuous-clearing-v7.0.0.tar - echo "::set-output name=docker-LicenseClearingTool::continuous-clearing-v7.0.0.tar" + docker build . --file Dockerfile --tag ${{ github.repository }}:continuous-clearing-v7.0.1 + docker save ${{ github.repository }}:continuous-clearing-v7.0.1 -o continuous-clearing-v7.0.1.tar + echo "::set-output name=docker-LicenseClearingTool::continuous-clearing-v7.0.1.tar" - name: Archive docker image #if: ${{ false }} # disable for now @@ -214,8 +214,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: v7.0.0 - release_name: Release v7.0.0 + tag_name: v7.0.1 + release_name: Release v7.0.1 body: | ${{ github.event.head_commit.message }} draft: true diff --git a/src/LCT.PackageIdentifier/PythonProcessor.cs b/src/LCT.PackageIdentifier/PythonProcessor.cs index 4ff02b43..e9f8ecbf 100644 --- a/src/LCT.PackageIdentifier/PythonProcessor.cs +++ b/src/LCT.PackageIdentifier/PythonProcessor.cs @@ -134,7 +134,6 @@ private static List GetPackagesFromTOMLFile(string filePath, List Isdevdependent = (node["category"].ToString() != "main" && node["category"].ToString() != "Tommy.TomlLazy"), FoundType = Dataconstant.Discovered }; - //tod: get the input file that will work if (pythonPackage.Isdevdependent) BomCreator.bomKpiData.DevDependentComponents++; From 079b82d1fa0636ecd77e0edeab2c7803976d869f Mon Sep 17 00:00:00 2001 From: sumanthkb Date: Wed, 27 Nov 2024 18:06:44 +0530 Subject: [PATCH 4/4] Updated to 7.0.1 in all the project files --- src/ArtifactoryUploader/LCT.ArtifactoryUploader.csproj | 2 +- src/LCT.APICommunications/LCT.APICommunications.csproj | 2 +- src/LCT.ArtifactPublisher/LCT.ArtifactPublisher.csproj | 2 +- src/LCT.Common/LCT.Common.csproj | 2 +- src/LCT.CycloneDxProcessor/LCT.CycloneDxProcessor.csproj | 2 +- src/LCT.Facade/LCT.Facade.csproj | 2 +- src/LCT.PackageIdentifier/LCT.PackageIdentifier.csproj | 2 +- src/LCT.SW360PackageCreator/LCT.SW360PackageCreator.csproj | 2 +- src/LCT.Services/LCT.Services.csproj | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ArtifactoryUploader/LCT.ArtifactoryUploader.csproj b/src/ArtifactoryUploader/LCT.ArtifactoryUploader.csproj index f2be23ab..e226f418 100644 --- a/src/ArtifactoryUploader/LCT.ArtifactoryUploader.csproj +++ b/src/ArtifactoryUploader/LCT.ArtifactoryUploader.csproj @@ -4,7 +4,7 @@ Exe net8.0 ArtifactoryUploader - 7.0.0 + 7.0.1 diff --git a/src/LCT.APICommunications/LCT.APICommunications.csproj b/src/LCT.APICommunications/LCT.APICommunications.csproj index 78f1d279..577dcf82 100644 --- a/src/LCT.APICommunications/LCT.APICommunications.csproj +++ b/src/LCT.APICommunications/LCT.APICommunications.csproj @@ -3,7 +3,7 @@ Library net8.0 - 7.0.0 + 7.0.1 diff --git a/src/LCT.ArtifactPublisher/LCT.ArtifactPublisher.csproj b/src/LCT.ArtifactPublisher/LCT.ArtifactPublisher.csproj index eca387dd..942913d8 100644 --- a/src/LCT.ArtifactPublisher/LCT.ArtifactPublisher.csproj +++ b/src/LCT.ArtifactPublisher/LCT.ArtifactPublisher.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 7.0.0 + 7.0.1 diff --git a/src/LCT.Common/LCT.Common.csproj b/src/LCT.Common/LCT.Common.csproj index 0ba9e276..2a353c90 100644 --- a/src/LCT.Common/LCT.Common.csproj +++ b/src/LCT.Common/LCT.Common.csproj @@ -3,7 +3,7 @@ Library net8.0 - 7.0.0 + 7.0.1 diff --git a/src/LCT.CycloneDxProcessor/LCT.CycloneDxProcessor.csproj b/src/LCT.CycloneDxProcessor/LCT.CycloneDxProcessor.csproj index 82dd43e2..b705b706 100644 --- a/src/LCT.CycloneDxProcessor/LCT.CycloneDxProcessor.csproj +++ b/src/LCT.CycloneDxProcessor/LCT.CycloneDxProcessor.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 7.0.0 + 7.0.1 diff --git a/src/LCT.Facade/LCT.Facade.csproj b/src/LCT.Facade/LCT.Facade.csproj index ece08d21..4c5077e5 100644 --- a/src/LCT.Facade/LCT.Facade.csproj +++ b/src/LCT.Facade/LCT.Facade.csproj @@ -2,7 +2,7 @@ net8.0 - 7.0.0 + 7.0.1 diff --git a/src/LCT.PackageIdentifier/LCT.PackageIdentifier.csproj b/src/LCT.PackageIdentifier/LCT.PackageIdentifier.csproj index f9dd7e30..1004393e 100644 --- a/src/LCT.PackageIdentifier/LCT.PackageIdentifier.csproj +++ b/src/LCT.PackageIdentifier/LCT.PackageIdentifier.csproj @@ -4,7 +4,7 @@ Exe net8.0 PackageIdentifier - 7.0.0 + 7.0.1 diff --git a/src/LCT.SW360PackageCreator/LCT.SW360PackageCreator.csproj b/src/LCT.SW360PackageCreator/LCT.SW360PackageCreator.csproj index 76ccd598..d56be067 100644 --- a/src/LCT.SW360PackageCreator/LCT.SW360PackageCreator.csproj +++ b/src/LCT.SW360PackageCreator/LCT.SW360PackageCreator.csproj @@ -4,7 +4,7 @@ Exe net8.0 SW360PackageCreator - 7.0.0 + 7.0.1 LCT.SW360PackageCreator diff --git a/src/LCT.Services/LCT.Services.csproj b/src/LCT.Services/LCT.Services.csproj index 4bf8da3e..47b49e7c 100644 --- a/src/LCT.Services/LCT.Services.csproj +++ b/src/LCT.Services/LCT.Services.csproj @@ -3,7 +3,7 @@ Library net8.0 - 7.0.0 + 7.0.1