diff --git a/source/Calamari.Aws/Calamari.Aws.csproj b/source/Calamari.Aws/Calamari.Aws.csproj
index 00b1f8864..aefc72b66 100644
--- a/source/Calamari.Aws/Calamari.Aws.csproj
+++ b/source/Calamari.Aws/Calamari.Aws.csproj
@@ -22,12 +22,12 @@
true
-
-
-
-
-
-
+
+
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj b/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj
index 4bb6ecafd..2682748b5 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 98cc5dfa6..6ac45a7b0 100644
--- a/source/Calamari.Shared/Calamari.Shared.csproj
+++ b/source/Calamari.Shared/Calamari.Shared.csproj
@@ -28,7 +28,7 @@
-
+
all
diff --git a/source/Calamari.Terraform/Calamari.Terraform.csproj b/source/Calamari.Terraform/Calamari.Terraform.csproj
index 7ea834fc9..ba73af4e5 100644
--- a/source/Calamari.Terraform/Calamari.Terraform.csproj
+++ b/source/Calamari.Terraform/Calamari.Terraform.csproj
@@ -10,7 +10,7 @@
true
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/source/Calamari.Tests/AWS/UploadAwsS3CommandFixture.cs b/source/Calamari.Tests/AWS/UploadAwsS3CommandFixture.cs
index 5f3bbd420..fbf2d5f43 100644
--- a/source/Calamari.Tests/AWS/UploadAwsS3CommandFixture.cs
+++ b/source/Calamari.Tests/AWS/UploadAwsS3CommandFixture.cs
@@ -290,7 +290,7 @@ await Validate(async client =>
//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.Expiration.ExpiryDate.Should().Be(expectedDate);
}
else if (specialHeader.Key == "x-amz-website-redirect-location")
{