Skip to content

Commit 60accc1

Browse files
dlemstradlemstra
committed
Use netcoreapp 3.1 instead of 3.0.
1 parent b38ed62 commit 60accc1

File tree

14 files changed

+33
-33
lines changed

14 files changed

+33
-33
lines changed

‎build/linux-musl/test.Magick.NET.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ set -e
44
buildAndTest() {
55
local quantum=$1
66

7-
dotnet build tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f netcoreapp3.0 -c Test$quantum
8-
dotnet test tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f netcoreapp3.0 -c Test$quantum
9-
dotnet build tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f netcoreapp3.0 -c Test$quantum
10-
dotnet test tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f netcoreapp3.0 -c Test$quantum
7+
dotnet build tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f netcoreapp3.1 -c Test$quantum
8+
dotnet test tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f netcoreapp3.1 -c Test$quantum
9+
dotnet build tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f netcoreapp3.1 -c Test$quantum
10+
dotnet test tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f netcoreapp3.1 -c Test$quantum
1111
}
1212

1313
buildAndTest "Q8"

‎build/linux/test.Magick.NET.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ set -e
44
buildAndTest() {
55
local quantum=$1
66

7-
dotnet build tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f netcoreapp3.0 -c Test$quantum
8-
dotnet test tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f netcoreapp3.0 -c Test$quantum
9-
dotnet build tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f netcoreapp3.0 -c Test$quantum
10-
dotnet test tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f netcoreapp3.0 -c Test$quantum
7+
dotnet build tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f netcoreapp3.1 -c Test$quantum
8+
dotnet test tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f netcoreapp3.1 -c Test$quantum
9+
dotnet build tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f netcoreapp3.1 -c Test$quantum
10+
dotnet test tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f netcoreapp3.1 -c Test$quantum
1111
}
1212

1313
buildAndTest "Q8"

‎build/macos/test.Magick.NET.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ set -e
44
buildAndTest() {
55
local quantum=$1
66

7-
dotnet build tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f netcoreapp3.0 -c Test$quantum
8-
dotnet test tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f netcoreapp3.0 -c Test$quantum
9-
dotnet build tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f netcoreapp3.0 -c Test$quantum
10-
dotnet test tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f netcoreapp3.0 -c Test$quantum
7+
dotnet build tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f netcoreapp3.1 -c Test$quantum
8+
dotnet test tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f netcoreapp3.1 -c Test$quantum
9+
dotnet build tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f netcoreapp3.1 -c Test$quantum
10+
dotnet test tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f netcoreapp3.1 -c Test$quantum
1111
}
1212

1313
buildAndTest "Q8"

‎build/windows/test.Magick.NET.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ function testMagickNET($quantumName, $platformName) {
3939
runTests $quantumName $platformName "net452" "Magick.NET"
4040

4141
if ($platformName -ne "Any CPU") {
42-
runTests $quantumName $platformName "netcoreapp3.0" "Magick.NET"
42+
runTests $quantumName $platformName "netcoreapp3.1" "Magick.NET"
4343

4444
if ($quantumName -like "*OpenMP*") {
4545
return
4646
}
4747

48-
runTests $quantumName $platformName "netcoreapp3.0" "Magick.NET.SystemDrawing"
49-
runTests $quantumName $platformName "netcoreapp3.0" "Magick.NET.SystemWindowsMedia"
48+
runTests $quantumName $platformName "netcoreapp3.1" "Magick.NET.SystemDrawing"
49+
runTests $quantumName $platformName "netcoreapp3.1" "Magick.NET.SystemWindowsMedia"
5050
} else {
5151
runTests "" $platformName "net452" "Magick.NET.Core"
52-
runTests "" $platformName "netcoreapp3.0" "Magick.NET.Core"
52+
runTests "" $platformName "netcoreapp3.1" "Magick.NET.Core"
5353
}
5454

5555
if ($quantumName -like "*OpenMP*") {

‎publish/Magick.NET.SystemWindowsMedia.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<group targetFramework=".NETFramework4.0">
2121
<dependency id="Magick.NET.Core" version="5.1.0.0" />
2222
</group>
23-
<group targetFramework=".NETCoreApp3.0">
23+
<group targetFramework=".NETCoreApp3.1">
2424
<dependency id="Magick.NET.Core" version="5.1.0.0" />
2525
</group>
2626
</dependencies>
2727
<frameworkReferences>
28-
<group targetFramework=".NETCoreApp3.0">
28+
<group targetFramework=".NETCoreApp3.1">
2929
<frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
3030
</group>
3131
</frameworkReferences>

‎publish/publish.library.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function createMagickNetLibraryNuGetPackage($library, $version, $commit, $pfxPas
3535
}
3636

3737
if ($library -eq "Magick.NET.SystemWindowsMedia") {
38-
addLibrary $xml $library "" "AnyCPU" "netcoreapp3.0"
38+
addLibrary $xml $library "" "AnyCPU" "netcoreapp3.1"
3939
} else {
4040
addLibrary $xml $library "" "AnyCPU" "netstandard20"
4141
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="15.0">
22
<PropertyGroup>
3-
<TargetFrameworks>net40;netcoreapp3.0</TargetFrameworks>
3+
<TargetFrameworks>net40;netcoreapp3.1</TargetFrameworks>
44
<Platforms>AnyCPU</Platforms>
55
<AssemblyVersion>2.0.3.0</AssemblyVersion>
66
<FileVersion>2.0.3.0</FileVersion>

‎src/Magick.Native/build/Build.cmd‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ cd ..\..\src\Magick.Native\bin\Debug%quantumName%\%platformName%
2121

2222
copy /y Magick.Native-%quantumName%-%platformName%.dll ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net452
2323
copy /y Magick.Native-%quantumName%-%platformName%.pdb ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net452
24-
copy /y Magick.Native-%quantumName%-%platformName%.dll ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\netcoreapp3.0
25-
copy /y Magick.Native-%quantumName%-%platformName%.pdb ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\netcoreapp3.0
24+
copy /y Magick.Native-%quantumName%-%platformName%.dll ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\netcoreapp3.1
25+
copy /y Magick.Native-%quantumName%-%platformName%.pdb ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\netcoreapp3.1
2626

2727
copy /y Magick.Native-%quantumName%-%platformName%.dll ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net452
2828
copy /y Magick.Native-%quantumName%-%platformName%.pdb ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net452
29-
copy /y Magick.Native-%quantumName%-%platformName%.dll ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\netcoreapp3.0
30-
copy /y Magick.Native-%quantumName%-%platformName%.pdb ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\netcoreapp3.0
29+
copy /y Magick.Native-%quantumName%-%platformName%.dll ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\netcoreapp3.1
30+
copy /y Magick.Native-%quantumName%-%platformName%.pdb ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\netcoreapp3.1
3131

3232
copy /y Magick.Native-%quantumName%-%platformName%.dll ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net452
3333
copy /y Magick.Native-%quantumName%-%platformName%.pdb ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net452
34-
copy /y Magick.Native-%quantumName%-%platformName%.dll ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\netcoreapp3.0
35-
copy /y Magick.Native-%quantumName%-%platformName%.pdb ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\netcoreapp3.0
34+
copy /y Magick.Native-%quantumName%-%platformName%.dll ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\netcoreapp3.1
35+
copy /y Magick.Native-%quantumName%-%platformName%.pdb ..\..\..\..\..\..\Magick.NET\tests\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\netcoreapp3.1
3636

3737
goto done
3838

‎src/Magick.Native/install.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ function copyToTestProject($source, $target, $quantum, $platform) {
6363
$fileName = "Magick.Native-$quantum-$platform.dll"
6464
[void](New-Item -ItemType directory -Force -Path "$target\Test$quantum\$platform\net452")
6565
Copy-Item "$source\$fileName" "$target\Test$quantum\$platform\net452\$fileName"
66-
[void](New-Item -ItemType directory -Force -Path "$target\Test$quantum\$platform\netcoreapp3.0")
67-
Copy-Item "$source\$fileName" "$target\Test$quantum\$platform\netcoreapp3.0\$fileName"
66+
[void](New-Item -ItemType directory -Force -Path "$target\Test$quantum\$platform\netcoreapp3.1")
67+
Copy-Item "$source\$fileName" "$target\Test$quantum\$platform\netcoreapp3.1\$fileName"
6868
}
6969

7070
function copyToTestProjects($source, $target) {

‎src/Magick.Native/install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ copyToTestProject() {
1919
local runtime=$1
2020
local quantum=$2
2121

22-
folder=../../tests/Magick.NET.Tests/bin/Test$quantum/AnyCPU/netcoreapp3.0
22+
folder=../../tests/Magick.NET.Tests/bin/Test$quantum/AnyCPU/netcoreapp3.1
2323
mkdir -p $folder
2424
cp temp/content/$runtime/Release$quantum/x64/Magick.Native-$quantum-x64.dll* $folder
2525

0 commit comments

Comments
 (0)