diff --git a/source/Calamari.Aws/Calamari.Aws.csproj b/source/Calamari.Aws/Calamari.Aws.csproj
index e0e4ca6cba..61ffe69d6a 100644
--- a/source/Calamari.Aws/Calamari.Aws.csproj
+++ b/source/Calamari.Aws/Calamari.Aws.csproj
@@ -22,12 +22,12 @@
true
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/source/Calamari.Aws/Deployment/Conventions/CloudFormationOutputsAsVariablesConvention.cs b/source/Calamari.Aws/Deployment/Conventions/CloudFormationOutputsAsVariablesConvention.cs
index 7d28ebaac8..e0ccd3bf80 100644
--- a/source/Calamari.Aws/Deployment/Conventions/CloudFormationOutputsAsVariablesConvention.cs
+++ b/source/Calamari.Aws/Deployment/Conventions/CloudFormationOutputsAsVariablesConvention.cs
@@ -57,7 +57,7 @@ Task InstallAsync(RunningDeployment deployment)
Guard.NotNull(query, "Query for stack may not be null");
List ConvertStackOutputs(Stack stack) =>
- stack.Outputs.Select(p => new VariableOutput(p.OutputKey, p.OutputValue)).ToList();
+ stack.Outputs?.Select(p => new VariableOutput(p.OutputKey, p.OutputValue)).ToList() ?? new List();
return (await query()).Select(ConvertStackOutputs)
.Map(result => (result: result.SomeOr(new List()), success: true));
@@ -89,4 +89,4 @@ async Task GetAndPipeOutputVariablesWithRetry(Func>> query, IV
}
}
}
-}
\ No newline at end of file
+}
diff --git a/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj b/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj
index 4bb6ecafdf..07aba40702 100644
--- a/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj
+++ b/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj
@@ -18,9 +18,9 @@
-
-
-
+
+
+
diff --git a/source/Calamari.Shared/Calamari.Shared.csproj b/source/Calamari.Shared/Calamari.Shared.csproj
index 8215c42ea9..3b0d575d90 100644
--- a/source/Calamari.Shared/Calamari.Shared.csproj
+++ b/source/Calamari.Shared/Calamari.Shared.csproj
@@ -28,7 +28,7 @@
-
+
diff --git a/source/Calamari.Terraform/Calamari.Terraform.csproj b/source/Calamari.Terraform/Calamari.Terraform.csproj
index 06577d5661..cd7c053259 100644
--- a/source/Calamari.Terraform/Calamari.Terraform.csproj
+++ b/source/Calamari.Terraform/Calamari.Terraform.csproj
@@ -10,7 +10,7 @@
true
-
+
diff --git a/source/Calamari.Tests/AWS/AwsEnvironmentGenerationFixture.cs b/source/Calamari.Tests/AWS/AwsEnvironmentGenerationFixture.cs
index 06033676a7..3dc62f3c1e 100644
--- a/source/Calamari.Tests/AWS/AwsEnvironmentGenerationFixture.cs
+++ b/source/Calamari.Tests/AWS/AwsEnvironmentGenerationFixture.cs
@@ -22,8 +22,8 @@ public class AwsEnvironmentGenerationFixture
{
[Test]
[TestCase("arn:aws:iam::0123456789AB:role/test-role", "My session name", "900", 900)]
- [TestCase("arn:aws:iam::0123456789AB:role/test-role", "My session name", null, 0)]
- [TestCase("arn:aws:iam::0123456789AB:role/test-role", "My session name", "", 0)]
+ [TestCase("arn:aws:iam::0123456789AB:role/test-role", "My session name", null, null)]
+ [TestCase("arn:aws:iam::0123456789AB:role/test-role", "My session name", "", null)]
public void CreatesAssumeRoleRequestWithExpectedParams(string arn, string sessionName, string duration, int? expectedDuration)
{
IVariables variables = new CalamariVariables();
diff --git a/source/Calamari.Tests/AWS/UploadAwsS3CommandFixture.cs b/source/Calamari.Tests/AWS/UploadAwsS3CommandFixture.cs
index 5f3bbd420b..50c25a3ff5 100644
--- a/source/Calamari.Tests/AWS/UploadAwsS3CommandFixture.cs
+++ b/source/Calamari.Tests/AWS/UploadAwsS3CommandFixture.cs
@@ -268,10 +268,7 @@ public async Task UploadPackageWithMetadata()
CannedAcl = "private",
BucketKeyBehaviour = BucketKeyBehaviourType.Filename,
Metadata = specialHeaders.Concat(userDefinedMetadata).ToList(),
- Tags = new List>()
- {
- new KeyValuePair("Environment", "Test")
- }
+ Tags = [new KeyValuePair("Environment", "Test")]
}
};
@@ -287,10 +284,7 @@ await Validate(async client =>
{
if (specialHeader.Key == "Expires")
{
- //There's a serialization bug in Json.Net that ends up changing the time to local.
- //Fix this assertion once that's done.
- var expectedDate = DateTime.Parse(specialHeader.Value.TrimEnd('Z')).ToUniversalTime();
- response.Expires.Should().Be(expectedDate);
+ response.ExpiresString.Should().Be(specialHeader.Value);
}
else if (specialHeader.Key == "x-amz-website-redirect-location")
{