Skip to content

Commit

Permalink
migrated version updated in all files
Browse files Browse the repository at this point in the history
  • Loading branch information
Viji committed Jul 12, 2024
1 parent 6db7d44 commit ab0051d
Show file tree
Hide file tree
Showing 10 changed files with 209 additions and 209 deletions.
376 changes: 188 additions & 188 deletions CA.nuspec

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ We welcome contributions in several forms, e.g.
Clone the repository from <CA_Project_RepoLink>

2. Software dependencies -
Visual Studio 2022, .NET Core 6
Visual Studio 2022, .NET 8

## Pull Request Process

Expand Down
4 changes: 2 additions & 2 deletions DemoProject/DemoProject__azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ jobs:
displayName: 'Clearing-Package Identifier'
inputs:
script: |
$(Build.SourcesDirectory)\Continuous-Clearing\out\net6.0\PackageIdentifier.exe --packageFilePath "$(Build.SourcesDirectory)\DemoProject\NPMProject" --bomFolderPath "$(Build.SourcesDirectory)\DemoProject\NPMProject" --sw360Token <SW360AUTHTOKEN)> --projectType <ProjectType> --sw360Url <sw360Url> --sW360AuthTokenType Bearer --artifactoryuploadApiKey <JFROGARTIFACTORYTOKEN>) --JfrogApi <JfrogUrl>
$(Build.SourcesDirectory)\Continuous-Clearing\out\net8.0\PackageIdentifier.exe --packageFilePath "$(Build.SourcesDirectory)\DemoProject\NPMProject" --bomFolderPath "$(Build.SourcesDirectory)\DemoProject\NPMProject" --sw360Token <SW360AUTHTOKEN)> --projectType <ProjectType> --sw360Url <sw360Url> --sW360AuthTokenType Bearer --artifactoryuploadApiKey <JFROGARTIFACTORYTOKEN>) --JfrogApi <JfrogUrl>
workingDirectory: 'DemoProject\NPMProject'
failOnStderr: true

- task: CmdLine@2
displayName: 'Clearing-SW360 Package Creator'
inputs:
script: |
$(Build.SourcesDirectory)\Continuous-Clearing\out\net6.0\SW360PackageCreator.exe --bomFilePath "$(Build.SourcesDirectory)\DemoProject\NPMProject\$(SW360PROJNAME)_Bom.cdx.json" --sw360Token <sw360token> --sW360ProjectID <ProjectId> --sW360AuthTokenType Bearer --fossologyUrl <FossURL>
$(Build.SourcesDirectory)\Continuous-Clearing\out\net8.0\SW360PackageCreator.exe --bomFilePath "$(Build.SourcesDirectory)\DemoProject\NPMProject\$(SW360PROJNAME)_Bom.cdx.json" --sw360Token <sw360token> --sW360ProjectID <ProjectId> --sW360AuthTokenType Bearer --fossologyUrl <FossURL>
workingDirectory: 'DemoProject\NPMProject'
failOnStderr: true

Expand Down
6 changes: 3 additions & 3 deletions DemoProject/DemoProject__azure-pipelines_Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,23 +55,23 @@ stages:
inputs:
SourceFolder: '$(Build.SourcesDirectory)'
Contents: 'appSettings*.json'
TargetFolder: '$(Build.SourcesDirectory)\Continuous-Clearing\out\net6.0'
TargetFolder: '$(Build.SourcesDirectory)\Continuous-Clearing\out\net8.0'
OverWrite: true

- task: CmdLine@2
enabled: true
displayName: 'PackageIdentifier'
inputs:
script: |
$(Build.SourcesDirectory)\Continuous-Clearing\out\net6.0\PackageIdentifier.exe --packageFilePath "<debpackageOutfilepath>" --bomFolderPath "$(Build.SourcesDirectory)\GridEdge" --sw360Token <SW360AUTHTOKEN> --sW360ProjectID <projectid> --sW360AuthTokenType Bearer --artifactoryuploadApiKey <JFRogApitoken> --projectType DEBIAN
$(Build.SourcesDirectory)\Continuous-Clearing\out\net8.0\PackageIdentifier.exe --packageFilePath "<debpackageOutfilepath>" --bomFolderPath "$(Build.SourcesDirectory)\GridEdge" --sw360Token <SW360AUTHTOKEN> --sW360ProjectID <projectid> --sW360AuthTokenType Bearer --artifactoryuploadApiKey <JFRogApitoken> --projectType DEBIAN
workingDirectory: $(Build.SourcesDirectory)
continueOnError: true
- task: CmdLine@2
enabled: true
displayName: 'component creator'
inputs:
script: |
$(Build.SourcesDirectory)\Continuous-Clearing\out\net6.0\SW360PackageCreator.exe --bomFilePath "$(Build.SourcesDirectory)\GridEdge\$(SW360PROJNAME)_Bom.cdx.json" --sw360Token <SW360AUTHTOKEN> --sW360ProjectID <ProjectId> --sW360AuthTokenType Bearer --fossologyUrl <FossURL>
$(Build.SourcesDirectory)\Continuous-Clearing\out\net8.0\SW360PackageCreator.exe --bomFilePath "$(Build.SourcesDirectory)\GridEdge\$(SW360PROJNAME)_Bom.cdx.json" --sw360Token <SW360AUTHTOKEN> --sW360ProjectID <ProjectId> --sW360AuthTokenType Bearer --fossologyUrl <FossURL>
workingDirectory: $(Build.SourcesDirectory)
continueOnError: true

Expand Down
4 changes: 2 additions & 2 deletions DemoProject/LicenseClearingTool.bat
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
REM SPDX-FileCopyrightText: 2023 Siemens AG
REM SPDX-FileCopyrightText: 2024 Siemens AG
REM SPDX-License-Identifier: MIT

@ECHO OFF
pushd %~dp0\LicenseClearingTool.3.0.0
pushd %~dp0\LicenseClearingTool.7.0.0
echo "Starting Package Identifier"
cmd.exe /c Package Identifier.exe --packageFilePath ..\NPMProject --bomFolderPath ..\BOM --sw360Token <sw360token> --sW360ProjectID <ProjectId> --sW360AuthTokenType Bearer --artifactoryuploadApiKey <artifactoryuploadApiKey> --projectType <ProjectType> --JfrogApi <JfrogUrl> --sw360Url <sw360Url>

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: MIT

# Get parent image as latest debian patch of bullseye
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim
WORKDIR /app/out

# Creating required directories
Expand Down
2 changes: 1 addition & 1 deletion doc/UsageDoc/CA_UsageDocument.md
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ Continuous Clearing Tool can be executed as container or as binaries,
<summary>Binary execution</summary>

### Prerequisite
1. .NET 6 runtime [https://dotnet.microsoft.com/download/dotnet-core/6.0](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
1. .NET 8 runtime [https://dotnet.microsoft.com/download/dotnet-core/8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
2. Node.js and Git latest


Expand Down
4 changes: 2 additions & 2 deletions src/LCT.PackageIdentifier/NpmProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ private static void CreateFileForMultipleVersions(List<Component> componentsWith
private static void GetPackagesForBom(string filepath, ref List<BundledComponents> bundledComponents, ref List<Component> lstComponentForBOM, ref int noOfDevDependent, IEnumerable<JProperty> depencyComponentList)
{
BomCreator.bomKpiData.ComponentsinPackageLockJsonFile += depencyComponentList.Count();
var prop2 = depencyComponentList.ToList()[0];
var parsedContent = JObject.Parse(Convert.ToString(prop2.Value));
var property2 = depencyComponentList.ToList()[0];
var parsedContent = JObject.Parse(Convert.ToString(property2.Value));
var dep = parsedContent["dependencies"].ToList();
var devDep = parsedContent["devDependencies"].ToList();
List<JToken> directDependencies = new List<JToken>();
Expand Down
6 changes: 3 additions & 3 deletions src/LCT.PackageIdentifier/NugetDevDependencyParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,13 @@ private static void GetDirectDependencies(string filePath)
{
var readValue = File.ReadAllText(filePath);
JObject serializedContent = JObject.Parse(readValue);
JToken projectFramoworks = serializedContent["project"]["frameworks"];
if (projectFramoworks == null && !projectFramoworks.HasValues)
JToken projectFramworks = serializedContent["project"]["frameworks"];
if (projectFramworks == null && !projectFramworks.HasValues)
{
return;
}

IEnumerable<JProperty> listChilds = projectFramoworks.Children().OfType<JProperty>() ?? new List<JProperty>();
IEnumerable<JProperty> listChilds = projectFramworks.Children().OfType<JProperty>() ?? new List<JProperty>();
//check has values
if (listChilds != null && listChilds.ToList()[0].HasValues)
{
Expand Down
12 changes: 6 additions & 6 deletions src/LCT.PackageIdentifier/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,9 @@ private static string DisplayInclude(CommonAppSettings appSettings)
}
return totalString;
case "ALPINE":
if (appSettings.Npm.Include != null)
if (appSettings.Alpine.Include != null)
{
totalString = string.Join(",", appSettings.Npm.Include?.ToList());
totalString = string.Join(",", appSettings.Alpine.Include?.ToList());
}
return totalString;
default:
Expand Down Expand Up @@ -233,9 +233,9 @@ private static string DisplayExclude(CommonAppSettings appSettings)
}
return totalString;
case "ALPINE":
if (appSettings.Npm.Include != null)
if (appSettings.Alpine.Include != null)
{
totalString = string.Join(",", appSettings.Npm.Include?.ToList());
totalString = string.Join(",", appSettings.Alpine.Include?.ToList());
}
return totalString;
default:
Expand Down Expand Up @@ -289,9 +289,9 @@ private static string DisplayExcludeComponents(CommonAppSettings appSettings)
}
return totalString;
case "ALPINE":
if (appSettings.Npm.Include != null)
if (appSettings.Alpine.Include != null)
{
totalString = string.Join(",", appSettings.Npm.Include?.ToList());
totalString = string.Join(",", appSettings.Alpine.Include?.ToList());
}
return totalString;
default:
Expand Down

0 comments on commit ab0051d

Please sign in to comment.