Skip to content

Commit bed0aa6

Browse files
dlemstradlemstra
committed
Also use TargetPlatformIdentifier in the test projects.
1 parent 84acb00 commit bed0aa6

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ function testMagickNET($quantumName, $platformName) {
3636
return
3737
}
3838

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

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.T
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.0-windows mkdir %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8.0-windows
36+
if not exist %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8.0 mkdir %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8.0
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.0-windows
42-
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8.0-windows
41+
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8.0
42+
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.SystemDrawing.Tests\bin\%config%%quantumName%\%platformName%\net8.0
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.0-windows mkdir %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8.0-windows
46+
if not exist %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8.0 mkdir %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8.0
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.0-windows
52-
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8.0-windows
51+
copy /y Magick.Native-%quantumName%-%platformName%.dll %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8.0
52+
copy /y Magick.Native-%quantumName%-%platformName%.pdb %testfolder%\Magick.NET.SystemWindowsMedia.Tests\bin\%config%%quantumName%\%platformName%\net8.0
5353

5454
goto done
5555

‎src/Magick.Native/install.ps1‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ function copyToTestProjectFolder($source, $target, $quantum, $platform, $configu
6262
if ($platform -ne "AnyCPU") {
6363
[void](New-Item -ItemType directory -Force -Path "$target\$configuration$quantum\$platform\net8.0")
6464
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"
6765
}
6866
}
6967

‎tests/Magick.NET.SystemDrawing.Tests/Magick.NET.SystemDrawing.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0-windows;net462</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net462</TargetFrameworks>
4+
<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
45
<Platforms>x86;x64;arm64;AnyCPU</Platforms>
56
<Configurations>DebugQ8;DebugQ16;DebugQ16-HDRI;TestQ8;TestQ16;TestQ16-HDRI;TestQ8-OpenMP;TestQ16-OpenMP;TestQ16-HDRI-OpenMP</Configurations>
67
</PropertyGroup>

‎tests/Magick.NET.SystemWindowsMedia.Tests/Magick.NET.SystemWindowsMedia.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0-windows;net462</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net462</TargetFrameworks>
4+
<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
45
<Platforms>x86;x64;arm64;AnyCPU</Platforms>
56
<Configurations>DebugQ8;DebugQ16;DebugQ16-HDRI;TestQ8;TestQ16;TestQ16-HDRI;TestQ8-OpenMP;TestQ16-OpenMP;TestQ16-HDRI-OpenMP</Configurations>
67
</PropertyGroup>

0 commit comments

Comments
 (0)