Skip to content

Changed to upstream Semantic Versioning package #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 24, 2023
Merged

Changed to upstream Semantic Versioning package #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
982baf0
Changed to upstream Semantic Versioning package
Omotola Feb 10, 2023
8024472
updated to latest semantic versioning version 2.0.2
Omotola Feb 10, 2023
e66e1a2
Merge with main branch
Omotola Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<PackageVersion Include="NuGet.Versioning" Version="6.5.0" />
<PackageVersion Include="packageurl-dotnet" Version="1.0.0" />
<PackageVersion Include="Polly" Version="7.2.3" />
<PackageVersion Include="Semver" Version="2.2.0" />
<PackageVersion Include="SemanticVersioning" Version="2.0.2" />
<PackageVersion Include="Serilog" Version="2.12.0" />
<PackageVersion Include="Serilog.Extensions.Hosting" Version="5.0.1" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="3.1.0" />
Expand Down
3 changes: 1 addition & 2 deletions src/Microsoft.ComponentDetection.Common/Microsoft.ComponentDetection.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<PackageReference Include="Docker.DotNet" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" />
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="Semver" />
<PackageReference Include="System.Reactive" />
<PackageReference Include="System.Threading.Tasks.Dataflow" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.ComponentDetection.Detectors/Microsoft.ComponentDetection.Detectors.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<PackageReference Include="DotNet.Glob" />
Expand All @@ -7,7 +7,7 @@
<PackageReference Include="NuGet.ProjectModel" />
<PackageReference Include="NuGet.Versioning" />
<PackageReference Include="Polly" />
<PackageReference Include="Semver" />
<PackageReference Include="SemanticVersioning" />
<PackageReference Include="yamldotnet" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
<PackageReference Include="Newtonsoft.Json" />
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.ComponentDetection.Detectors/rust/DependencySpecification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
namespace Microsoft.ComponentDetection.Detectors.Rust;
namespace Microsoft.ComponentDetection.Detectors.Rust;
using System;
using System.Collections.Generic;
using Microsoft.ComponentDetection.Detectors.Rust.Contracts;
using Semver;

using Range = Microsoft.ComponentDetection.Detectors.Rust.SemVer.Range;
using Range = SemanticVersioning.Range;
using Version = SemanticVersioning.Version;

public class DependencySpecification
{
Expand Down Expand Up @@ -41,7 +41,7 @@ public bool MatchesPackage(CargoPackage package)
var allSatisfied = true;
foreach (var range in ranges)
{
if (SemVersion.TryParse(package.Version, out var sv))
if (Version.TryParse(package.Version, out var sv))
{
if (!range.IsSatisfied(sv))
{
Expand Down
227 changes: 0 additions & 227 deletions src/Microsoft.ComponentDetection.Detectors/rust/SemVer/Comparator.cs
View file
Open in desktop

This file was deleted.

Loading