Frank/c2 #1698
Closed
Frank/c2 #1698
Conversation
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
Contributor
flin-8
commented
Dec 24, 2025
flin-8
commented
Forward merge 2025.4 into main
… Profile (#1667) * Set XDG_CACHE_HOME per Powershell invocation to avoid corrupt Startup Profile * Default variable to false * Only set variable on non windows environments * Update cache folder to be in working directory so its cleaned up
…5.4-to-main-a715fc5de [Auto-merge from release/2025.4 to main] Merge mergebot/from-release-2025.4-to-main-a715fc5de to main
…5.4-to-main-a971af990 [Auto-merge from release/2025.4 to main] Merge mergebot/from-release-2025.4-to-main-a971af990 to main
* Upgrade to .NET 8.0 * Fix some compile issues * Remove .Net 6.0 framework from build * Update code generator * Remove extraneous target framework lines * Update LibGit2Sharp to support .NET 8.0 * Use server modifications to always install the latest * Change Restore to restore everything * Upgrade to DotNetScript 1.6.0 * Fix csproj files * Fix build file * Revert package downgrade * Update KubernetesClient due to CVE * OctoVersion net8.0 * Fix compile issue * Fix test tool importing * Fix csproj files * Minor tweak * Attempt to fix nuget packaging * Fix a test * Publish netfx of Calamari.Tests * Emit legacy asset things for Test * Add an empty nuke target * Fix compile * Bump global.json * Add new test build targets * Update and fix test dependencies * Update System.Text.Json * Please work * Set output directory * Set the path variable to include the downloaded .net sdk * Fix the thing * Update machine path * Write a log message * use directory, not exe * Use directory, not exe * Remove NoPath and add new install script * Update Globfish to Octopus.Globfish * Revert "Update Globfish to Octopus.Globfish" This reverts commit ae378c1. * Update install script * Update EC2 tests to .net 8 sdk * Upgrade to debian 12 * Fix tests project * Fix packaging * Fix consolidation issues * Comment out tests * Fix Calamari bundling * Fix package ids * Fix build props * Fix project file * Clean up project file * Add logging to failing test * Fix bad merge * Reorder file for better diff * Fix some merge conflicts * Use extension method * Fix bug * Deleted unneccesary file * update warning text * Make x-plat builds work with Nuke Because of the temp install of net8 to latest version, OutDir and Publish dir may not be correctly set - this falls back to a safe value preventing unzip errors. * Try fix dotnet-script packaging * Don't run chmod on windows * Derp * macOS build fixes * Use OutputPath instead of OutDir --------- Co-authored-by: JT <[email protected]> Co-authored-by: Sathvik Kumar <[email protected]>
…t issues (#1685) * Add nuke platform agnostic and fix calamari flavour test reporting * Update System.Text.Json * Zip the nuke build for later reuse * Publish nuke before zipping * Fix build path * Add InstallDotNetSdk target * Locate or install dotnet inside target
…5.4-to-main-0dac38075 [Auto-merge from release/2025.4 to main] Merge mergebot/from-release-2025.4-to-main-0dac38075 to main
* Add support for TeamCity parallel tests * Fix dupe code * Make sure base filter is passed * Normalize base filter * Publish the runsettings file * Let's make it valid XML ffs * Install dotnet sdk inside all tests
* Consolidate test settings into single builder * Re-add the process exit handler
Move Server E2E WindowsServiceDeploymentTestScript to Calamari
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 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.