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: 0 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ First consolidated maintained release from [@shurkanTwo's fork](https://github.c

Existing NINA 3.2/empty-ISO fixes from 1.0.0.4, including @naixx's contribution, remain included. Experimental USB auto-reconnection, retries of still-running timed-out native calls, forced cancellation after repeated busy starts, and closed WIP #12 video intervals remain deferred.

This combined package replaces the earlier maintenance builds labelled 1.0.0.5, 1.0.0.6 and 1.0.0.7. Their release entries and tags are retired; the original commits remain in history. If you installed an earlier build, download this package again and replace the DLL manually. The lower consolidated version includes all reviewed fixes.

See the [session review](docs/SESSION-REVIEW.md), [corrective review](docs/CORRECTIVE-REVIEW.md) and [upstream review and issue coverage](docs/UPSTREAM-REVIEW.md). Validation uses automated tests and Windows CI. Physical Sony camera/USB/MTP, LiveView, lens operation and complete Sky Flat behavior remain unverified. Native access violations and newer camera support are not claimed fixed. Existing legacy-package NU1701 restore warnings remain.

## 1.0.0.4
Expand Down
5 changes: 0 additions & 5 deletions INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ The current community release, **1.0.0.5**, is a regular GitHub release marked L
Windows builds and automated tests are checked; physical Sony camera/USB operation
remains unverified for this combined release. See the release notes for scope.

The consolidated **1.0.0.5** package supersedes the earlier maintenance builds,
including those labelled 1.0.0.5, 1.0.0.6 and 1.0.0.7. If you installed any of
those builds, download this package again and replace the DLL manually using the
steps below. All reviewed fixes are included despite the lower version number.

## Requirements

- Windows 10 1809 or newer and N.I.N.A. 3.2 or newer (minimum 3.2.0.3001).
Expand Down
2 changes: 1 addition & 1 deletion Tests/CaptureControllerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public async Task AbortDuringBlockedNativeStartReturnsWithoutCallingNativeCancel
var start = Task.Factory.StartNew(() => camera.Capture.Start(1), TaskCreationOptions.LongRunning);
try {
Assert.True(entered.Wait(TimeSpan.FromSeconds(5)));
var abort = Task.Run(() => camera.Capture.Abort());
var abort = Task.Factory.StartNew(() => camera.Capture.Abort(), TaskCreationOptions.LongRunning);
Assert.Equal(CaptureController.AbortResult.SoftCancelRequested,
await abort.WaitAsync(TimeSpan.FromSeconds(2)));
Assert.Equal(0, camera.Cancels);
Expand Down
2 changes: 1 addition & 1 deletion docs/CORRECTIVE-REVIEW.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ These checks do not establish physical Sony camera, USB/MTP, lens, LiveView or c

## Installation and history

Use [INSTALLATION.md](../INSTALLATION.md) and install one copy of the maintained plugin. This fork is not an automatic update source in NINA's plugin manager. Earlier build sources remain available through the immutable commit links above. Intermediate release entries and tags are retired in favor of one combined package; users of any earlier maintenance build should download the consolidated package again and replace the DLL manually.
Use [INSTALLATION.md](../INSTALLATION.md) and install one copy of the maintained plugin. This fork is not an automatic update source in NINA's plugin manager. Original contributor history and review evidence are preserved through the immutable commit links above.
4 changes: 2 additions & 2 deletions docs/SESSION-REVIEW.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ The audit also inspected [the duplicate-popup report](https://github.com/shurkan

## Validation and publication

The Windows release workflow runs the capture/native-policy, temperature and plugin-integration suites and builds/packages the plugin. Release notes identify the successful build and exact source commit for the combined 1.0.0.5 package. Changes comprise the capture-start failure classification, version/display metadata, attribution comments, packaging credit text and documentation. Busy captures remain rejected and native cancellation is not forced.
The Windows release workflow runs the capture/native-policy, temperature and plugin-integration suites and builds/packages the plugin. A merged-source CI run hit the two-second timeout in the blocked-start cancellation test. Its abort was queued on the shared thread pool, where other concurrency tests deliberately block workers; delayed scheduling can exhaust the bound before the abort executes. The test now runs that abort on a dedicated thread, matching its blocked-start worker and the other concurrency tests. The two-second completion bound, cancellation assertions and production behavior are unchanged. Release notes identify the successful build and exact source commit for the combined 1.0.0.5 package. Changes comprise the capture-start failure classification, version/display metadata, attribution comments, packaging credit text and documentation. Busy captures remain rejected and native cancellation is not forced.

The reviewed fixes through [`992f520`](https://github.com/shurkanTwo/NINASonyCameraPlugin/tree/992f5202b655a4287288089dde5cd83b4eb54f5f) are rebuilt as one combined 1.0.0.5 release following upstream 1.0.0.4. The earlier maintenance release entries and tags are retired, and the 1.0.0.5 tag now identifies the consolidated source. Original commits and contributor history remain intact; historical review evidence uses immutable commit links. Public announcements link to the combined release and retain issue-specific context. Users of any earlier maintenance build must download this package again and replace the DLL manually, even if they previously installed a higher-numbered intermediate build. Runtime source is unchanged by the consolidation; the embedded version, documentation and package are rebuilt together.
The combined 1.0.0.5 release follows upstream 1.0.0.4 and includes all reviewed contributions and corrective work. Original commits and contributor history remain intact; review evidence uses immutable commit links. Public announcements link to the release and retain issue-specific context. The embedded assembly/file version, tag, documentation and package identify the same verified source. Production capture code is unchanged by release preparation.

Physical Sony camera/USB/MTP, LiveView, lens operation and complete Sky Flat behavior remain unverified. NINA's plugin manager still uses the upstream release source. The native driver is a separate package, and its device-removal candidate remains experimental and outside the regular releases. See [installation and rollback](../INSTALLATION.md).
2 changes: 1 addition & 1 deletion docs/UPSTREAM-REVIEW.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Upstream contribution review

> Historical assessment of the initial integration at [`413290f`](https://github.com/shurkanTwo/NINASonyCameraPlugin/tree/413290f68b114cb0393e52ae8eabdf4f12bbd1da). A subsequent audit found gaps in cancellation, shutter verification and repeated-failure detection. The [corrective review](CORRECTIVE-REVIEW.md) supersedes the affected statements below, including the old shutter-ratio check. All corrections are included in the consolidated 1.0.0.5 release; this initial assessment is retained as review history.
> The [corrective review](CORRECTIVE-REVIEW.md) records follow-up findings in cancellation, shutter verification and repeated-failure detection. It supersedes the affected assessment below, including the shutter-ratio check. All corrections are included in the combined 1.0.0.5 release.

Reviewed against upstream `master`, commit
`8bd9042bcd477fd028c2aa2adfe34260192de936` (upstream release 1.0.0.4).
Expand Down