Skip to content

Commit 103c038

Browse files
committed
ImageMagick now also includes the mime.xml file in the resources.
1 parent eb62468 commit 103c038

File tree

4 files changed

+39
-0
lines changed

4 files changed

+39
-0
lines changed

src/Magick.NET.Core/Configuration/IConfigurationFiles.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ public interface IConfigurationFiles
5050
/// </summary>
5151
IConfigurationFile Log { get; }
5252

53+
/// <summary>
54+
/// Gets the mime configuration.
55+
/// </summary>
56+
IConfigurationFile Mime { get; }
57+
5358
/// <summary>
5459
/// Gets the policy configuration.
5560
/// </summary>

src/Magick.NET/Configuration/ConfigurationFiles.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ private ConfigurationFiles()
1818
English = new ConfigurationFile("english.xml");
1919
Locale = new ConfigurationFile("locale.xml");
2020
Log = new ConfigurationFile("log.xml");
21+
Mime = new ConfigurationFile("mime.xml");
2122
Policy = new ConfigurationFile("policy.xml");
2223
Thresholds = new ConfigurationFile("thresholds.xml");
2324
Type = new ConfigurationFile("type.xml");
@@ -43,6 +44,7 @@ IEnumerable<IConfigurationFile> IConfigurationFiles.All
4344
yield return English;
4445
yield return Locale;
4546
yield return Log;
47+
yield return Mime;
4648
yield return Policy;
4749
yield return Thresholds;
4850
yield return Type;
@@ -86,6 +88,11 @@ IConfigurationFiles IConfigurationFiles.Default
8688
/// </summary>
8789
public IConfigurationFile Log { get; }
8890

91+
/// <summary>
92+
/// Gets the log configuration.
93+
/// </summary>
94+
public IConfigurationFile Mime { get; }
95+
8996
/// <summary>
9097
/// Gets the policy configuration.
9198
/// </summary>

src/Magick.NET/Magick.NET.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@
100100
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/log.xml" Link="Resources/log.xml">
101101
<LogicalName>ImageMagick.Resources.Xml.log.xml</LogicalName>
102102
</EmbeddedResource>
103+
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/mime.xml" Link="Resources/mime.xml">
104+
<LogicalName>ImageMagick.Resources.Xml.mime.xml</LogicalName>
105+
</EmbeddedResource>
103106
<EmbeddedResource Include="../Magick.Native/resources/Release$(QuantumType)/policy.xml" Link="Resources/policy.xml">
104107
<LogicalName>ImageMagick.Resources.Xml.policy.xml</LogicalName>
105108
</EmbeddedResource>
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
2+
// Licensed under the Apache License, Version 2.0.
3+
4+
using ImageMagick.Configuration;
5+
using Xunit;
6+
7+
namespace Magick.NET.Tests;
8+
9+
public partial class ConfigurationFilesTests
10+
{
11+
public class TheMimeProperty
12+
{
13+
[Fact]
14+
public void ShouldBeInitialized()
15+
{
16+
var configurationFiles = ConfigurationFiles.Default;
17+
18+
Assert.NotNull(configurationFiles.Mime);
19+
Assert.Equal("mime.xml", configurationFiles.Mime.FileName);
20+
Assert.NotNull(configurationFiles.Mime.Data);
21+
Assert.Contains(@"<mimemap>", configurationFiles.Mime.Data);
22+
}
23+
}
24+
}

0 commit comments

Comments
 (0)