Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.x'
dotnet-version: '10.0.x'

- name: Extract version from tag
id: version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.x'
dotnet-version: '10.0.x'

- name: Restore dependencies
run: dotnet restore CanonSDK.sln
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ Versions match the Git tags (`v1.0.0.11`) that trigger the release workflow.
- The release workflow refuses to run when the tag does not point to the latest commit of `main`,
so the published package always matches the tag.

- **Migrated from .NET 9 to .NET 10 (LTS)**, supported until November 2028 (.NET 9 support ends in November 2026).
The release is still a self-contained executable: nothing to install on the photo booth computers.
- Packages updated (ASP.NET Core OpenAPI 10, Serilog.AspNetCore 10, Swagger UI 10, AutoUpdater.NET 1.9.3).
- The OpenAPI document is now OpenAPI 3.1 (was 3.0), without duplicated schemas.

### Added
- CI workflow building the solution and running the unit tests on every pull request and push to `main`.

Expand Down
4 changes: 2 additions & 2 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co

## Project Overview

CanonWebAPI is a .NET 9 web API for remotely controlling Canon DSLR and mirrorless cameras through the Canon EDSDK. The solution provides REST endpoints for camera control, live view streaming, and image capture.
CanonWebAPI is a .NET 10 web API for remotely controlling Canon DSLR and mirrorless cameras through the Canon EDSDK. The solution provides REST endpoints for camera control, live view streaming, and image capture.

## Architecture

Expand Down Expand Up @@ -86,7 +86,7 @@ Errors are problem details: 400 invalid value, 409 capture refused, 503 not conn
- The camera can be connected via USB before or after the application starts (automatic connection and reconnection)
- Canon EOS Utility must NOT be running (conflicts with EDSDK access)
- Requires compatible Canon camera with EDSDK support
- All projects target .NET 9 with Windows-specific dependencies
- All projects target .NET 10 (`net10.0-windows`) with Windows-specific dependencies
- Uses structured logging with Serilog (logs to console and `logs/canon-api.log`)
- Target deployment: photo booth with a Canon EOS R100, dummy battery, no memory card (pictures are saved to the PC only)
- `docs/openapi.json` must be regenerated when endpoints change
Expand Down
12 changes: 6 additions & 6 deletions Canon.API/Canon.API.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<PlatformTarget>x64</PlatformTarget>
Expand Down Expand Up @@ -32,12 +32,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Autoupdater.NET.Official" Version="1.9.2" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.1" />
<PackageReference Include="Autoupdater.NET.Official" Version="1.9.3" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.12" />
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.2.3" />
<!-- Build-time generation of docs/openapi.json, opt-in: dotnet build -p:OpenApiGenerateDocumentsOnBuild=true -->
<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="9.0.6">
<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.12">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions Canon.Core.Tests/Canon.Core.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PlatformTarget>x64</PlatformTarget>
Expand All @@ -10,9 +10,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions Canon.Core/Canon.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PlatformTarget>x64</PlatformTarget>
Expand All @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.12" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<!-- Allows building the net9.0-windows projects (and running the unit tests) on Linux/macOS, e.g. in CI or dev containers. -->
<!-- Allows building the net10.0-windows projects (and running the unit tests) on Linux/macOS, e.g. in CI or dev containers. -->
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ARG WINDOWS_VERSION=ltsc2022
# ---------------------------------------------------------------------------
# Build and unit tests
# ---------------------------------------------------------------------------
FROM mcr.microsoft.com/dotnet/sdk:9.0-windowsservercore-${WINDOWS_VERSION} AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0-windowsservercore-${WINDOWS_VERSION} AS build
WORKDIR C:\src

# Restore first so the package layer is cached when only the code changes.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ The solution is divided into the following projects:

* A compatible Canon camera (tested with **Canon EOS R100** and **Canon T7**).
* The camera connected to the computer via USB.
* **.NET 9 SDK** (or newer).
* **.NET 10 SDK** (or newer) to build the project.
* The Canon EOS Utility software should not be running, as it can prevent this application from connecting to the camera.
* **Windows** operating system (x64 architecture required).

Expand Down Expand Up @@ -211,7 +211,7 @@ dotnet build Canon.API -p:OpenApiGenerateDocumentsOnBuild=true

### System Requirements
* **OS**: Windows 10/11 (x64)
* **Runtime**: .NET 9 or newer
* **Runtime**: none to install: the release is a self-contained executable (.NET 10)
* **Dependencies**: Canon EDSDK 13.20.21 64-bit libraries (included; up to 1.0.0.11: EDSDK 13.19.0)

> **Note**: While this software has been tested with the above camera models, it should work with other Canon cameras that support the EDSDK. However, functionality may vary depending on the specific camera model and its supported features.
Loading
Loading