From e998c3d9a866f66fec46bd1cdcc0bc9fd28ea22f Mon Sep 17 00:00:00 2001 From: Alastair Pitts Date: Wed, 14 Jan 2026 15:17:14 +1100 Subject: [PATCH 1/2] Remove LangVersion from all csproj files --- source/Calamari.Aws/Calamari.Aws.csproj | 1 - source/Calamari.Azure/Calamari.Azure.csproj | 1 - .../Calamari.AzureAppService.Tests.csproj | 1 - source/Calamari.AzureAppService/Calamari.AzureAppService.csproj | 1 - .../Calamari.AzureResourceGroup.Tests.csproj | 1 - .../Calamari.AzureResourceGroup.csproj | 1 - .../Calamari.AzureScripting.Tests.csproj | 1 - source/Calamari.AzureScripting/Calamari.AzureScripting.csproj | 1 - .../Calamari.AzureServiceFabric.Tests.csproj | 1 - .../Calamari.AzureServiceFabric.csproj | 1 - .../Calamari.AzureWebApp.NetCoreShim.csproj | 1 - .../Calamari.AzureWebApp.Tests/Calamari.AzureWebApp.Tests.csproj | 1 - source/Calamari.AzureWebApp/Calamari.AzureWebApp.csproj | 1 - source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj | 1 - source/Calamari.Common/Calamari.Common.csproj | 1 - .../Calamari.ConsolidateCalamariPackages.Api.csproj | 1 - .../Calamari.ConsolidateCalamariPackages.Tests.csproj | 1 - .../Calamari.ConsolidateCalamariPackages.csproj | 1 - .../Calamari.GoogleCloudAccounts.csproj | 1 - .../Calamari.GoogleCloudScripting.Tests.csproj | 1 - .../Calamari.GoogleCloudScripting.csproj | 1 - source/Calamari.Scripting.Tests/Calamari.Scripting.Tests.csproj | 1 - source/Calamari.Scripting/Calamari.Scripting.csproj | 1 - source/Calamari.Shared/Calamari.Shared.csproj | 1 - source/Calamari.Terraform.Tests/Calamari.Terraform.Tests.csproj | 1 - source/Calamari.Terraform/Calamari.Terraform.csproj | 1 - source/Calamari.Testing/Calamari.Testing.csproj | 1 - source/Calamari.Tests/Calamari.Tests.csproj | 1 - source/Calamari/Calamari.csproj | 1 - 29 files changed, 29 deletions(-) diff --git a/source/Calamari.Aws/Calamari.Aws.csproj b/source/Calamari.Aws/Calamari.Aws.csproj index da7185a30c..00b1f88649 100644 --- a/source/Calamari.Aws/Calamari.Aws.csproj +++ b/source/Calamari.Aws/Calamari.Aws.csproj @@ -19,7 +19,6 @@ net8.0 - default true diff --git a/source/Calamari.Azure/Calamari.Azure.csproj b/source/Calamari.Azure/Calamari.Azure.csproj index bef28bbf97..64569b4ee2 100644 --- a/source/Calamari.Azure/Calamari.Azure.csproj +++ b/source/Calamari.Azure/Calamari.Azure.csproj @@ -6,7 +6,6 @@ Octopus Deploy Octopus Deploy Pty Ltd win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 - default net8.0 true diff --git a/source/Calamari.AzureAppService.Tests/Calamari.AzureAppService.Tests.csproj b/source/Calamari.AzureAppService.Tests/Calamari.AzureAppService.Tests.csproj index e70a736596..d605e8d16f 100644 --- a/source/Calamari.AzureAppService.Tests/Calamari.AzureAppService.Tests.csproj +++ b/source/Calamari.AzureAppService.Tests/Calamari.AzureAppService.Tests.csproj @@ -5,7 +5,6 @@ Calamari.AzureAppService.Tests false win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 - default net8.0 true diff --git a/source/Calamari.AzureAppService/Calamari.AzureAppService.csproj b/source/Calamari.AzureAppService/Calamari.AzureAppService.csproj index e3dcac70c0..581439b233 100644 --- a/source/Calamari.AzureAppService/Calamari.AzureAppService.csproj +++ b/source/Calamari.AzureAppService/Calamari.AzureAppService.csproj @@ -7,7 +7,6 @@ true Exe win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 - default NU5104 net8.0 true diff --git a/source/Calamari.AzureResourceGroup.Tests/Calamari.AzureResourceGroup.Tests.csproj b/source/Calamari.AzureResourceGroup.Tests/Calamari.AzureResourceGroup.Tests.csproj index b1a3b5f0a9..dd0f12e4cf 100644 --- a/source/Calamari.AzureResourceGroup.Tests/Calamari.AzureResourceGroup.Tests.csproj +++ b/source/Calamari.AzureResourceGroup.Tests/Calamari.AzureResourceGroup.Tests.csproj @@ -5,7 +5,6 @@ false win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 net8.0 - default true diff --git a/source/Calamari.AzureResourceGroup/Calamari.AzureResourceGroup.csproj b/source/Calamari.AzureResourceGroup/Calamari.AzureResourceGroup.csproj index 5240e796d3..960bbf8e4f 100644 --- a/source/Calamari.AzureResourceGroup/Calamari.AzureResourceGroup.csproj +++ b/source/Calamari.AzureResourceGroup/Calamari.AzureResourceGroup.csproj @@ -2,7 +2,6 @@ Calamari.AzureResourceGroup Calamari.AzureResourceGroup - default enable Exe false diff --git a/source/Calamari.AzureScripting.Tests/Calamari.AzureScripting.Tests.csproj b/source/Calamari.AzureScripting.Tests/Calamari.AzureScripting.Tests.csproj index 6c5bae0dc8..163c40535c 100644 --- a/source/Calamari.AzureScripting.Tests/Calamari.AzureScripting.Tests.csproj +++ b/source/Calamari.AzureScripting.Tests/Calamari.AzureScripting.Tests.csproj @@ -3,7 +3,6 @@ Calamari.AzureScripting.Tests Calamari.AzureScripting.Tests - default enable win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 false diff --git a/source/Calamari.AzureScripting/Calamari.AzureScripting.csproj b/source/Calamari.AzureScripting/Calamari.AzureScripting.csproj index 763bdf055f..201deeeb6c 100644 --- a/source/Calamari.AzureScripting/Calamari.AzureScripting.csproj +++ b/source/Calamari.AzureScripting/Calamari.AzureScripting.csproj @@ -2,7 +2,6 @@ Calamari.AzureScripting Calamari.AzureScripting - default enable Exe true diff --git a/source/Calamari.AzureServiceFabric.Tests/Calamari.AzureServiceFabric.Tests.csproj b/source/Calamari.AzureServiceFabric.Tests/Calamari.AzureServiceFabric.Tests.csproj index 3eccb380df..e383bd00be 100644 --- a/source/Calamari.AzureServiceFabric.Tests/Calamari.AzureServiceFabric.Tests.csproj +++ b/source/Calamari.AzureServiceFabric.Tests/Calamari.AzureServiceFabric.Tests.csproj @@ -6,7 +6,6 @@ false net8.0-windows win-x64 - default true diff --git a/source/Calamari.AzureServiceFabric/Calamari.AzureServiceFabric.csproj b/source/Calamari.AzureServiceFabric/Calamari.AzureServiceFabric.csproj index de226cf0eb..d6734fe7e2 100644 --- a/source/Calamari.AzureServiceFabric/Calamari.AzureServiceFabric.csproj +++ b/source/Calamari.AzureServiceFabric/Calamari.AzureServiceFabric.csproj @@ -7,7 +7,6 @@ Exe net8.0-windows win-x64 - default true diff --git a/source/Calamari.AzureWebApp.NetCoreShim/Calamari.AzureWebApp.NetCoreShim.csproj b/source/Calamari.AzureWebApp.NetCoreShim/Calamari.AzureWebApp.NetCoreShim.csproj index 0f104191b8..22d0514f48 100644 --- a/source/Calamari.AzureWebApp.NetCoreShim/Calamari.AzureWebApp.NetCoreShim.csproj +++ b/source/Calamari.AzureWebApp.NetCoreShim/Calamari.AzureWebApp.NetCoreShim.csproj @@ -3,7 +3,6 @@ Exe net462 - default CS8632 true diff --git a/source/Calamari.AzureWebApp.Tests/Calamari.AzureWebApp.Tests.csproj b/source/Calamari.AzureWebApp.Tests/Calamari.AzureWebApp.Tests.csproj index e35abfbf5a..0b6a698239 100644 --- a/source/Calamari.AzureWebApp.Tests/Calamari.AzureWebApp.Tests.csproj +++ b/source/Calamari.AzureWebApp.Tests/Calamari.AzureWebApp.Tests.csproj @@ -4,7 +4,6 @@ Calamari.AzureWebApp.Tests net8.0 win-x64 - default false true diff --git a/source/Calamari.AzureWebApp/Calamari.AzureWebApp.csproj b/source/Calamari.AzureWebApp/Calamari.AzureWebApp.csproj index 49025d9a42..678908382b 100644 --- a/source/Calamari.AzureWebApp/Calamari.AzureWebApp.csproj +++ b/source/Calamari.AzureWebApp/Calamari.AzureWebApp.csproj @@ -8,7 +8,6 @@ 8.0 net8.0 win-x64 - default true diff --git a/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj b/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj index 2b0eabda77..4bb6ecafdf 100644 --- a/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj +++ b/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj @@ -3,7 +3,6 @@ Calamari.CloudAccounts net8.0 - default Octopus.Calamari.CloudAccounts Calamari.CloudAccounts Octopus Deploy diff --git a/source/Calamari.Common/Calamari.Common.csproj b/source/Calamari.Common/Calamari.Common.csproj index 49bfd2c14f..f1b0c6703e 100644 --- a/source/Calamari.Common/Calamari.Common.csproj +++ b/source/Calamari.Common/Calamari.Common.csproj @@ -2,7 +2,6 @@ net8.0 - default enable anycpu false diff --git a/source/Calamari.ConsolidateCalamariPackages.Api/Calamari.ConsolidateCalamariPackages.Api.csproj b/source/Calamari.ConsolidateCalamariPackages.Api/Calamari.ConsolidateCalamariPackages.Api.csproj index 3bea38be8a..0270115b70 100644 --- a/source/Calamari.ConsolidateCalamariPackages.Api/Calamari.ConsolidateCalamariPackages.Api.csproj +++ b/source/Calamari.ConsolidateCalamariPackages.Api/Calamari.ConsolidateCalamariPackages.Api.csproj @@ -6,7 +6,6 @@ net8.0 enable enable - default Octopus Deploy Octopus Deploy Pty Ltd diff --git a/source/Calamari.ConsolidateCalamariPackages.Tests/Calamari.ConsolidateCalamariPackages.Tests.csproj b/source/Calamari.ConsolidateCalamariPackages.Tests/Calamari.ConsolidateCalamariPackages.Tests.csproj index d2ff2336b5..3b0e227376 100644 --- a/source/Calamari.ConsolidateCalamariPackages.Tests/Calamari.ConsolidateCalamariPackages.Tests.csproj +++ b/source/Calamari.ConsolidateCalamariPackages.Tests/Calamari.ConsolidateCalamariPackages.Tests.csproj @@ -2,7 +2,6 @@ net8.0 - default false true diff --git a/source/Calamari.ConsolidateCalamariPackages/Calamari.ConsolidateCalamariPackages.csproj b/source/Calamari.ConsolidateCalamariPackages/Calamari.ConsolidateCalamariPackages.csproj index cec3a1dc67..7a93745308 100644 --- a/source/Calamari.ConsolidateCalamariPackages/Calamari.ConsolidateCalamariPackages.csproj +++ b/source/Calamari.ConsolidateCalamariPackages/Calamari.ConsolidateCalamariPackages.csproj @@ -4,7 +4,6 @@ Octopus.Calamari.ConsolidatedPackage Octopus.Calamari.ConsolidatedPackage net8.0 - default true true Octopus Deploy diff --git a/source/Calamari.GoogleCloudAccounts/Calamari.GoogleCloudAccounts.csproj b/source/Calamari.GoogleCloudAccounts/Calamari.GoogleCloudAccounts.csproj index 518f285456..012535291a 100644 --- a/source/Calamari.GoogleCloudAccounts/Calamari.GoogleCloudAccounts.csproj +++ b/source/Calamari.GoogleCloudAccounts/Calamari.GoogleCloudAccounts.csproj @@ -3,7 +3,6 @@ Calamari.GoogleCloudAccounts net8.0 - default CS8632 true diff --git a/source/Calamari.GoogleCloudScripting.Tests/Calamari.GoogleCloudScripting.Tests.csproj b/source/Calamari.GoogleCloudScripting.Tests/Calamari.GoogleCloudScripting.Tests.csproj index a94cce45ed..bb23de344f 100644 --- a/source/Calamari.GoogleCloudScripting.Tests/Calamari.GoogleCloudScripting.Tests.csproj +++ b/source/Calamari.GoogleCloudScripting.Tests/Calamari.GoogleCloudScripting.Tests.csproj @@ -3,7 +3,6 @@ Calamari.GoogleCloudScripting.Tests win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 - default false enable net8.0 diff --git a/source/Calamari.GoogleCloudScripting/Calamari.GoogleCloudScripting.csproj b/source/Calamari.GoogleCloudScripting/Calamari.GoogleCloudScripting.csproj index 0beec07bdc..1d7c506ad5 100644 --- a/source/Calamari.GoogleCloudScripting/Calamari.GoogleCloudScripting.csproj +++ b/source/Calamari.GoogleCloudScripting/Calamari.GoogleCloudScripting.csproj @@ -4,7 +4,6 @@ Calamari.GoogleCloudScripting Exe win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 - default false false net8.0 diff --git a/source/Calamari.Scripting.Tests/Calamari.Scripting.Tests.csproj b/source/Calamari.Scripting.Tests/Calamari.Scripting.Tests.csproj index e6954b932c..90f74af71d 100644 --- a/source/Calamari.Scripting.Tests/Calamari.Scripting.Tests.csproj +++ b/source/Calamari.Scripting.Tests/Calamari.Scripting.Tests.csproj @@ -5,7 +5,6 @@ net8.0 win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 false - default true diff --git a/source/Calamari.Scripting/Calamari.Scripting.csproj b/source/Calamari.Scripting/Calamari.Scripting.csproj index 5fe1e153af..9157257c8f 100644 --- a/source/Calamari.Scripting/Calamari.Scripting.csproj +++ b/source/Calamari.Scripting/Calamari.Scripting.csproj @@ -7,7 +7,6 @@ enable win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 true - default net8.0 true diff --git a/source/Calamari.Shared/Calamari.Shared.csproj b/source/Calamari.Shared/Calamari.Shared.csproj index 111c189d01..9c63cc5131 100644 --- a/source/Calamari.Shared/Calamari.Shared.csproj +++ b/source/Calamari.Shared/Calamari.Shared.csproj @@ -21,7 +21,6 @@ Calamari - default enable net8.0 diff --git a/source/Calamari.Terraform.Tests/Calamari.Terraform.Tests.csproj b/source/Calamari.Terraform.Tests/Calamari.Terraform.Tests.csproj index 2f033d36dd..13d16ad8a0 100644 --- a/source/Calamari.Terraform.Tests/Calamari.Terraform.Tests.csproj +++ b/source/Calamari.Terraform.Tests/Calamari.Terraform.Tests.csproj @@ -5,7 +5,6 @@ Calamari.Terraform.Tests win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 false - default net8.0 CS8632 diff --git a/source/Calamari.Terraform/Calamari.Terraform.csproj b/source/Calamari.Terraform/Calamari.Terraform.csproj index e3b016bf2a..cbabb7234e 100644 --- a/source/Calamari.Terraform/Calamari.Terraform.csproj +++ b/source/Calamari.Terraform/Calamari.Terraform.csproj @@ -5,7 +5,6 @@ true false Exe - default win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 net8.0 true diff --git a/source/Calamari.Testing/Calamari.Testing.csproj b/source/Calamari.Testing/Calamari.Testing.csproj index dce75317ec..d78695c693 100644 --- a/source/Calamari.Testing/Calamari.Testing.csproj +++ b/source/Calamari.Testing/Calamari.Testing.csproj @@ -4,7 +4,6 @@ enable https://github.com/OctopusDeploy/Calamari/ Apache-2.0 - default net8.0 true Octopus.Calamari.Testing diff --git a/source/Calamari.Tests/Calamari.Tests.csproj b/source/Calamari.Tests/Calamari.Tests.csproj index 2e93d7e47e..faeb0b5a40 100644 --- a/source/Calamari.Tests/Calamari.Tests.csproj +++ b/source/Calamari.Tests/Calamari.Tests.csproj @@ -11,7 +11,6 @@ win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 net8.0 - default true true diff --git a/source/Calamari/Calamari.csproj b/source/Calamari/Calamari.csproj index 292a770587..da30a2c1e4 100644 --- a/source/Calamari/Calamari.csproj +++ b/source/Calamari/Calamari.csproj @@ -19,7 +19,6 @@ win-x64;linux-x64;osx-x64;linux-arm;linux-arm64 Calamari.exe.manifest net8.0 - default CS8632 true From 31dcc2caad4588675eb389b7bc9596f0ccf28885 Mon Sep 17 00:00:00 2001 From: Alastair Pitts Date: Wed, 14 Jan 2026 16:28:18 +1100 Subject: [PATCH 2/2] Remove nullabile symbol --- source/Calamari.AzureWebApp.NetCoreShim/AesEncryption.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Calamari.AzureWebApp.NetCoreShim/AesEncryption.cs b/source/Calamari.AzureWebApp.NetCoreShim/AesEncryption.cs index 6208486b1f..8b760f3935 100644 --- a/source/Calamari.AzureWebApp.NetCoreShim/AesEncryption.cs +++ b/source/Calamari.AzureWebApp.NetCoreShim/AesEncryption.cs @@ -96,7 +96,7 @@ For testing purposes } } - Aes GetCryptoProvider(byte[]? iv = null) + Aes GetCryptoProvider(byte[] iv = null) { var provider = new AesCryptoServiceProvider {