Skip to content

Commit 8d62778

Browse files
dlemstradlemstra
committed
Use net8.0 instead of net8.
1 parent 1d6261f commit 8d62778

File tree

12 files changed

+34
-34
lines changed

12 files changed

+34
-34
lines changed

‎build/shared/build.Magick.NET.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ buildMagickNET() {
99
config=$config-OpenMP
1010
fi
1111

12-
dotnet build tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f net8 -c $config
13-
dotnet build tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f net8 -c $config
12+
dotnet build tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f net8.0 -c $config
13+
dotnet build tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f net8.0 -c $config
1414
}
1515

1616
buildMagickNET "Q8"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ testMagickNET() {
99
config=$config-OpenMP
1010
fi
1111

12-
dotnet test tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f net8 --no-build -c $config
13-
dotnet test tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f net8 --no-build -c $config
12+
dotnet test tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.csproj -f net8.0 --no-build -c $config
13+
dotnet test tests/Magick.NET.Tests/Magick.NET.Tests.csproj -f net8.0 --no-build -c $config
1414
}
1515

1616
testMagickNET "Q8"

‎build/windows/test.Magick.NET.arm64.cmd‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
echo "src\Magick.Native\Install.cmd should be executed before running the tests"
44
pause
55

6-
"c:\Program Files\dotnet\dotnet.exe" test -c TestQ8 /p:Platform=arm64 --framework net8 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
6+
"c:\Program Files\dotnet\dotnet.exe" test -c TestQ8 /p:Platform=arm64 --framework net8.0 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
77
if %errorlevel% neq 0 goto DONE
8-
"c:\Program Files\dotnet\dotnet.exe" test -c TestQ16 /p:Platform=arm64 --framework net8 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
8+
"c:\Program Files\dotnet\dotnet.exe" test -c TestQ16 /p:Platform=arm64 --framework net8.0 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
99
if %errorlevel% neq 0 goto DONE
10-
"c:\Program Files\dotnet\dotnet.exe" test -c TestQ16-HDRI /p:Platform=arm64 --framework net8 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
10+
"c:\Program Files\dotnet\dotnet.exe" test -c TestQ16-HDRI /p:Platform=arm64 --framework net8.0 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
1111
if %errorlevel% neq 0 goto DONE
12-
"c:\Program Files\dotnet\dotnet.exe" test -c TestQ8-OpenMP /p:Platform=arm64 --framework net8 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
12+
"c:\Program Files\dotnet\dotnet.exe" test -c TestQ8-OpenMP /p:Platform=arm64 --framework net8.0 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
1313
if %errorlevel% neq 0 goto DONE
14-
"c:\Program Files\dotnet\dotnet.exe" test -c TestQ16-OpenMP /p:Platform=arm64 --framework net8 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
14+
"c:\Program Files\dotnet\dotnet.exe" test -c TestQ16-OpenMP /p:Platform=arm64 --framework net8.0 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
1515
if %errorlevel% neq 0 goto DONE
16-
"c:\Program Files\dotnet\dotnet.exe" test -c TestQ16-HDRI-OpenMP /p:Platform=arm64 --framework net8 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
16+
"c:\Program Files\dotnet\dotnet.exe" test -c TestQ16-HDRI-OpenMP /p:Platform=arm64 --framework net8.0 ..\..\tests\Magick.NET.Tests\Magick.NET.Tests.csproj
1717
if %errorlevel% neq 0 goto DONE
1818

1919
:DONE

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ function testMagickNET($quantumName, $platformName) {
3030
runTests $quantumName $platformName "net462" "Magick.NET"
3131

3232
if ($platformName -ne "Any CPU") {
33-
runTests $quantumName $platformName "net8" "Magick.NET"
33+
runTests $quantumName $platformName "net8.0" "Magick.NET"
3434

3535
if ($quantumName -like "*OpenMP*") {
3636
return
3737
}
3838

39-
runTests $quantumName $platformName "net8-windows" "Magick.NET.SystemDrawing"
40-
runTests $quantumName $platformName "net8-windows" "Magick.NET.SystemWindowsMedia"
39+
runTests $quantumName $platformName "net8.0-windows" "Magick.NET.SystemDrawing"
40+
runTests $quantumName $platformName "net8.0-windows" "Magick.NET.SystemWindowsMedia"
4141
} else {
4242
runTests "" $platformName "net462" "Magick.NET.Core"
43-
runTests "" $platformName "net8" "Magick.NET.Core"
43+
runTests "" $platformName "net8.0" "Magick.NET.Core"
4444
}
4545

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

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,33 @@ set testfolder=..\..\..\..\..\..\Magick.NET\tests
2323

2424
if not exist %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net462 mkdir %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net462
2525
if not exist %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\AnyCPU\net462 mkdir %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\AnyCPU\net462
26-
if not exist %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net8 mkdir %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net8
26+
if not exist %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net8.0 mkdir %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net8.0
2727
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net462
2828
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net462
2929
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\AnyCPU\net462
3030
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\AnyCPU\net462
31-
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net8
32-
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net8
31+
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net8.0
32+
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.Tests\bin\%config%%quantumName%\%platformName%\net8.0
3333

3434
if not exist %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net462 mkdir %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net462
3535
if not exist %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\AnyCPU\net462 mkdir %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\AnyCPU\net462
36-
if not exist %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8-windows mkdir %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8-windows
36+
if not exist %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8.0-windows mkdir %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8.0-windows
3737
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net462
3838
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net462
3939
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\AnyCPU\net462
4040
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\AnyCPU\net462
41-
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8-windows
42-
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8-windows
41+
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8.0-windows
42+
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8.0-windows
4343

4444
if not exist %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net462 mkdir %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net462
4545
if not exist %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\AnyCPU\net462 mkdir %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\AnyCPU\net462
46-
if not exist %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8-windows mkdir %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8-windows
46+
if not exist %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8.0-windows mkdir %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8.0-windows
4747
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net462
4848
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net462
4949
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\AnyCPU\net462
5050
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\AnyCPU\net462
51-
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8-windows
52-
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8-windows
51+
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8.0-windows
52+
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8.0-windows
5353

5454
goto done
5555

‎src/Magick.Native/install.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ function copyToTestProjectFolder($source, $target, $quantum, $platform, $configu
6060
Copy-Item "$source\$fileName" "$target\$configuration$quantum\$platform\net462\$fileName"
6161

6262
if ($platform -ne "AnyCPU") {
63-
[void](New-Item -ItemType directory -Force -Path "$target\$configuration$quantum\$platform\net8")
64-
Copy-Item "$source\$fileName" "$target\$configuration$quantum\$platform\net8\$fileName"
65-
[void](New-Item -ItemType directory -Force -Path "$target\$configuration$quantum\$platform\net8-windows")
66-
Copy-Item "$source\$fileName" "$target\$configuration$quantum\$platform\net8-windows\$fileName"
63+
[void](New-Item -ItemType directory -Force -Path "$target\$configuration$quantum\$platform\net8.0")
64+
Copy-Item "$source\$fileName" "$target\$configuration$quantum\$platform\net8.0\$fileName"
65+
[void](New-Item -ItemType directory -Force -Path "$target\$configuration$quantum\$platform\net8.0-windows")
66+
Copy-Item "$source\$fileName" "$target\$configuration$quantum\$platform\net8.0-windows\$fileName"
6767
}
6868
}
6969

‎src/Magick.Native/install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ copyToTestProject() {
2626
local quantum=$3
2727
local openmp=$4
2828

29-
folder=../../tests/Magick.NET.Tests/bin/Test$quantum$openmp/AnyCPU/net8
29+
folder=../../tests/Magick.NET.Tests/bin/Test$quantum$openmp/AnyCPU/net8.0
3030
mkdir -p $folder
3131
cp temp/$runtime/Release$quantum$openmp/$platform/Magick.Native-$quantum$openmp-$platform.dll* $folder | true
3232

‎tests/Magick.NET.Core.Tests/Magick.NET.Core.Tests.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">
22
<PropertyGroup>
3-
<TargetFrameworks>net8;net462</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net462</TargetFrameworks>
44
<Platforms>AnyCPU</Platforms>
55
<Configurations>Debug;Test</Configurations>
66
</PropertyGroup>

‎tests/Magick.NET.SystemDrawing.Tests/Magick.NET.SystemDrawing.Tests.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" ToolsVersion="15.0">
22
<PropertyGroup>
3-
<TargetFrameworks>net8-windows;net462</TargetFrameworks>
3+
<TargetFrameworks>net8.0-windows;net462</TargetFrameworks>
44
<Platforms>x86;x64;arm64;AnyCPU</Platforms>
55
<Configurations>DebugQ8;DebugQ16;DebugQ16-HDRI;TestQ8;TestQ16;TestQ16-HDRI;TestQ8-OpenMP;TestQ16-OpenMP;TestQ16-HDRI-OpenMP</Configurations>
66
</PropertyGroup>

‎tests/Magick.NET.SystemWindowsMedia.Tests/Magick.NET.SystemWindowsMedia.Tests.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>net8-windows;net462</TargetFrameworks>
3+
<TargetFrameworks>net8.0-windows;net462</TargetFrameworks>
44
<Platforms>x86;x64;arm64;AnyCPU</Platforms>
55
<Configurations>DebugQ8;DebugQ16;DebugQ16-HDRI;TestQ8;TestQ16;TestQ16-HDRI;TestQ8-OpenMP;TestQ16-OpenMP;TestQ16-HDRI-OpenMP</Configurations>
66
</PropertyGroup>
@@ -48,7 +48,7 @@
4848
</PackageReference>
4949
</ItemGroup>
5050

51-
<ItemGroup Condition="!$(TargetFramework.StartsWith('net8'))">
51+
<ItemGroup Condition="!$(TargetFramework.StartsWith('net8.0'))">
5252
<Reference Include="WindowsBase" />
5353
<Reference Include="PresentationCore" />
5454
</ItemGroup>

0 commit comments

Comments
 (0)