should be safe, dependancy bumps, see how tests go - #2120
Merged
Conversation
NickJosevski
marked this pull request as draft
August 7, 2026 00:11
NickJosevski
force-pushed
the
nj/safe-dep-bumps
branch
from
August 7, 2026 02:01
6f15d2a to
642c89a
Compare
NickJosevski
commented
Aug 7, 2026
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.10" /> |
Contributor
Author
There was a problem hiding this comment.
feels like low risk if the tests run, and there weren't any API changes that needed code changes
NickJosevski
commented
Aug 7, 2026
| <ItemGroup> | ||
| <PackageReference Include="Newtonsoft.Json" Version="13.0.4" /> | ||
| <PackageReference Include="Serilog" Version="2.10.0" /> | ||
| <PackageReference Include="Serilog" Version="4.4.0" /> |
Contributor
Author
There was a problem hiding this comment.
also feels safe based on natural flow of logs out of tests
NickJosevski
commented
Aug 7, 2026
| <PackageReference Include="Serilog" Version="3.1.1" /> | ||
| <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" /> | ||
| <PackageReference Include="Serilog" Version="4.4.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.10" /> |
Contributor
Author
There was a problem hiding this comment.
testing project anyway
NickJosevski
marked this pull request as ready for review
August 7, 2026 02:07
NickJosevski
commented
Aug 7, 2026
| <PackageReference Include="Assent" Version="1.6.1" /> | ||
| <PackageReference Include="FluentAssertions" Version="7.2.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.10" /> |
Contributor
Author
There was a problem hiding this comment.
same testing project
NickJosevski
commented
Aug 7, 2026
| .GetKeysAsync() | ||
| .ToListAsync(); | ||
| var keys = new List<StorageAccountKey>(); | ||
| await foreach (var key in storageAccountResponse.Value.GetKeysAsync()) |
Contributor
Author
There was a problem hiding this comment.
await foreach lets us drop the need for System.Linq.Async
zentron
approved these changes
Aug 7, 2026
NickJosevski
enabled auto-merge
August 7, 2026 04:17
NickJosevski
added a commit
that referenced
this pull request
Aug 7, 2026
Calamari.csproj still referenced Microsoft.NETFramework.ReferenceAssemblies.net462. That reference has done nothing since net462 was dropped as a target framework in #1669. Narrowed from a larger cleanup. The other framework-provided package references this commit used to remove are now removed by #2120 instead, so they are left out here to avoid touching the same lines twice. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
NickJosevski
added a commit
that referenced
this pull request
Aug 7, 2026
.NET 10 pulls System.Linq.AsyncEnumerable into the core libraries. That is a documented source-incompatible change. 7.0.1 is the version Octopus Server runs against net10. Narrowed from a larger dependency-alignment commit. The Serilog and Microsoft.Extensions.* bumps that used to sit alongside this are handled by #2120 instead, so they are left out here to avoid touching the same lines twice. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
NickJosevski
added a commit
that referenced
this pull request
Aug 7, 2026
Calamari.csproj still referenced Microsoft.NETFramework.ReferenceAssemblies.net462. That reference has done nothing since net462 was dropped as a target framework in #1669. Narrowed from a larger cleanup. The other framework-provided package references this commit used to remove are removed by #2120 instead, so they are left out here to avoid touching the same lines twice. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
NickJosevski
added a commit
that referenced
this pull request
Aug 7, 2026
.NET 10 pulls System.Linq.AsyncEnumerable into the core libraries. That is a documented source-incompatible change. 7.0.1 is the version Octopus Server runs against net10. Narrowed from a larger dependency-alignment commit. The Serilog and Microsoft.Extensions.* bumps that used to sit alongside this are handled by #2120 instead, so they are left out here to avoid touching the same lines twice. Note for reviewers: #2120 drops System.Linq.Async from Calamari.AzureAppService as unused. This commit adds it back at 7.0.1 because Nick asked to keep the change. If the usage really is gone on net10, drop this commit instead. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Removes 13 PackageReferences that no code in their project references. Found with ReferenceTrimmer (RT0003) over source/Calamari.sln, then confirmed individually by deleting each reference and rebuilding. Mostly vestigial netstandard-era shim packages whose APIs have been in-box since the move to net8.0, dating back to the Sashimi-era repo splits. Continues the cleanup started in 6f15d2a (System.ValueTuple, System.Diagnostics.Tracing, System.Runtime.InteropServices.RuntimeInformation). Calamari.Shared System.IO.FileSystem, System.IO.FileSystem.AccessControl, System.IO.Packaging, System.Threading.AccessControl Calamari.Common System.IO.FileSystem.AccessControl Calamari.AzureScripting System.IO.FileSystem.AccessControl, System.Security.Principal.Windows Calamari System.ComponentModel.TypeConverter Calamari.Tests System.ComponentModel.TypeConverter Calamari.Testing Assent Calamari.ConsolidateCalamariPackages.Tests Assent, SharpCompress Calamari.AzureAppService System.Linq.Async Notes: - SharpCompress is one of the SF-1864 CVE pins, but ConsolidateCalamariPackages moved to System.IO.Compression in df69a22 and nothing in that test project's graph depends on SharpCompress transitively, so dropping the direct reference removes it from the graph entirely rather than downgrading it. That project is IsPackable=false, so nothing ships. - Assent stays in Calamari.Tests, which references it directly and uses it. - System.Linq.Async was referenced by Calamari.AzureAppService but used only by one line of test setup, so it shipped three unused assemblies (System.Linq.Async, System.Interactive.Async, System.Linq.AsyncEnumerable) in the flavour package. That call site now drains the AsyncPageable with await foreach, which removes the dependency from the repo and with it the question of the 7.0.1 deprecation shim. Verified: dotnet build source/Calamari.sln -t:Rebuild -> 31 projects, 0 errors, warning count unchanged from baseline (164). Calamari, Calamari.AzureAppService and Calamari.AzureScripting all still start and build their Autofac containers. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
NickJosevski
force-pushed
the
nj/safe-dep-bumps
branch
from
August 7, 2026 04:54
3258fe7 to
2dfd7bb
Compare
NickJosevski
added a commit
that referenced
this pull request
Aug 7, 2026
Calamari.csproj still referenced Microsoft.NETFramework.ReferenceAssemblies.net462. That reference has done nothing since net462 was dropped as a target framework in #1669. Narrowed from a larger cleanup. The other framework-provided package references this commit used to remove are removed by #2120 instead, so they are left out here to avoid touching the same lines twice. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Dep bump
No Server Change needed