Skip to content

Commit

Permalink
chore: test for floating version (#819)
Browse files Browse the repository at this point in the history
---------

Signed-off-by: MTsfoni <[email protected]>
  • Loading branch information
mtsfoni authored Jan 2, 2024
1 parent c9b9150 commit 37167ae
Show file tree
Hide file tree
Showing 3 changed files with 149 additions and 0 deletions.
30 changes: 30 additions & 0 deletions CycloneDX.Tests/FunctionalTests/FloatingVersions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using CycloneDX.Models;
using Xunit;


namespace CycloneDX.Tests.FunctionalTests
{
public class FloatingVersions
{
[Fact(Timeout = 15000)]
public async Task TestFloatingVersions()
{
var assetsJson = File.ReadAllText(Path.Combine("FunctionalTests", "TestcaseFiles", "FloatingVersions.json"));
var options = new RunOptions
{
};


var bom = await FunctionalTestHelper.Test(assetsJson, options);

Assert.True(bom.Components.Count == 1);
Assert.Contains(bom.Components, c => string.Compare(c.Name, "JetBrains.Annotations", true) == 0 && c.Version == "2023.3.0");
}
}
}
118 changes: 118 additions & 0 deletions CycloneDX.Tests/FunctionalTests/TestcaseFiles/FloatingVersions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
{
"version": 3,
"targets": {
"net8.0": {
"JetBrains.Annotations/2023.3.0": {
"type": "package",
"compile": {
"lib/netstandard2.0/JetBrains.Annotations.dll": {
"related": ".deps.json;.xml"
}
},
"runtime": {
"lib/netstandard2.0/JetBrains.Annotations.dll": {
"related": ".deps.json;.xml"
}
}
}
}
},
"libraries": {
"JetBrains.Annotations/2023.3.0": {
"sha512": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA==",
"type": "package",
"path": "jetbrains.annotations/2023.3.0",
"files": [
".nupkg.metadata",
".signature.p7s",
"icon.png",
"jetbrains.annotations.2023.3.0.nupkg.sha512",
"jetbrains.annotations.nuspec",
"lib/net20/JetBrains.Annotations.dll",
"lib/net20/JetBrains.Annotations.xml",
"lib/netstandard1.0/JetBrains.Annotations.deps.json",
"lib/netstandard1.0/JetBrains.Annotations.dll",
"lib/netstandard1.0/JetBrains.Annotations.xml",
"lib/netstandard2.0/JetBrains.Annotations.deps.json",
"lib/netstandard2.0/JetBrains.Annotations.dll",
"lib/netstandard2.0/JetBrains.Annotations.xml",
"lib/portable40-net40+sl5+win8+wp8+wpa81/JetBrains.Annotations.dll",
"lib/portable40-net40+sl5+win8+wp8+wpa81/JetBrains.Annotations.xml"
]
}
},
"projectFileDependencyGroups": {
"net8.0": [
"JetBrains.Annotations >= 2023.*"
]
},
"packageFolders": {
"C:\\Users\\user\\.nuget\\packages\\": {},
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
},
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "E:\\src\\CycloneDX-814\\ProjectWithFloatingVersion\\ProjectWithFloatingVersion\\ProjectWithFloatingVersion.csproj",
"projectName": "ProjectWithFloatingVersion",
"projectPath": "E:\\src\\CycloneDX-814\\ProjectWithFloatingVersion\\ProjectWithFloatingVersion\\ProjectWithFloatingVersion.csproj",
"packagesPath": "C:\\Users\\user\\.nuget\\packages\\",
"outputPath": "E:\\src\\CycloneDX-814\\ProjectWithFloatingVersion\\ProjectWithFloatingVersion\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\user\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net8.0"
],
"sources": {
"C:\\Program Files\\dotnet\\library-packs": {},
"http://localhost:8081/repository/nuget-group/index.json": {}
},
"frameworks": {
"net8.0": {
"targetAlias": "net8.0",
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"net8.0": {
"targetAlias": "net8.0",
"dependencies": {
"JetBrains.Annotations": {
"target": "Package",
"version": "[2023.*, )"
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48",
"net481"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.100/PortableRuntimeIdentifierGraph.json"
}
}
}
}
1 change: 1 addition & 0 deletions CycloneDX/Services/ProjectAssetsFileService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public HashSet<DotnetDependency> GetDotnetDependencys(string projectFilePath, st
{
var x = d.Split(" ");
return new { Name = x.First() };
});

foreach (var lockFileLibrary in targetRuntime.Libraries)
Expand Down

0 comments on commit 37167ae

Please sign in to comment.