diff --git a/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.csproj b/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.csproj index 0b6fdc261..cba805ef9 100644 --- a/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.csproj +++ b/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.csproj @@ -12,6 +12,7 @@ Tasks and targets for running the SBOM tool. true net8.0 + true diff --git a/src/Microsoft.Sbom.Targets/SbomInputValidator.cs b/src/Microsoft.Sbom.Targets/SbomInputValidator.cs index 747595eed..b03f6e240 100644 --- a/src/Microsoft.Sbom.Targets/SbomInputValidator.cs +++ b/src/Microsoft.Sbom.Targets/SbomInputValidator.cs @@ -41,18 +41,18 @@ public bool ValidateAndSanitizeRequiredParams() } } - this.PackageSupplier = Remove_Spaces_Tabs_Newlines(this.PackageSupplier); - this.PackageName = Remove_Spaces_Tabs_Newlines(this.PackageName); - this.PackageVersion = Remove_Spaces_Tabs_Newlines(this.PackageVersion); + this.PackageSupplier = Remove_Tabs_Newlines(this.PackageSupplier); + this.PackageName = Remove_Tabs_Newlines(this.PackageName); + this.PackageVersion = Remove_Tabs_Newlines(this.PackageVersion); this.NamespaceBaseUri = this.NamespaceBaseUri.Trim(); this.BuildDropPath = this.BuildDropPath.Trim(); return true; } - public string Remove_Spaces_Tabs_Newlines(string value) + public string Remove_Tabs_Newlines(string value) { - return value.Replace("\n", string.Empty).Replace("\t", string.Empty).Replace(" ", string.Empty); + return value.Replace("\n", string.Empty).Replace("\t", string.Empty).Trim(); } /// diff --git a/test/Microsoft.Sbom.Targets.Tests/AbstractGenerateSbomTaskTests.cs b/test/Microsoft.Sbom.Targets.Tests/AbstractGenerateSbomTaskTests.cs index 97e57b40a..aa0595964 100644 --- a/test/Microsoft.Sbom.Targets.Tests/AbstractGenerateSbomTaskTests.cs +++ b/test/Microsoft.Sbom.Targets.Tests/AbstractGenerateSbomTaskTests.cs @@ -171,24 +171,21 @@ private static IEnumerable GetPackageSupplierCases() { yield return new object[] { "Test-\nMicrosoft", PackageName, PackageVersion }; yield return new object[] { "Test\t-Microsoft", PackageName, PackageVersion }; - yield return new object[] { "Test - Microsoft ", PackageName, PackageVersion }; - yield return new object[] { "Test - Mic\tro\nsoft", PackageName, PackageVersion }; + yield return new object[] { "Test-Mic\tro\nsoft", PackageName, PackageVersion }; } private static IEnumerable GetPackageNameCases() { yield return new object[] { PackageSupplier, "CoseSign\nTool", PackageVersion }; yield return new object[] { PackageSupplier, "Cose\tSign\tTool", PackageVersion }; - yield return new object[] { PackageSupplier, "Cose Sign Tool ", PackageVersion }; - yield return new object[] { PackageSupplier, "Cose S\ti\ngn \n Too\tl", PackageVersion }; + yield return new object[] { PackageSupplier, "CoseS\ti\ngn\nToo\tl", PackageVersion }; } private static IEnumerable GetPackageVersionCases() { yield return new object[] { PackageSupplier, PackageName, "0.0\n.1" }; yield return new object[] { PackageSupplier, PackageName, "0.0\t.1" }; - yield return new object[] { PackageSupplier, PackageName, "0. 0. 1" }; - yield return new object[] { PackageSupplier, PackageName, "0 . \t 0 \n .1" }; + yield return new object[] { PackageSupplier, PackageName, "0.\t0\n.1" }; } [TestMethod]