Skip to content

Commit a5fe5ed

Browse files
authored
Revert "Introduce C++ SDK component type (#1599)" (#1612)
This reverts commit 601ebcd.
1 parent c6846ef commit a5fe5ed

File tree

6 files changed

+0
-160
lines changed

6 files changed

+0
-160
lines changed

src/Microsoft.ComponentDetection.Contracts/BcdeModels/TypedComponentConverter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public class TypedComponentConverter : JsonConverter
2929
{ ComponentType.Vcpkg, typeof(VcpkgComponent) },
3030
{ ComponentType.Spdx, typeof(SpdxComponent) },
3131
{ ComponentType.DotNet, typeof(DotNetComponent) },
32-
{ ComponentType.CppSdk, typeof(CppSdkComponent) },
3332
};
3433

3534
public override bool CanWrite

src/Microsoft.ComponentDetection.Contracts/TypedComponent/ComponentType.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,4 @@ public enum ComponentType : byte
6464

6565
[EnumMember]
6666
DotNet = 19,
67-
68-
[EnumMember]
69-
CppSdk = 20,
7067
}

src/Microsoft.ComponentDetection.Contracts/TypedComponent/CppSdkComponent.cs

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

src/Microsoft.ComponentDetection.Contracts/TypedComponent/TypedComponent.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ namespace Microsoft.ComponentDetection.Contracts.TypedComponent;
2020
[JsonDerivedType(typeof(CargoComponent), typeDiscriminator: nameof(ComponentType.Cargo))]
2121
[JsonDerivedType(typeof(ConanComponent), typeDiscriminator: nameof(ComponentType.Conan))]
2222
[JsonDerivedType(typeof(CondaComponent), typeDiscriminator: nameof(ComponentType.Conda))]
23-
[JsonDerivedType(typeof(CppSdkComponent), typeDiscriminator: nameof(ComponentType.CppSdk))]
2423
[JsonDerivedType(typeof(DockerImageComponent), typeDiscriminator: nameof(ComponentType.DockerImage))]
2524
[JsonDerivedType(typeof(DockerReferenceComponent), typeDiscriminator: nameof(ComponentType.DockerReference))]
2625
[JsonDerivedType(typeof(DotNetComponent), typeDiscriminator: nameof(ComponentType.DotNet))]

test/Microsoft.ComponentDetection.Contracts.Tests/CppSdkComponentTests.cs

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

test/Microsoft.ComponentDetection.Contracts.Tests/TypedComponentSerializationTests.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -204,16 +204,4 @@ public void TypedComponent_Serialization_LinuxComponent()
204204
linuxComponent.Name.Should().Be("SomeLinuxComponentName");
205205
linuxComponent.Version.Should().Be("SomeLinuxComponentVersion");
206206
}
207-
208-
[TestMethod]
209-
public void TypedComponent_Serialization_CppSdk()
210-
{
211-
TypedComponent tc = new CppSdkComponent("SomeCppSdk", "1.2.3");
212-
var result = JsonSerializer.Serialize(tc);
213-
var deserializedTC = JsonSerializer.Deserialize<TypedComponent>(result);
214-
deserializedTC.Should().BeOfType(typeof(CppSdkComponent));
215-
var cppSdkComponent = (CppSdkComponent)deserializedTC;
216-
cppSdkComponent.Name.Should().Be("SomeCppSdk");
217-
cppSdkComponent.Version.Should().Be("1.2.3");
218-
}
219207
}

0 commit comments

Comments
 (0)