Merge pull request #1829 from shimat/remove_direct_net48

Remove net48 as a direct build target

Author: shimat

.github/copilot-instructions.md

@@ -0,0 +1,20 @@
+## File encoding
+
+All source files in this repository use **UTF-8 with BOM** (`EF BB BF`).
+
+When creating or editing files, always save them as UTF-8 with BOM. This applies to `.cs`, `.csproj`, `.yml`, `.md`, `.json`, and all other text files.
+
+Do **not** save files as UTF-8 without BOM, ANSI, or Shift-JIS — doing so will corrupt Japanese content and break Visual Studio / MSBuild tooling.
+
+### Verification
+
+```powershell
+# Check whether a file has UTF-8 BOM
+$b = [System.IO.File]::ReadAllBytes("path\to\file")
+$b[0] -eq 0xEF -and $b[1] -eq 0xBB -and $b[2] -eq 0xBF   # should be True
+
+# Convert a file to UTF-8 with BOM
+$enc = New-Object System.Text.UTF8Encoding $true
+$content = [System.IO.File]::ReadAllText("path\to\file", [System.Text.Encoding]::UTF8)
+[System.IO.File]::WriteAllText("path\to\file", $content, $enc)
+```

.github/workflows/windows.yml

@@ -1,4 +1,4 @@
-name: Windows Server 2025
+name: Windows Server 2025
 
 on:
   pull_request:
@@ -16,32 +16,27 @@ jobs:
   build:
 
     runs-on: windows-2025
-    
+
     steps:
       - name: Checkout
         uses: actions/checkout@v6
         with:
           fetch-depth: 1
           submodules: true
 
-#      - name: Cache restored NuGet packages
-#        uses: actions/cache@v5
-#        with:
-#          path: ${{ github.workspace }}/.nuget/packages
-#          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-#          restore-keys: |
-#            ${{ runner.os }}-nuget-
+      - name: Install .NET
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: |
+            8.0.x
 
       - name: Download OpenCV binaries
         shell: powershell
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          gh release download --repo shimat/opencv_files ${env:OPENCV_FILES_TAG} --pattern "opencv_win_x64.zip" 
-          gh release download --repo shimat/opencv_files ${env:OPENCV_FILES_TAG} --pattern "opencv_win_x86.zip"       
+          gh release download --repo shimat/opencv_files ${env:OPENCV_FILES_TAG} --pattern "opencv_win_x64.zip"
           Expand-Archive -Path opencv_win_x64.zip -DestinationPath opencv_files/opencv_win_x64 -Force -ErrorAction Stop
-          Expand-Archive -Path opencv_win_x86.zip -DestinationPath opencv_files/opencv_win_x86 -Force -ErrorAction Stop
-          ls opencv_files
           ls opencv_files/opencv_win_x64
 
       - name: Download Tesseract binaries
@@ -51,7 +46,7 @@ jobs:
         run: |
           gh release download --repo shimat/tesseract_vcpkg ${TESSERACT_RELEASE_VERSION} --pattern "*.zip" --output tesseract.zip
           Expand-Archive -Path tesseract.zip -DestinationPath tesseract_files -Force -ErrorAction Stop
-          ls tesseract_files          
+          ls tesseract_files
           Move-Item tesseract_files/tesseract_vcpkg.0.0.9-beta tesseract_files/tesseract_vcpkg
           ls tesseract_files/tesseract_vcpkg
           New-Item tesseract_files/tesseract_vcpkg -ItemType Directory -Force
@@ -60,8 +55,7 @@ jobs:
 
       - name: NuGet restore
         shell: cmd
-        run: |
-          nuget restore
+        run: nuget restore
 
       # Commented out: FFmpeg backend is included in opencv_videoio_ffmpeg DLLs
       # If video tests fail, uncomment this step
@@ -77,11 +71,7 @@ jobs:
         shell: cmd
         run: msbuild OpenCvSharp.sln /t:build /p:configuration=Release /p:platform=x64 -maxcpucount
 
-      - name: Build x86
-        shell: cmd
-        run: msbuild OpenCvSharp.sln /t:build /p:configuration=Release /p:platform=x86 -maxcpucount
-
-      - name: Build slim native runtime (x64/x86)
+      - name: Build slim native runtime
         shell: powershell
         run: |
           $ErrorActionPreference = "Stop"
@@ -92,101 +82,67 @@ jobs:
           $env:CL = "$slimDefines $env:CL"
 
           # Keep slim outputs/intermediates separate from the full Release build artifacts.
-          # This avoids reusing non-slim object files from earlier steps.
-          $slimOutX64 = Join-Path $env:GITHUB_WORKSPACE "src/ReleaseSlim/x64/"
-          $slimOutX86 = Join-Path $env:GITHUB_WORKSPACE "src/ReleaseSlim/Win32/"
-          $slimIntX64 = Join-Path $env:GITHUB_WORKSPACE "src/ReleaseSlim/obj/x64/"
-          $slimIntX86 = Join-Path $env:GITHUB_WORKSPACE "src/ReleaseSlim/obj/Win32/"
-          New-Item -Path $slimOutX64 -ItemType Directory -Force | Out-Null
-          New-Item -Path $slimOutX86 -ItemType Directory -Force | Out-Null
-          New-Item -Path $slimIntX64 -ItemType Directory -Force | Out-Null
-          New-Item -Path $slimIntX86 -ItemType Directory -Force | Out-Null
-
-          # Rebuild forces recompilation with the slim defines for deterministic slim binaries.
-          msbuild src/OpenCvSharpExtern/OpenCvSharpExtern.vcxproj `
-            /t:Rebuild `
-            /p:Configuration=Release `
-            /p:Platform=x64 `
-            /p:SolutionDir="${env:GITHUB_WORKSPACE}\\" `
-            /p:OutDir="$slimOutX64" `
-            /p:IntDir="$slimIntX64" `
-            /p:PostBuildEventUseInBuild=false `
-            /p:RunPostBuildEvent=Never `
-            -maxcpucount
+          $slimOut = Join-Path $env:GITHUB_WORKSPACE "src/ReleaseSlim/x64/"
+          $slimInt = Join-Path $env:GITHUB_WORKSPACE "src/ReleaseSlim/obj/x64/"
+          New-Item -Path $slimOut -ItemType Directory -Force | Out-Null
+          New-Item -Path $slimInt -ItemType Directory -Force | Out-Null
 
           msbuild src/OpenCvSharpExtern/OpenCvSharpExtern.vcxproj `
             /t:Rebuild `
             /p:Configuration=Release `
-            /p:Platform=Win32 `
+            /p:Platform=x64 `
             /p:SolutionDir="${env:GITHUB_WORKSPACE}\\" `
-            /p:OutDir="$slimOutX86" `
-            /p:IntDir="$slimIntX86" `
+            /p:OutDir="$slimOut" `
+            /p:IntDir="$slimInt" `
             /p:PostBuildEventUseInBuild=false `
             /p:RunPostBuildEvent=Never `
             -maxcpucount
 
-          $x64Dll = Get-ChildItem "$slimOutX64" -Recurse -Filter OpenCvSharpExtern.dll | Select-Object -First 1
-          $x86Dll = Get-ChildItem "$slimOutX86" -Recurse -Filter OpenCvSharpExtern.dll | Select-Object -First 1
-          if (-not $x64Dll -or -not $x86Dll) {
-            throw "Failed to locate slim OpenCvSharpExtern.dll outputs"
-          }
-
-          Copy-Item $x64Dll.FullName "src/Release/x64/OpenCvSharpExtern.Slim.dll" -Force
-          Copy-Item $x86Dll.FullName "src/Release/Win32/OpenCvSharpExtern.Slim.dll" -Force
+          $slimDll = Get-ChildItem "$slimOut" -Recurse -Filter OpenCvSharpExtern.dll | Select-Object -First 1
+          if (-not $slimDll) { throw "Failed to locate slim OpenCvSharpExtern.dll" }
+          Copy-Item $slimDll.FullName "src/Release/x64/OpenCvSharpExtern.Slim.dll" -Force
 
-      #- name: Build ARM
-      #  shell: cmd
-      #  run: msbuild OpenCvSharp.sln /t:build /p:configuration=Release /p:platform=ARM -maxcpucount
+      - name: Test
+        shell: cmd
+        run: dotnet test test\OpenCvSharp.Tests -c Release -f net8.0 --runtime win-x64
 
-      - name: Install .NET
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: |
-            8.0.x
+      - name: Test Windows-only functions
+        shell: powershell
+        run: |
+          cd ${env:GITHUB_WORKSPACE}\test\OpenCvSharp.Tests.Windows
+          dotnet test -c Release -f net8.0-windows --runtime win-x64
 
-      - name: Build
-        shell: cmd
+      - name: Test Windows-only functions (net48)
+        shell: powershell
         run: |
-          dotnet build src/OpenCvSharp.Extensions/OpenCvSharp.Extensions.csproj -f net8.0 -p:configuration=Release -maxcpucount
-          dotnet build src/OpenCvSharp.WpfExtensions/OpenCvSharp.WpfExtensions.csproj -f net8.0-windows -p:configuration=Release -maxcpucount
+          cd ${env:GITHUB_WORKSPACE}\test\OpenCvSharp.Tests.Windows
+          dotnet test -c Release -f net48 --runtime win-x64
 
       - name: Pack NuGet packages
         shell: powershell
         run: |
           $ErrorActionPreference = "Stop"
-          
+
           $date = Get-Date -Format "yyyyMMdd"
           $version = "${env:OPENCV_VERSION}.${date}-beta"
           Write-Host "version = ${version}"
 
-          # Pack main libraries
+          # Pack main libraries (dotnet pack triggers build implicitly)
           dotnet pack src/OpenCvSharp/OpenCvSharp.csproj -c Release -o artifacts -p:Version=$version
           dotnet pack src/OpenCvSharp.Extensions/OpenCvSharp.Extensions.csproj -c Release -o artifacts -p:Version=$version
           dotnet pack src/OpenCvSharp.WpfExtensions/OpenCvSharp.WpfExtensions.csproj -c Release -o artifacts -p:Version=$version
-          
+
           # Pack runtime packages
           dotnet pack nuget/OpenCvSharp4.runtime.win.csproj -o artifacts -p:Version=$version
           dotnet pack nuget/OpenCvSharp4.runtime.win.slim.csproj -o artifacts -p:Version=$version
-          
+
           # Add local artifacts as NuGet source for meta-package
           dotnet nuget add source "${env:GITHUB_WORKSPACE}\artifacts" --name LocalPackages
-          
+
           # Pack meta-package (depends on packages built above)
           dotnet pack nuget/OpenCvSharp4.Windows.csproj -o artifacts -p:Version=$version -p:PackageVersion=$version
           dotnet pack nuget/OpenCvSharp4.Windows.Slim.csproj -o artifacts -p:Version=$version -p:PackageVersion=$version
 
-      - name: Test
-        shell: powershell
-        run: |
-          cd ${env:GITHUB_WORKSPACE}\test\OpenCvSharp.Tests
-          dotnet test -c Release -f net48 --runtime win-x64
-
-      - name: Test Windows-only functions
-        shell: powershell
-        run: |
-          cd ${env:GITHUB_WORKSPACE}\test\OpenCvSharp.Tests.Windows
-          dotnet test -c Release -f net48 --runtime win-x64
-
       - name: Run ReleaseMaker
         shell: powershell
         run: |
@@ -197,4 +153,4 @@ jobs:
         uses: actions/upload-artifact@v6
         with:
           name: packages_windows
-          path: ${{ github.workspace }}\artifacts
+          path: ${{ github.workspace }}\artifacts

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "dotnet.preferCSharpExtension": true
+}

README.md

@@ -1,8 +1,8 @@
-![opencvsharp](https://socialify.git.ci/shimat/opencvsharp/image?description=1&forks=1&language=1&owner=1&pattern=Plus&stargazers=1&theme=Light)
+![opencvsharp](https://socialify.git.ci/shimat/opencvsharp/image?description=1&forks=1&language=1&owner=1&pattern=Plus&stargazers=1&theme=Light)
 
 [![Github Actions Windows Status](https://github.com/shimat/opencvsharp/workflows/Windows%20Server%202025/badge.svg)](https://github.com/shimat/opencvsharp/actions)  [![Github Actions Ubuntu 22.04 Status](https://github.com/shimat/opencvsharp/workflows/Ubuntu%2022.04/badge.svg)](https://github.com/shimat/opencvsharp/actions)  [![Github Actions Ubuntu 24.04 Status](https://github.com/shimat/opencvsharp/workflows/Ubuntu%2024.04/badge.svg)](https://github.com/shimat/opencvsharp/actions) [![GitHub license](https://img.shields.io/github/license/shimat/opencvsharp.svg)](https://github.com/shimat/opencvsharp/blob/master/LICENSE) 
 
-OpenCvSharp is a cross-platform .NET wrapper for OpenCV, providing a rich set of image processing and computer vision functionality. It supports .NET Framework 4.8, .NET 8 and later, and .NET Standard 2.0.
+OpenCvSharp is a cross-platform .NET wrapper for OpenCV, providing a rich set of image processing and computer vision functionality. It targets .NET Standard 2.0, .NET Standard 2.1, and .NET 8.0 or later. .NET Framework 4.6.1 and later is also supported via the .NET Standard 2.0 target (note: WpfExtensions additionally provides a direct .NET Framework 4.8 target).
 
 ## Quick Start
 
@@ -31,7 +31,8 @@ For more installation options, see the [Installation](#installation) section bel
 * [OpenCV 4.13.0](https://opencv.org/) with [opencv_contrib](https://github.com/opencv/opencv_contrib)
 
 ## Requirements
-* [.NET Framework 4.8](http://www.microsoft.com/ja-jp/download/details.aspx?id=1639) / [.NET 8](https://www.microsoft.com/net/download) or later / .NET Standard 2.0
+* [.NET 8](https://www.microsoft.com/net/download) or later / .NET Standard 2.0 / .NET Standard 2.1
+* .NET Framework 4.6.1 or later is supported via the .NET Standard 2.0 target (WpfExtensions also directly targets .NET Framework 4.8)
 * (Windows) [Visual C++ 2022 Redistributable Package](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)
 * (Windows Server) Media Foundation
 ```
@@ -164,8 +165,8 @@ http://shimat.github.io/opencvsharp/api/OpenCvSharp.html
 
 | Package | Description |
 |---------|-------------|
-|**[OpenCvSharp4.runtime.win](https://www.nuget.org/packages/OpenCvSharp4.runtime.win/)**| Native bindings for Windows x64/x86 (except UWP) |
-|**[OpenCvSharp4.runtime.win.slim](https://www.nuget.org/packages/OpenCvSharp4.runtime.win.slim/)**| Slim native bindings for Windows x64/x86 (except UWP), with `core,imgproc,imgcodecs,calib3d,features2d,flann,objdetect,photo` enabled |
+|**[OpenCvSharp4.runtime.win](https://www.nuget.org/packages/OpenCvSharp4.runtime.win/)**| Native bindings for Windows x64 (except UWP) |
+|**[OpenCvSharp4.runtime.win.slim](https://www.nuget.org/packages/OpenCvSharp4.runtime.win.slim/)**| Slim native bindings for Windows x64 (except UWP), with `core,imgproc,imgcodecs,calib3d,features2d,flann,objdetect,photo` enabled |
 |**[OpenCvSharp4.runtime.uwp](https://www.nuget.org/packages/OpenCvSharp4.runtime.uwp/)**| Native bindings for UWP (Universal Windows Platform) x64/x86/ARM |
 |**[OpenCvSharp4.official.runtime.linux-x64](https://www.nuget.org/packages/OpenCvSharp4.official.runtime.linux-x64/)**| Native bindings for Linux x64 (portable RID, recommended) |
 |**[OpenCvSharp4.official.runtime.linux-x64.slim](https://www.nuget.org/packages/OpenCvSharp4.official.runtime.linux-x64.slim/)**| Slim native bindings for Linux x64 (portable RID), with `core,imgproc,imgcodecs,calib3d,features2d,flann,objdetect,photo` enabled |
@@ -176,6 +177,10 @@ http://shimat.github.io/opencvsharp/api/OpenCvSharp.html
 |**[OpenCvSharp4.runtime.linux-arm](https://www.nuget.org/packages/OpenCvSharp4.runtime.linux-arm/)**| Native bindings for Linux Arm |
 |**[OpenCvSharp4.runtime.wasm](https://www.nuget.org/packages/OpenCvSharp4.runtime.wasm/)**| Native bindings for WebAssembly |
 
+> **Note:** Windows x86 (32-bit) support has been dropped as of the OpenCV 4.13.0 release series.
+> The `OpenCvSharp4.runtime.win` and `OpenCvSharp4.runtime.win.slim` packages now ship **x64-only** native binaries.
+> Users requiring x86 Windows support should stay on the last OpenCV 4.12.x-based packages.
+
 Native binding (OpenCvSharpExtern.dll / libOpenCvSharpExtern.so) is required for OpenCvSharp to work. To use OpenCvSharp, you should add both `OpenCvSharp4` and `OpenCvSharp4.runtime.*` packages to your project. Currently, native bindings for Windows, UWP, Ubuntu, Linux ARM, and WebAssembly are available.
 
 Packages named OpenCvSharp3-* and OpenCvSharp-* are deprecated.

nuget/OpenCvSharp4.Windows.Slim.csproj

@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net48;netstandard2.0;netstandard2.1;net8.0;</TargetFrameworks>
     <NoBuild>true</NoBuild>
     <IncludeBuildOutput>false</IncludeBuildOutput>
 
     <PackageId>OpenCvSharp4.Windows.Slim</PackageId>
-    <Title>OpenCvSharp NuGet package for x64/x86 Windows (Slim)</Title>
+    <Title>OpenCvSharp NuGet package for x64 Windows (Slim)</Title>
     <Authors>shimat</Authors>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/shimat/opencvsharp</PackageProjectUrl>

nuget/OpenCvSharp4.Windows.csproj

@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net48;netstandard2.0;netstandard2.1;net8.0;</TargetFrameworks>
     <NoBuild>true</NoBuild>
     <IncludeBuildOutput>false</IncludeBuildOutput>
 
     <!-- NuGet Package Metadata -->
     <PackageId>OpenCvSharp4.Windows</PackageId>
-    <Title>OpenCvSharp NuGet package for x64/x86 Windows (same as OpenCvSharp3-AnyCPU)</Title>
+    <Title>OpenCvSharp NuGet package for x64 Windows (same as OpenCvSharp3-AnyCPU)</Title>
     <Authors>shimat</Authors>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/shimat/opencvsharp</PackageProjectUrl>

nuget/OpenCvSharp4.runtime.win.csproj

@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netstandard2.0;netstandard2.1;net8.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;</TargetFrameworks>
     <NoBuild>true</NoBuild>
     <IncludeBuildOutput>false</IncludeBuildOutput>
 
     <!-- NuGet Package Metadata -->
     <PackageId>OpenCvSharp4.runtime.win</PackageId>
-    <Title>OpenCvSharp4 native bindings for Windows x64/x86 (except UWP)</Title>
+    <Title>OpenCvSharp4 native bindings for Windows x64 (except UWP)</Title>
     <Authors>shimat</Authors>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/shimat/opencvsharp</PackageProjectUrl>
@@ -22,10 +22,7 @@
 
   <ItemGroup>
     <None Include="..\src\Release\x64\OpenCvSharpExtern.dll" Pack="true" PackagePath="runtimes/win-x64/native" />
-    <None Include="..\src\Release\Win32\OpenCvSharpExtern.dll" Pack="true" PackagePath="runtimes/win-x86/native" />
     <None Include="..\opencv_files\opencv_win_x64\x64\vc17\bin\opencv_videoio_ffmpeg4130_64.dll" Pack="true" PackagePath="runtimes/win-x64/native" />
-    <None Include="..\opencv_files\opencv_win_x86\x86\vc17\bin\opencv_videoio_ffmpeg4130.dll" Pack="true" PackagePath="runtimes/win-x86/native" />
-    <None Include="OpenCvSharp4.runtime.win.props" Pack="true" PackagePath="build/net48" />
     <None Include="OpenCvSharp4.runtime.win.props" Pack="true" PackagePath="build/netstandard" />
     <None Include="OpenCvSharp4.runtime.win.props" Pack="true" PackagePath="build/netcoreapp" />
     <None Include="OpenCvSharp4.runtime.win.props" Pack="true" PackagePath="build/net8.0" />

nuget/OpenCvSharp4.runtime.win.props

@@ -3,14 +3,6 @@
 		<OpenCvSharp4ExternalNativeDlls>$(MSBuildThisFileDirectory)..\..\runtimes</OpenCvSharp4ExternalNativeDlls>
 	</PropertyGroup>
 	<ItemGroup Condition="$(TargetFrameworkVersion.StartsWith('v4')) Or $(TargetFramework.StartsWith('net4'))">
-		<Content Include="$(OpenCvSharp4ExternalNativeDlls)\win-x86\native\OpenCvSharpExtern.dll">
-			<Link>dll\x86\OpenCvSharpExtern.dll</Link>
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="$(OpenCvSharp4ExternalNativeDlls)\win-x86\native\opencv_videoio_ffmpeg4130.dll">
-			<Link>dll\x86\opencv_videoio_ffmpeg4130.dll</Link>
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
 		<Content Include="$(OpenCvSharp4ExternalNativeDlls)\win-x64\native\OpenCvSharpExtern.dll">
 			<Link>dll\x64\OpenCvSharpExtern.dll</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>