Skip to content

Honor content type overrides #1016

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

Open
kennethr127 wants to merge 3 commits into
base: main
Choose a base branch
from
+24 −2
Open

Honor content type overrides #1016

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
520ebba
Fixing an issue where the Overrides in the [Content_Types].xml file i…
kennethr127 Apr 1, 2026
567aba5
Reverting change to json
kennethr127 Apr 1, 2026
6cd7611
Adding new vsix package for testing
kennethr127 Apr 1, 2026
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
7 changes: 5 additions & 2 deletions src/Sign.Core/Tools/VsixSignTool/OpcPart.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ public string ContentType
{
var extension = Path.GetExtension(_path)?.TrimStart('.');

return Package.ContentTypes.FirstOrDefault(ct => string.Equals(ct.Extension, extension, StringComparison.OrdinalIgnoreCase))?.ContentType ?? OpcKnownMimeTypes.OctetString;
var defaultContentType = Package.ContentTypes.FirstOrDefault(ct => string.Equals(ct.Extension, extension, StringComparison.OrdinalIgnoreCase));
var overrideContentType = Package.ContentTypes.FirstOrDefault(ct => string.Equals(ct.PartName?.Trim('/'), _path, StringComparison.OrdinalIgnoreCase));

return overrideContentType?.ContentType ?? defaultContentType?.ContentType ?? OpcKnownMimeTypes.OctetString;
}
}

Expand Down Expand Up @@ -111,4 +114,4 @@ private OpcRelationships ConstructRelationships()
/// <inheritdoc />
public override int GetHashCode() => Uri.GetHashCode();
}
}
}
Binary file added test/Sign.Core.Test/TestAssets/VSIXSamples/OpenVsixSignToolTest-Overrides.vsix
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions test/Sign.Core.Test/Tools/VSIXSignTool/OpcPackageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace Sign.Core.Test
public class OpcPackageTests : IDisposable
{
private static readonly string SamplePackage = Path.Combine(".", "TestAssets", "VSIXSamples", "OpenVsixSignToolTest.vsix");
private static readonly string SamplePackageWithOverrides = Path.Combine(".", "TestAssets", "VSIXSamples", "OpenVsixSignToolTest-Overrides.vsix");
private static readonly string SamplePackageSigned = Path.Combine(".", "TestAssets", "VSIXSamples", "OpenVsixSignToolTest-Signed.vsix");
private readonly List<string> _shadowFiles = new List<string>();

Expand Down Expand Up @@ -187,6 +188,24 @@ public void ShouldReturnSignatureForSignedPackage()
}
}

[Fact]
public void ShouldHonorContentTypeIfOverrideIsListedInContentTypesFile()
{
string path;
using (var package = ShadowCopyPackage(SamplePackageWithOverrides, out path, OpcPackageFileMode.ReadWrite))
{
var partToCheck = new Uri("/extension.vsixmanifest", UriKind.Relative);
var part = package.GetPart(partToCheck);
Assert.True(part != null && part.ContentType == "text/xml");
}
using (var package = OpcPackage.Open(path, OpcPackageFileMode.ReadWrite))
{
var partToCheck = new Uri("/extension.vsixmanifest", UriKind.Relative);
var part = package.GetPart(partToCheck);
Assert.True(part != null && part.ContentType == "text/xml");
}
}

private OpcPackage ShadowCopyPackage(string packagePath, out string path, OpcPackageFileMode mode = OpcPackageFileMode.Read)
{
var temp = Path.GetTempFileName();
Expand Down