From 9e5da57c5ba2778a9fed0955942926452a16398c Mon Sep 17 00:00:00 2001 From: Alastair Pitts Date: Wed, 4 Feb 2026 09:59:22 +1100 Subject: [PATCH 1/2] Upgrade to .NET 10.0 --- build/_build.csproj | 2 +- global.json | 2 +- source/Calamari.Aws/Calamari.Aws.csproj | 2 +- source/Calamari.Azure/Calamari.Azure.csproj | 2 +- .../Calamari.AzureAppService.Tests.csproj | 2 +- source/Calamari.AzureAppService/Calamari.AzureAppService.csproj | 2 +- .../Calamari.AzureResourceGroup.Tests.csproj | 2 +- .../Calamari.AzureResourceGroup.csproj | 2 +- .../Calamari.AzureScripting.Tests.csproj | 2 +- source/Calamari.AzureScripting/Calamari.AzureScripting.csproj | 2 +- .../Calamari.AzureServiceFabric.Tests.csproj | 2 +- .../Calamari.AzureServiceFabric.csproj | 2 +- .../Calamari.AzureWebApp.Tests.csproj | 2 +- source/Calamari.AzureWebApp/Calamari.AzureWebApp.csproj | 2 +- source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj | 2 +- source/Calamari.Common/Calamari.Common.csproj | 2 +- .../Calamari.ConsolidateCalamariPackages.Api.csproj | 2 +- .../Calamari.ConsolidateCalamariPackages.Tests.csproj | 2 +- .../Calamari.ConsolidateCalamariPackages.csproj | 2 +- .../Calamari.GoogleCloudAccounts.csproj | 2 +- .../Calamari.GoogleCloudScripting.Tests.csproj | 2 +- .../Calamari.GoogleCloudScripting.csproj | 2 +- source/Calamari.Scripting.Tests/Calamari.Scripting.Tests.csproj | 2 +- source/Calamari.Scripting/Calamari.Scripting.csproj | 2 +- source/Calamari.Shared/Calamari.Shared.csproj | 2 +- source/Calamari.Terraform.Tests/Calamari.Terraform.Tests.csproj | 2 +- source/Calamari.Terraform/Calamari.Terraform.csproj | 2 +- source/Calamari.Testing/Calamari.Testing.csproj | 2 +- source/Calamari.Tests/Calamari.Tests.csproj | 2 +- .../Packages/Acme.JsonFileOutput/Acme.JsonFileOutput.csproj | 2 +- .../Deployment/Packages/Acme.Package/Acme.Package.csproj | 2 +- .../Packages/Acme.PackageBilingual/Acme.PackageBilingual.csproj | 2 +- .../Deployment/Packages/Acme.Service/Acme.Service.csproj | 2 +- .../Acme.StructuredConfigFiles.csproj | 2 +- .../Deployment/Packages/Acme.Web.Tests/Acme.Web.Tests.csproj | 2 +- .../Fixtures/Deployment/Packages/Acme.Web/Acme.Web.Nix.csproj | 2 +- .../Fixtures/Deployment/Packages/Acme.Web/Acme.Web.csproj | 2 +- .../Octopus.Sample.AzureCloudService.csproj | 2 +- source/Calamari/Calamari.csproj | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/build/_build.csproj b/build/_build.csproj index 5ddaa28c67..13ab79127a 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 win-x64;linux-x64 Calamari.Build CS0649;CS0169 diff --git a/global.json b/global.json index f023fd12ae..d46d21e50b 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.415", + "version": "10.0.100", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/source/Calamari.Aws/Calamari.Aws.csproj b/source/Calamari.Aws/Calamari.Aws.csproj index 00b1f88649..b7edd4436e 100644 --- a/source/Calamari.Aws/Calamari.Aws.csproj +++ b/source/Calamari.Aws/Calamari.Aws.csproj @@ -18,7 +18,7 @@ Calamari.Aws.exe.manifest - net8.0 + net10.0 true diff --git a/source/Calamari.Azure/Calamari.Azure.csproj b/source/Calamari.Azure/Calamari.Azure.csproj index 64569b4ee2..690f886c18 100644 --- a/source/Calamari.Azure/Calamari.Azure.csproj +++ b/source/Calamari.Azure/Calamari.Azure.csproj @@ -6,7 +6,7 @@ Octopus Deploy Octopus Deploy Pty Ltd win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 - net8.0 + net10.0 true diff --git a/source/Calamari.AzureAppService.Tests/Calamari.AzureAppService.Tests.csproj b/source/Calamari.AzureAppService.Tests/Calamari.AzureAppService.Tests.csproj index d605e8d16f..a36429f44b 100644 --- a/source/Calamari.AzureAppService.Tests/Calamari.AzureAppService.Tests.csproj +++ b/source/Calamari.AzureAppService.Tests/Calamari.AzureAppService.Tests.csproj @@ -5,7 +5,7 @@ Calamari.AzureAppService.Tests false win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 - net8.0 + net10.0 true diff --git a/source/Calamari.AzureAppService/Calamari.AzureAppService.csproj b/source/Calamari.AzureAppService/Calamari.AzureAppService.csproj index 581439b233..1a343234fe 100644 --- a/source/Calamari.AzureAppService/Calamari.AzureAppService.csproj +++ b/source/Calamari.AzureAppService/Calamari.AzureAppService.csproj @@ -8,7 +8,7 @@ Exe win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 NU5104 - net8.0 + net10.0 true diff --git a/source/Calamari.AzureResourceGroup.Tests/Calamari.AzureResourceGroup.Tests.csproj b/source/Calamari.AzureResourceGroup.Tests/Calamari.AzureResourceGroup.Tests.csproj index ce4b9d11ea..972fe91c88 100644 --- a/source/Calamari.AzureResourceGroup.Tests/Calamari.AzureResourceGroup.Tests.csproj +++ b/source/Calamari.AzureResourceGroup.Tests/Calamari.AzureResourceGroup.Tests.csproj @@ -4,7 +4,7 @@ Calamari.AzureResourceGroup.Tests false win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 - net8.0 + net10.0 true diff --git a/source/Calamari.AzureResourceGroup/Calamari.AzureResourceGroup.csproj b/source/Calamari.AzureResourceGroup/Calamari.AzureResourceGroup.csproj index 960bbf8e4f..af9905994f 100644 --- a/source/Calamari.AzureResourceGroup/Calamari.AzureResourceGroup.csproj +++ b/source/Calamari.AzureResourceGroup/Calamari.AzureResourceGroup.csproj @@ -7,7 +7,7 @@ false false win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 - net8.0 + net10.0 diff --git a/source/Calamari.AzureScripting.Tests/Calamari.AzureScripting.Tests.csproj b/source/Calamari.AzureScripting.Tests/Calamari.AzureScripting.Tests.csproj index 088159abcb..2ade29a7e9 100644 --- a/source/Calamari.AzureScripting.Tests/Calamari.AzureScripting.Tests.csproj +++ b/source/Calamari.AzureScripting.Tests/Calamari.AzureScripting.Tests.csproj @@ -6,7 +6,7 @@ enable win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 false - net8.0 + net10.0 true diff --git a/source/Calamari.AzureScripting/Calamari.AzureScripting.csproj b/source/Calamari.AzureScripting/Calamari.AzureScripting.csproj index 201deeeb6c..869c1136a0 100644 --- a/source/Calamari.AzureScripting/Calamari.AzureScripting.csproj +++ b/source/Calamari.AzureScripting/Calamari.AzureScripting.csproj @@ -8,7 +8,7 @@ win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 true false - net8.0 + net10.0 true diff --git a/source/Calamari.AzureServiceFabric.Tests/Calamari.AzureServiceFabric.Tests.csproj b/source/Calamari.AzureServiceFabric.Tests/Calamari.AzureServiceFabric.Tests.csproj index e383bd00be..42f835f23a 100644 --- a/source/Calamari.AzureServiceFabric.Tests/Calamari.AzureServiceFabric.Tests.csproj +++ b/source/Calamari.AzureServiceFabric.Tests/Calamari.AzureServiceFabric.Tests.csproj @@ -4,7 +4,7 @@ Calamari.AzureServiceFabric.Tests Calamari.AzureServiceFabric.Tests false - net8.0-windows + net10.0-windows win-x64 true diff --git a/source/Calamari.AzureServiceFabric/Calamari.AzureServiceFabric.csproj b/source/Calamari.AzureServiceFabric/Calamari.AzureServiceFabric.csproj index d6734fe7e2..8b433793c2 100644 --- a/source/Calamari.AzureServiceFabric/Calamari.AzureServiceFabric.csproj +++ b/source/Calamari.AzureServiceFabric/Calamari.AzureServiceFabric.csproj @@ -5,7 +5,7 @@ true false Exe - net8.0-windows + net10.0-windows win-x64 true diff --git a/source/Calamari.AzureWebApp.Tests/Calamari.AzureWebApp.Tests.csproj b/source/Calamari.AzureWebApp.Tests/Calamari.AzureWebApp.Tests.csproj index 0b6a698239..8ecf25d5d8 100644 --- a/source/Calamari.AzureWebApp.Tests/Calamari.AzureWebApp.Tests.csproj +++ b/source/Calamari.AzureWebApp.Tests/Calamari.AzureWebApp.Tests.csproj @@ -2,7 +2,7 @@ Calamari.AzureWebApp.Tests Calamari.AzureWebApp.Tests - net8.0 + net10.0 win-x64 false true diff --git a/source/Calamari.AzureWebApp/Calamari.AzureWebApp.csproj b/source/Calamari.AzureWebApp/Calamari.AzureWebApp.csproj index 678908382b..55494a810e 100644 --- a/source/Calamari.AzureWebApp/Calamari.AzureWebApp.csproj +++ b/source/Calamari.AzureWebApp/Calamari.AzureWebApp.csproj @@ -6,7 +6,7 @@ false Exe 8.0 - net8.0 + net10.0 win-x64 true diff --git a/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj b/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj index 4bb6ecafdf..e37312126d 100644 --- a/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj +++ b/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj @@ -2,7 +2,7 @@ Calamari.CloudAccounts - net8.0 + net10.0 Octopus.Calamari.CloudAccounts Calamari.CloudAccounts Octopus Deploy diff --git a/source/Calamari.Common/Calamari.Common.csproj b/source/Calamari.Common/Calamari.Common.csproj index 78c5b4ae38..64a1d39c9a 100644 --- a/source/Calamari.Common/Calamari.Common.csproj +++ b/source/Calamari.Common/Calamari.Common.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable anycpu false diff --git a/source/Calamari.ConsolidateCalamariPackages.Api/Calamari.ConsolidateCalamariPackages.Api.csproj b/source/Calamari.ConsolidateCalamariPackages.Api/Calamari.ConsolidateCalamariPackages.Api.csproj index 0270115b70..71a8e5c119 100644 --- a/source/Calamari.ConsolidateCalamariPackages.Api/Calamari.ConsolidateCalamariPackages.Api.csproj +++ b/source/Calamari.ConsolidateCalamariPackages.Api/Calamari.ConsolidateCalamariPackages.Api.csproj @@ -3,7 +3,7 @@ Octopus.Calamari.ConsolidatedPackage.Api Octopus.Calamari.ConsolidatedPackage.Api - net8.0 + net10.0 enable enable Octopus Deploy diff --git a/source/Calamari.ConsolidateCalamariPackages.Tests/Calamari.ConsolidateCalamariPackages.Tests.csproj b/source/Calamari.ConsolidateCalamariPackages.Tests/Calamari.ConsolidateCalamariPackages.Tests.csproj index d8881ef8d9..2e105879a7 100644 --- a/source/Calamari.ConsolidateCalamariPackages.Tests/Calamari.ConsolidateCalamariPackages.Tests.csproj +++ b/source/Calamari.ConsolidateCalamariPackages.Tests/Calamari.ConsolidateCalamariPackages.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 false true diff --git a/source/Calamari.ConsolidateCalamariPackages/Calamari.ConsolidateCalamariPackages.csproj b/source/Calamari.ConsolidateCalamariPackages/Calamari.ConsolidateCalamariPackages.csproj index 7a93745308..cd771f3735 100644 --- a/source/Calamari.ConsolidateCalamariPackages/Calamari.ConsolidateCalamariPackages.csproj +++ b/source/Calamari.ConsolidateCalamariPackages/Calamari.ConsolidateCalamariPackages.csproj @@ -3,7 +3,7 @@ Octopus.Calamari.ConsolidatedPackage Octopus.Calamari.ConsolidatedPackage - net8.0 + net10.0 true true Octopus Deploy diff --git a/source/Calamari.GoogleCloudAccounts/Calamari.GoogleCloudAccounts.csproj b/source/Calamari.GoogleCloudAccounts/Calamari.GoogleCloudAccounts.csproj index 012535291a..1250bf088d 100644 --- a/source/Calamari.GoogleCloudAccounts/Calamari.GoogleCloudAccounts.csproj +++ b/source/Calamari.GoogleCloudAccounts/Calamari.GoogleCloudAccounts.csproj @@ -2,7 +2,7 @@ Calamari.GoogleCloudAccounts - net8.0 + net10.0 CS8632 true diff --git a/source/Calamari.GoogleCloudScripting.Tests/Calamari.GoogleCloudScripting.Tests.csproj b/source/Calamari.GoogleCloudScripting.Tests/Calamari.GoogleCloudScripting.Tests.csproj index bb23de344f..7311b71517 100644 --- a/source/Calamari.GoogleCloudScripting.Tests/Calamari.GoogleCloudScripting.Tests.csproj +++ b/source/Calamari.GoogleCloudScripting.Tests/Calamari.GoogleCloudScripting.Tests.csproj @@ -5,7 +5,7 @@ win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 false enable - net8.0 + net10.0 true diff --git a/source/Calamari.GoogleCloudScripting/Calamari.GoogleCloudScripting.csproj b/source/Calamari.GoogleCloudScripting/Calamari.GoogleCloudScripting.csproj index 1d7c506ad5..f74fd57079 100644 --- a/source/Calamari.GoogleCloudScripting/Calamari.GoogleCloudScripting.csproj +++ b/source/Calamari.GoogleCloudScripting/Calamari.GoogleCloudScripting.csproj @@ -6,7 +6,7 @@ win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 false false - net8.0 + net10.0 CS8632 true diff --git a/source/Calamari.Scripting.Tests/Calamari.Scripting.Tests.csproj b/source/Calamari.Scripting.Tests/Calamari.Scripting.Tests.csproj index 90f74af71d..535135d3e5 100644 --- a/source/Calamari.Scripting.Tests/Calamari.Scripting.Tests.csproj +++ b/source/Calamari.Scripting.Tests/Calamari.Scripting.Tests.csproj @@ -2,7 +2,7 @@ Calamari.Scripting.Tests Calamari.Scripting.Tests - net8.0 + net10.0 win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 false true diff --git a/source/Calamari.Scripting/Calamari.Scripting.csproj b/source/Calamari.Scripting/Calamari.Scripting.csproj index 26183d2c3f..be32a98c2f 100644 --- a/source/Calamari.Scripting/Calamari.Scripting.csproj +++ b/source/Calamari.Scripting/Calamari.Scripting.csproj @@ -7,7 +7,7 @@ enable win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 true - net8.0 + net10.0 true diff --git a/source/Calamari.Shared/Calamari.Shared.csproj b/source/Calamari.Shared/Calamari.Shared.csproj index 98cc5dfa66..eef0729d28 100644 --- a/source/Calamari.Shared/Calamari.Shared.csproj +++ b/source/Calamari.Shared/Calamari.Shared.csproj @@ -22,7 +22,7 @@ Calamari enable - net8.0 + net10.0 diff --git a/source/Calamari.Terraform.Tests/Calamari.Terraform.Tests.csproj b/source/Calamari.Terraform.Tests/Calamari.Terraform.Tests.csproj index 6ebeb461d0..bfa3a79d9d 100644 --- a/source/Calamari.Terraform.Tests/Calamari.Terraform.Tests.csproj +++ b/source/Calamari.Terraform.Tests/Calamari.Terraform.Tests.csproj @@ -5,7 +5,7 @@ Calamari.Terraform.Tests win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 false - net8.0 + net10.0 CS8632 true diff --git a/source/Calamari.Terraform/Calamari.Terraform.csproj b/source/Calamari.Terraform/Calamari.Terraform.csproj index 7ea834fc96..5c4a9ce63c 100644 --- a/source/Calamari.Terraform/Calamari.Terraform.csproj +++ b/source/Calamari.Terraform/Calamari.Terraform.csproj @@ -6,7 +6,7 @@ false Exe win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 - net8.0 + net10.0 true diff --git a/source/Calamari.Testing/Calamari.Testing.csproj b/source/Calamari.Testing/Calamari.Testing.csproj index d78695c693..fa88cdc8dc 100644 --- a/source/Calamari.Testing/Calamari.Testing.csproj +++ b/source/Calamari.Testing/Calamari.Testing.csproj @@ -4,7 +4,7 @@ enable https://github.com/OctopusDeploy/Calamari/ Apache-2.0 - net8.0 + net10.0 true Octopus.Calamari.Testing diff --git a/source/Calamari.Tests/Calamari.Tests.csproj b/source/Calamari.Tests/Calamari.Tests.csproj index 9502d2086e..e142eaed74 100644 --- a/source/Calamari.Tests/Calamari.Tests.csproj +++ b/source/Calamari.Tests/Calamari.Tests.csproj @@ -10,7 +10,7 @@ win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 - net8.0 + net10.0 true true diff --git a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.JsonFileOutput/Acme.JsonFileOutput.csproj b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.JsonFileOutput/Acme.JsonFileOutput.csproj index a672254824..c3387ff722 100644 --- a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.JsonFileOutput/Acme.JsonFileOutput.csproj +++ b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.JsonFileOutput/Acme.JsonFileOutput.csproj @@ -5,7 +5,7 @@ en-US 1.0.0.0 ACME Corporation - net8.0 + net10.0 Acme.JsonFileOutput Acme.JsonFileOutput https://github.com/OctopusDeploy/Calamari/ diff --git a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Package/Acme.Package.csproj b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Package/Acme.Package.csproj index aa15b8bac5..7f4e210107 100644 --- a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Package/Acme.Package.csproj +++ b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Package/Acme.Package.csproj @@ -5,7 +5,7 @@ en-US 1.0.0.0 ACME Corporation - net8.0 + net10.0 Acme.Package Acme.Package https://github.com/OctopusDeploy/Calamari/ diff --git a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.PackageBilingual/Acme.PackageBilingual.csproj b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.PackageBilingual/Acme.PackageBilingual.csproj index 6da45eedff..7aed0006ba 100644 --- a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.PackageBilingual/Acme.PackageBilingual.csproj +++ b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.PackageBilingual/Acme.PackageBilingual.csproj @@ -5,7 +5,7 @@ en-US 1.0.0.0 ACME Corporation - net8.0 + net10.0 Acme.PackageBilingual Acme.PackageBilingual https://github.com/OctopusDeploy/Calamari/ diff --git a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Service/Acme.Service.csproj b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Service/Acme.Service.csproj index dd5e74eadb..1800276d38 100644 --- a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Service/Acme.Service.csproj +++ b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Service/Acme.Service.csproj @@ -4,7 +4,7 @@ A sample project containing a Windows service. en-US ACME Corporation - net8.0 + net10.0 Acme.Service Acme.Service https://github.com/OctopusDeploy/Calamari/ diff --git a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.StructuredConfigFiles/Acme.StructuredConfigFiles.csproj b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.StructuredConfigFiles/Acme.StructuredConfigFiles.csproj index 782c942328..ead68801b7 100644 --- a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.StructuredConfigFiles/Acme.StructuredConfigFiles.csproj +++ b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.StructuredConfigFiles/Acme.StructuredConfigFiles.csproj @@ -5,7 +5,7 @@ en-US 1.0.0.0 ACME Corporation - net8.0 + net10.0 Acme.StructuredConfigFiles Acme.StructuredConfigFiles https://github.com/OctopusDeploy/Calamari/ diff --git a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Web.Tests/Acme.Web.Tests.csproj b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Web.Tests/Acme.Web.Tests.csproj index ab1d375751..259f71206e 100644 --- a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Web.Tests/Acme.Web.Tests.csproj +++ b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Web.Tests/Acme.Web.Tests.csproj @@ -4,7 +4,7 @@ Test project for Calamari. en-US Octopus Deploy - net8.0 + net10.0 Acme.Web.Tests Acme.Web.Tests https://github.com/OctopusDeploy/Calamari/ diff --git a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Web/Acme.Web.Nix.csproj b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Web/Acme.Web.Nix.csproj index ac21a9a30a..1128cb6a0a 100644 --- a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Web/Acme.Web.Nix.csproj +++ b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Web/Acme.Web.Nix.csproj @@ -4,7 +4,7 @@ Test project for Calamari. en-US Octopus Deploy - net8.0 + net10.0 Acme.Web Acme.Web https://github.com/OctopusDeploy/Calamari/ diff --git a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Web/Acme.Web.csproj b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Web/Acme.Web.csproj index 7d4370ee8b..df4b60c5d2 100644 --- a/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Web/Acme.Web.csproj +++ b/source/Calamari.Tests/Fixtures/Deployment/Packages/Acme.Web/Acme.Web.csproj @@ -4,7 +4,7 @@ Test project for Calamari. en-US Octopus Deploy - net8.0 + net10.0 Acme.Web Acme.Web https://github.com/OctopusDeploy/Calamari/ diff --git a/source/Calamari.Tests/Fixtures/Deployment/Packages/Octopus.Sample.AzureCloudService/Octopus.Sample.AzureCloudService.csproj b/source/Calamari.Tests/Fixtures/Deployment/Packages/Octopus.Sample.AzureCloudService/Octopus.Sample.AzureCloudService.csproj index b8413caa65..9361d9450d 100644 --- a/source/Calamari.Tests/Fixtures/Deployment/Packages/Octopus.Sample.AzureCloudService/Octopus.Sample.AzureCloudService.csproj +++ b/source/Calamari.Tests/Fixtures/Deployment/Packages/Octopus.Sample.AzureCloudService/Octopus.Sample.AzureCloudService.csproj @@ -5,7 +5,7 @@ en-US 1.0.0.0 Octopus Deploy - net8.0 + net10.0 Octopus.Sample.AzureCloudService Octopus.Sample.AzureCloudService https://github.com/OctopusDeploy/Calamari/ diff --git a/source/Calamari/Calamari.csproj b/source/Calamari/Calamari.csproj index d12c3ba5ac..da47f716ff 100644 --- a/source/Calamari/Calamari.csproj +++ b/source/Calamari/Calamari.csproj @@ -18,7 +18,7 @@ Calamari win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 Calamari.exe.manifest - net8.0 + net10.0 CS8632 true From 8b7d731edcd07c9bcc52af9d054e4f51295e41ec Mon Sep 17 00:00:00 2001 From: Alastair Pitts Date: Wed, 4 Feb 2026 10:55:27 +1100 Subject: [PATCH 2/2] Update a bunch of libraries --- README.md | 2 +- build-local.sh | 2 +- build/Build.PackageCalamariProjects.cs | 2 +- build/Build.cs | 2 +- build/Frameworks.cs | 4 ++-- build/_build.csproj | 6 +++--- .../Calamari.AzureAppService.Tests.csproj | 3 +-- .../Calamari.AzureAppService.csproj | 4 +--- .../Calamari.AzureScripting.csproj | 1 - .../Calamari.CloudAccounts/Calamari.CloudAccounts.csproj | 2 +- source/Calamari.Common/Calamari.Common.csproj | 5 ++--- .../Calamari.GoogleCloudScripting.Tests.csproj | 1 - source/Calamari.Shared/Calamari.Shared.csproj | 5 ++--- source/Calamari.Testing/Calamari.Testing.csproj | 8 +++----- source/Calamari.Tests/Calamari.Tests.csproj | 8 +++----- source/Calamari.Tests/Helpers/CodeGenerator.cs | 2 +- source/Calamari/Calamari.csproj | 3 --- source/Directory.Build.props | 2 +- 18 files changed, 24 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 33f9ff4965..cda722b87c 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Option 1 is recommended if you can use the default worker. #### Drawbacks: - It takes ~10 minutes to build and pack Calamari, however you can reduce this significantly by targeting a specific runtime/framework if you don't need the rest - - eg `./build-local.sh -y --framework "net8.0" --runtime "linux-x64"` (note that consolidation tests will not run when targeting a specific runtime) + - eg `./build-local.sh -y --runtime "linux-x64"` (note that consolidation tests will not run when targeting a specific runtime) - You need to restart Server for Calamari changes to take effect ### Bonus Variables! diff --git a/build-local.sh b/build-local.sh index 239e45dc50..a3fe5e113f 100755 --- a/build-local.sh +++ b/build-local.sh @@ -50,7 +50,7 @@ WarningMessage="${Yellow}\ ║ WARNING: ║ ║ Building Calamari on a non-windows machine will result ║ ║ in Calmari and Calamari.Cloud nuget packages being ║ -║ built against net8.0. This means that some ║ +║ built against net10.0. This means that some ║ ║ steps may not work as expected because they require a ║ ║ .Net Framework compatible Calamari Nuget Package. ║ ╬════════════════════════════════════════════════════════╬\ diff --git a/build/Build.PackageCalamariProjects.cs b/build/Build.PackageCalamariProjects.cs index acda9bb740..da4ba3e0c5 100644 --- a/build/Build.PackageCalamariProjects.cs +++ b/build/Build.PackageCalamariProjects.cs @@ -38,7 +38,7 @@ public partial class Build .Select(rid => { //we are making the bold assumption all projects only have a single target framework - var framework = project.GetTargetFrameworks()?.Single() ?? Frameworks.Net80; + var framework = project.GetTargetFrameworks()?.Single() ?? Frameworks.Net10; return new CalamariPackageMetadata(project, framework, rid); })) .ToList(); diff --git a/build/Build.cs b/build/Build.cs index 83ac683419..5b5e724948 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -60,7 +60,7 @@ public Build() // Mimic the behaviour of this attribute, but lazily so we don't pay the OctoVersion cost when it isn't needed OctoVersionInfo = new Lazy(() => { - var attribute = new OctoVersionAttribute { BranchMember = nameof(BranchName), Framework = "net8.0"}; + var attribute = new OctoVersionAttribute { BranchMember = nameof(BranchName), Framework = "net10.0"}; // the Attribute does all the work such as calling TeamCity.Instance?.SetBuildNumber for us var version = attribute.GetValue(null!, this); diff --git a/build/Frameworks.cs b/build/Frameworks.cs index f5d02a7a0b..ab77ad1c4b 100644 --- a/build/Frameworks.cs +++ b/build/Frameworks.cs @@ -4,7 +4,7 @@ namespace Calamari.Build { public static class Frameworks { - public const string Net80 = "net8.0"; - public const string Net80Windows = "net8.0-windows"; + public const string Net10 = "net10.0"; + public const string Net10Windows = "net10.0-windows"; } } \ No newline at end of file diff --git a/build/_build.csproj b/build/_build.csproj index 13ab79127a..5c3041643c 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -28,10 +28,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + diff --git a/source/Calamari.AzureAppService.Tests/Calamari.AzureAppService.Tests.csproj b/source/Calamari.AzureAppService.Tests/Calamari.AzureAppService.Tests.csproj index a36429f44b..6292282e55 100644 --- a/source/Calamari.AzureAppService.Tests/Calamari.AzureAppService.Tests.csproj +++ b/source/Calamari.AzureAppService.Tests/Calamari.AzureAppService.Tests.csproj @@ -17,8 +17,7 @@ - - + diff --git a/source/Calamari.AzureAppService/Calamari.AzureAppService.csproj b/source/Calamari.AzureAppService/Calamari.AzureAppService.csproj index 1a343234fe..8b31ba9644 100644 --- a/source/Calamari.AzureAppService/Calamari.AzureAppService.csproj +++ b/source/Calamari.AzureAppService/Calamari.AzureAppService.csproj @@ -20,10 +20,8 @@ runtime; build; native; contentfiles; analyzers - + - - diff --git a/source/Calamari.AzureScripting/Calamari.AzureScripting.csproj b/source/Calamari.AzureScripting/Calamari.AzureScripting.csproj index 869c1136a0..636deffff4 100644 --- a/source/Calamari.AzureScripting/Calamari.AzureScripting.csproj +++ b/source/Calamari.AzureScripting/Calamari.AzureScripting.csproj @@ -18,7 +18,6 @@ - diff --git a/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj b/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj index e37312126d..c3875e9e97 100644 --- a/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj +++ b/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj @@ -22,7 +22,7 @@ - + diff --git a/source/Calamari.Common/Calamari.Common.csproj b/source/Calamari.Common/Calamari.Common.csproj index 64a1d39c9a..9359081f93 100644 --- a/source/Calamari.Common/Calamari.Common.csproj +++ b/source/Calamari.Common/Calamari.Common.csproj @@ -19,18 +19,17 @@ - + - + - diff --git a/source/Calamari.GoogleCloudScripting.Tests/Calamari.GoogleCloudScripting.Tests.csproj b/source/Calamari.GoogleCloudScripting.Tests/Calamari.GoogleCloudScripting.Tests.csproj index 7311b71517..bf0b22b761 100644 --- a/source/Calamari.GoogleCloudScripting.Tests/Calamari.GoogleCloudScripting.Tests.csproj +++ b/source/Calamari.GoogleCloudScripting.Tests/Calamari.GoogleCloudScripting.Tests.csproj @@ -12,7 +12,6 @@ - diff --git a/source/Calamari.Shared/Calamari.Shared.csproj b/source/Calamari.Shared/Calamari.Shared.csproj index eef0729d28..88a851745b 100644 --- a/source/Calamari.Shared/Calamari.Shared.csproj +++ b/source/Calamari.Shared/Calamari.Shared.csproj @@ -34,17 +34,16 @@ all runtime; build; native; contentfiles; analyzers - + - - + diff --git a/source/Calamari.Testing/Calamari.Testing.csproj b/source/Calamari.Testing/Calamari.Testing.csproj index fa88cdc8dc..266e669aaf 100644 --- a/source/Calamari.Testing/Calamari.Testing.csproj +++ b/source/Calamari.Testing/Calamari.Testing.csproj @@ -11,14 +11,12 @@ - + - - + - - + diff --git a/source/Calamari.Tests/Calamari.Tests.csproj b/source/Calamari.Tests/Calamari.Tests.csproj index e142eaed74..dfb55eaef7 100644 --- a/source/Calamari.Tests/Calamari.Tests.csproj +++ b/source/Calamari.Tests/Calamari.Tests.csproj @@ -19,10 +19,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + - + @@ -32,8 +31,7 @@ - - + diff --git a/source/Calamari.Tests/Helpers/CodeGenerator.cs b/source/Calamari.Tests/Helpers/CodeGenerator.cs index ad275b31e5..16469f0e36 100644 --- a/source/Calamari.Tests/Helpers/CodeGenerator.cs +++ b/source/Calamari.Tests/Helpers/CodeGenerator.cs @@ -30,7 +30,7 @@ CommandLineInvocation CreateCommandLineInvocation(string executable, string argu ""rollForward"": ""latestFeature"" } }"); - var result = clr.Execute(CreateCommandLineInvocation("dotnet", "new console -f net8.0")); + var result = clr.Execute(CreateCommandLineInvocation("dotnet", "new console -f net10.0")); result.VerifySuccess(); var programCS = Path.Combine(projectPath.FullName, "Program.cs"); var newProgram = $@"using System; diff --git a/source/Calamari/Calamari.csproj b/source/Calamari/Calamari.csproj index da47f716ff..5763aa230b 100644 --- a/source/Calamari/Calamari.csproj +++ b/source/Calamari/Calamari.csproj @@ -46,11 +46,8 @@ - - - diff --git a/source/Directory.Build.props b/source/Directory.Build.props index c078493167..c68904c1f7 100644 --- a/source/Directory.Build.props +++ b/source/Directory.Build.props @@ -1,6 +1,6 @@ - true + true false