Skip to content

Commit 9fa7819

Browse files
committed
Target net8.0 instead of netstandard21
1 parent 704850c commit 9fa7819

File tree

79 files changed

+78
-54
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+78
-54
lines changed

docs/DetailedDebugInformation.md

+1-1

publish/Magick.NET.Core.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<tags>ImageMagick Magick.NET Image Convert Resize Draw Effects</tags>
2020
<dependencies>
2121
<group targetFramework=".NETStandard2.0" />
22-
<group targetFramework=".NETStandard2.1" />
22+
<group targetFramework="net8.0" />
2323
</dependencies>
2424
</metadata>
2525
<files>
2626
<file src="..\logo\Magick.NET.icon.png" target="Magick.NET.icon.png" />
2727
<file src="..\src\Magick.NET\Copyright.txt" target="Copyright.txt" />
2828
<file src="Readme.md" target="docs\Readme.md" />
2929
</files>
30-
</package>
30+
</package>

publish/Magick.NET.SystemDrawing.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency id="Magick.NET.Core" version="13.10.0" />
2626
<dependency id="System.Drawing.Common" version="6.0.0" />
2727
</group>
28-
<group targetFramework=".NETStandard2.1">
28+
<group targetFramework="net8.0-windows">
2929
<dependency id="Magick.NET.Core" version="13.10.0" />
3030
<dependency id="System.Drawing.Common" version="6.0.0" />
3131
</group>
@@ -39,4 +39,4 @@
3939
<file src="..\src\Magick.NET\Copyright.txt" target="Copyright.txt" />
4040
<file src="Readme.md" target="docs\Readme.md" />
4141
</files>
42-
</package>
42+
</package>

publish/Magick.NET.SystemWindowsMedia.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<group targetFramework=".NETFramework4.6.2">
2222
<dependency id="Magick.NET.Core" version="13.10.0" />
2323
</group>
24-
<group targetFramework=".NETCoreApp3.1">
24+
<group targetFramework="net8.0-windows">
2525
<dependency id="Magick.NET.Core" version="13.10.0" />
2626
</group>
2727
</dependencies>
2828
<frameworkReferences>
29-
<group targetFramework=".NETCoreApp3.1">
29+
<group targetFramework="net8.0-windows">
3030
<frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
3131
</group>
3232
</frameworkReferences>
@@ -36,4 +36,4 @@
3636
<file src="..\src\Magick.NET\Copyright.txt" target="Copyright.txt" />
3737
<file src="Readme.md" target="docs\Readme.md" />
3838
</files>
39-
</package>
39+
</package>

publish/Magick.NET.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<group targetFramework=".NETStandard2.0">
2222
<dependency id="Magick.NET.Core" version="13.10.0" />
2323
</group>
24-
<group targetFramework=".NETStandard2.1">
24+
<group targetFramework="net8.0">
2525
<dependency id="Magick.NET.Core" version="13.10.0" />
2626
</group>
2727
</dependencies>
@@ -30,4 +30,4 @@
3030
<file src="..\logo\Magick.NET.icon.png" target="Magick.NET.icon.png" />
3131
<file src="Readme.md" target="docs\Readme.md" />
3232
</files>
33-
</package>
33+
</package>

publish/publish.library.ps1

+6-5
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ function createMagickNetLibraryNuGetPackage($library, $version, $commit, $pfxPas
1717

1818
if ($library -eq "Magick.NET.SystemWindowsMedia") {
1919
addLibrary $xml $library "" "AnyCPU" "net462"
20-
addLibrary $xml $library "" "AnyCPU" "netcoreapp3.1"
20+
addLibrary $xml $library "" "AnyCPU" "net8.0-windows"
21+
} else if ($library -eq "Magick.NET.SystemDrawing") {
22+
addLibrary $xml $library "" "AnyCPU" "net462"
23+
addLibrary $xml $library "" "AnyCPU" "netstandard20"
24+
addLibrary $xml $library "" "AnyCPU" "net8.0-windows"
2125
} else {
22-
if ($library -eq "Magick.NET.SystemDrawing") {
23-
addLibrary $xml $library "" "AnyCPU" "net462"
24-
}
2526
addLibrary $xml $library "" "AnyCPU" "netstandard20"
26-
addLibrary $xml $library "" "AnyCPU" "netstandard21"
27+
addLibrary $xml $library "" "AnyCPU" "net8.0"
2728
}
2829

2930
createAndSignNuGetPackage $xml $library $version $pfxPassword

publish/publish.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ param (
1515

1616
function addMagickNetLibraries($xml, $quantumName, $platform) {
1717
addLibrary $xml "Magick.NET" $quantumName $platform "netstandard20"
18-
addLibrary $xml "Magick.NET" $quantumName $platform "netstandard21"
18+
addLibrary $xml "Magick.NET" $quantumName $platform "net8.0"
1919
}
2020

2121
function addOpenMPLibrary($xml, $platform) {

samples/Magick.NET.Samples/DetailedDebugInformation.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Magick.NET.Samples;
88

99
public static class DetailedDebugInformationSamples
1010
{
11-
public static void MagickNET_Log(object sender, LogEventArgs arguments)
11+
public static void MagickNET_Log(object? sender, LogEventArgs arguments)
1212
{
1313
// Write log message
1414
Console.WriteLine(arguments.Message);

samples/Magick.NET.Samples/ExceptionHandling.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Magick.NET.Samples;
88

99
public static class ExceptionHandlingSamples
1010
{
11-
private static void MagickImage_Warning(object sender, WarningEventArgs arguments)
11+
private static void MagickImage_Warning(object? sender, WarningEventArgs arguments)
1212
=> Console.WriteLine(arguments.Message);
1313

1414
public static void ExceptionHandling()

samples/Magick.NET.Samples/Magick.NET.Samples.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard21</TargetFrameworks>
3+
<TargetFrameworks>net8.0</TargetFrameworks>
44
<OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
55
<Authors>Dirk Lemstra</Authors>
66
<Copyright>Copyright 2013-2022 Dirk Lemstra</Copyright>
@@ -18,4 +18,4 @@
1818
</ItemGroup>
1919

2020
<Import Project="../Magick.props" />
21-
</Project>
21+
</Project>

src/Magick.NET.Core/Helpers/XmlHelper.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static XmlDocument CreateDocument()
1717

1818
public static XmlElement CreateElement(XmlNode node, string name)
1919
{
20-
var doc = node.GetType() == typeof(XmlDocument) ? (XmlDocument)node : node.OwnerDocument;
20+
var doc = node.GetType() == typeof(XmlDocument) ? (XmlDocument)node : node.OwnerDocument!;
2121
var element = doc.CreateElement(name);
2222
node.AppendChild(element);
2323
return element;
@@ -34,7 +34,7 @@ public static void SetAttribute<TType>(XmlElement element, string name, TType va
3434
{
3535
XmlAttribute attribute;
3636
if (element.HasAttribute(name))
37-
attribute = element.Attributes[name];
37+
attribute = element.Attributes[name]!;
3838
else
3939
attribute = element.Attributes.Append(element.OwnerDocument.CreateAttribute(name));
4040

src/Magick.NET.Core/Magick.NET.Core.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard21;netstandard20</TargetFrameworks>
3+
<TargetFrameworks>net8.0;netstandard20</TargetFrameworks>
44
<Platforms>AnyCPU</Platforms>
55
<AssemblyVersion>13.10.0</AssemblyVersion>
66
<FileVersion>13.10.0</FileVersion>
@@ -54,4 +54,4 @@
5454
</ItemGroup>
5555

5656
<Import Project="../Magick.props" />
57-
</Project>
57+
</Project>

src/Magick.NET.Core/Profiles/8Bim/EightBimProfile.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -254,13 +254,13 @@ protected override void UpdateData()
254254
XmlHelper.SetAttribute(path, "stroke-antialiasing", "false");
255255
XmlHelper.SetAttribute(path, "d", d);
256256

257-
return new ClipPath(value.Name, doc.CreateNavigator());
257+
return new ClipPath(value.Name, doc.CreateNavigator()!);
258258
}
259259

260260
private IEightBimValue? FindValue(int id)
261261
{
262262
return _values
263-
.Where(value => value.Id == id)
263+
?.Where(value => value.Id == id)
264264
.FirstOrDefault();
265265
}
266266

src/Magick.NET.Core/Profiles/Xmp/IXmpProfile.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ public interface IXmpProfile : IImageProfile
2222
/// Converts this instance to an IXPathNavigable.
2323
/// </summary>
2424
/// <returns>A <see cref="IXPathNavigable"/>.</returns>
25-
IXPathNavigable ToIXPathNavigable();
25+
IXPathNavigable? ToIXPathNavigable();
2626

2727
/// <summary>
2828
/// Converts this instance to a XDocument.
2929
/// </summary>
3030
/// <returns>A <see cref="XDocument"/>.</returns>
31-
XDocument ToXDocument();
31+
XDocument? ToXDocument();
3232
}

src/Magick.NET.Core/Profiles/Xmp/XmpProfile.cs

+17-7
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,15 @@ public XmpProfile(IXPathNavigable document)
3333
{
3434
Throw.IfNull(nameof(document), document);
3535

36-
using var memStream = new MemoryStream();
37-
using var writer = CreateXmlWriter(memStream);
38-
document.CreateNavigator().WriteSubtree(writer);
39-
writer.Flush();
40-
SetData(memStream.ToArray());
36+
var navigator = document.CreateNavigator();
37+
if (navigator is not null)
38+
{
39+
using var memStream = new MemoryStream();
40+
using var writer = CreateXmlWriter(memStream);
41+
navigator.WriteSubtree(writer);
42+
writer.Flush();
43+
SetData(memStream.ToArray());
44+
}
4145
}
4246

4347
/// <summary>
@@ -111,9 +115,12 @@ public static XmpProfile FromXDocument(XDocument document)
111115
/// Converts this instance to an IXPathNavigable.
112116
/// </summary>
113117
/// <returns>A <see cref="IXPathNavigable"/>.</returns>
114-
public IXPathNavigable ToIXPathNavigable()
118+
public IXPathNavigable? ToIXPathNavigable()
115119
{
116120
using var reader = CreateReader();
121+
if (reader is null)
122+
return null;
123+
117124
var result = XmlHelper.CreateDocument();
118125
result.Load(reader);
119126
return result.CreateNavigator();
@@ -123,9 +130,12 @@ public IXPathNavigable ToIXPathNavigable()
123130
/// Converts this instance to a XDocument.
124131
/// </summary>
125132
/// <returns>A <see cref="XDocument"/>.</returns>
126-
public XDocument ToXDocument()
133+
public XDocument? ToXDocument()
127134
{
128135
using var reader = CreateReader();
136+
if (reader is null)
137+
return null;
138+
129139
return XDocument.Load(reader);
130140
}
131141

src/Magick.NET.Core/Types/Threshold.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public Threshold(double minimum, double maximum)
6363
/// </summary>
6464
/// <param name="obj">The object to compare this <see cref="Threshold"/> with.</param>
6565
/// <returns>True when the specified object is equal to the current <see cref="Threshold"/>.</returns>
66-
public override bool Equals(object obj)
66+
public override bool Equals(object? obj)
6767
{
6868
if (obj is not Threshold other)
6969
return false;

src/Magick.NET.SystemDrawing/Magick.NET.SystemDrawing.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard21;netstandard20;net462</TargetFrameworks>
3+
<TargetFrameworks>net8.0-windows;netstandard20;net462</TargetFrameworks>
44
<Platforms>AnyCPU</Platforms>
55
<AssemblyVersion>7.3.0</AssemblyVersion>
66
<FileVersion>7.3.0</FileVersion>
77
<Version>7.3.0</Version>
88
<Configurations>Debug;Test;Release</Configurations>
99
</PropertyGroup>
1010

11-
<ItemGroup Condition="!$(TargetFramework.StartsWith('netstandard'))">
11+
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
1212
<Reference Include="System.Drawing" />
1313
</ItemGroup>
1414

15-
<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
15+
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
1616
<!-- After an upgrade of this library the nuspec file should also be updated -->
1717
<PackageReference Include="System.Drawing.Common" Version="8.0.7" />
1818
</ItemGroup>
@@ -33,4 +33,4 @@
3333
</ItemGroup>
3434

3535
<Import Project="../Magick.props" />
36-
</Project>
36+
</Project>

src/Magick.NET.SystemWindowsMedia/Magick.NET.SystemWindowsMedia.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
3+
<TargetFrameworks>net8.0-windows;net462</TargetFrameworks>
44
<Platforms>AnyCPU</Platforms>
55
<AssemblyVersion>7.3.0</AssemblyVersion>
66
<FileVersion>7.3.0</FileVersion>
@@ -25,4 +25,4 @@
2525
</ItemGroup>
2626

2727
<Import Project="../Magick.props" />
28-
</Project>
28+
</Project>

src/Magick.NET/Defines/MagickDefine.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,11 @@ public MagickDefine(MagickFormat format, string name, string value)
151151
foreach (var val in value)
152152
{
153153
if (val is not null)
154-
values.Add(val.ToString());
154+
{
155+
var stringValue = val.ToString();
156+
if (stringValue is not null)
157+
values.Add(stringValue);
158+
}
155159
}
156160

157161
if (values.Count == 0)

src/Magick.NET/Helpers/TemporaryDefines.cs

+7-2
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,14 @@ public void SetArtifact<TValue>(string name, TValue? value)
4646
return;
4747

4848
_names.Add(name);
49+
50+
string? stringValue;
4951
if (value is IConvertible convertible)
50-
_image.SetArtifact(name, convertible.ToString(CultureInfo.InvariantCulture));
52+
stringValue = convertible.ToString(CultureInfo.InvariantCulture);
5153
else
52-
_image.SetArtifact(name, value.ToString());
54+
stringValue = value.ToString();
55+
56+
if (stringValue is not null)
57+
_image.SetArtifact(name, stringValue);
5358
}
5459
}

src/Magick.NET/Magick.NET.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard21;netstandard20</TargetFrameworks>
3+
<TargetFrameworks>net8.0;netstandard20</TargetFrameworks>
44
<Platforms>x86;x64;arm64;AnyCPU</Platforms>
55
<AssemblyVersion>13.10.0</AssemblyVersion>
66
<FileVersion>13.10.0</FileVersion>
@@ -116,6 +116,6 @@
116116
<ProjectReference Include="../Magick.NET.Core/Magick.NET.Core.csproj" />
117117
<ProjectReference Include="../../tools/Magick.NET.SourceGenerator/Magick.NET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
118118
</ItemGroup>
119-
119+
120120
<Import Project="../Magick.props" />
121-
</Project>
121+
</Project>

src/Magick.NET/MagickImage.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7281,7 +7281,7 @@ private void Opaque(IMagickColor<QuantumType> target, IMagickColor<QuantumType>
72817281
return new ColorProfile(name, info.Datum);
72827282
}
72837283

7284-
private void OnArtifact(object sender, ArtifactEventArgs arguments)
7284+
private void OnArtifact(object? sender, ArtifactEventArgs arguments)
72857285
{
72867286
if (arguments.Value is null)
72877287
RemoveArtifact(arguments.Key);
@@ -7300,7 +7300,7 @@ private bool OnProgress(IntPtr origin, long offset, ulong extent, IntPtr userDat
73007300
return !eventArgs.Cancel;
73017301
}
73027302

7303-
private void OnWarning(object sender, WarningEventArgs arguments)
7303+
private void OnWarning(object? sender, WarningEventArgs arguments)
73047304
=> _warning?.Invoke(this, arguments);
73057305

73067306
private void Read(byte[] data, nuint offset, nuint length, IMagickReadSettings<QuantumType>? readSettings, bool ping, string? fileName = null)

src/Magick.NET/MagickImageCollection.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1911,7 +1911,7 @@ private void ReplaceImages(IntPtr images)
19111911
Add(image);
19121912
}
19131913

1914-
private void OnWarning(object sender, WarningEventArgs arguments)
1914+
private void OnWarning(object? sender, WarningEventArgs arguments)
19151915
=> _warning?.Invoke(this, arguments);
19161916

19171917
private void SetDefines(IWriteDefines defines)

src/Shared/EnumHelper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static string ConvertFlags<TEnum>(TEnum value)
1313
=> value.ToString();
1414

1515
public static string GetName(Enum value)
16-
=> Enum.GetName(value.GetType(), value);
16+
=> Enum.GetName(value.GetType(), value)!;
1717

1818
public static bool HasFlag<TEnum>(TEnum value, TEnum flag)
1919
where TEnum : struct, Enum

0 commit comments

Comments
 (0)