Skip to content

Commit 9fa7819

Browse files
dlemstradlemstra
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‎

Lines changed: 1 addition & 1 deletion

‎publish/Magick.NET.Core.nuspec‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 6 additions & 5 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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>

0 commit comments

Comments
 (0)