Skip to content

Commit f62a16d

Browse files
authored
Changed to upstream Semantic Versioning package (#426)
* Changed semver to upstream Semantic Versioning package 2.0.2
1 parent 273d48e commit f62a16d

File tree

10 files changed

+8
-1039
lines changed

10 files changed

+8
-1039
lines changed

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageVersion Include="NuGet.Versioning" Version="6.5.0" />
3030
<PackageVersion Include="packageurl-dotnet" Version="1.0.0" />
3131
<PackageVersion Include="Polly" Version="7.2.3" />
32-
<PackageVersion Include="Semver" Version="2.2.0" />
32+
<PackageVersion Include="SemanticVersioning" Version="2.0.2" />
3333
<PackageVersion Include="Serilog" Version="2.12.0" />
3434
<PackageVersion Include="Serilog.Extensions.Hosting" Version="5.0.1" />
3535
<PackageVersion Include="Serilog.Extensions.Logging" Version="3.1.0" />

src/Microsoft.ComponentDetection.Common/Microsoft.ComponentDetection.Common.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
44
<PackageReference Include="Docker.DotNet" />
55
<PackageReference Include="Microsoft.AspNet.WebApi.Client" />
66
<PackageReference Include="Microsoft.Extensions.Logging" />
77
<PackageReference Include="Newtonsoft.Json" />
8-
<PackageReference Include="Semver" />
98
<PackageReference Include="System.Reactive" />
109
<PackageReference Include="System.Threading.Tasks.Dataflow" />
1110
</ItemGroup>

src/Microsoft.ComponentDetection.Detectors/Microsoft.ComponentDetection.Detectors.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
44
<PackageReference Include="DotNet.Glob" />
@@ -7,7 +7,7 @@
77
<PackageReference Include="NuGet.ProjectModel" />
88
<PackageReference Include="NuGet.Versioning" />
99
<PackageReference Include="Polly" />
10-
<PackageReference Include="Semver" />
10+
<PackageReference Include="SemanticVersioning" />
1111
<PackageReference Include="yamldotnet" />
1212
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
1313
<PackageReference Include="Newtonsoft.Json" />

src/Microsoft.ComponentDetection.Detectors/rust/DependencySpecification.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
namespace Microsoft.ComponentDetection.Detectors.Rust;
1+
namespace Microsoft.ComponentDetection.Detectors.Rust;
22
using System;
33
using System.Collections.Generic;
44
using Microsoft.ComponentDetection.Detectors.Rust.Contracts;
5-
using Semver;
65

7-
using Range = Microsoft.ComponentDetection.Detectors.Rust.SemVer.Range;
6+
using Range = SemanticVersioning.Range;
7+
using Version = SemanticVersioning.Version;
88

99
public class DependencySpecification
1010
{
@@ -41,7 +41,7 @@ public bool MatchesPackage(CargoPackage package)
4141
var allSatisfied = true;
4242
foreach (var range in ranges)
4343
{
44-
if (SemVersion.TryParse(package.Version, out var sv))
44+
if (Version.TryParse(package.Version, out var sv))
4545
{
4646
if (!range.IsSatisfied(sv))
4747
{

src/Microsoft.ComponentDetection.Detectors/rust/SemVer/Comparator.cs

Lines changed: 0 additions & 227 deletions
This file was deleted.

0 commit comments

Comments
 (0)