Skip to content

Commit

Permalink
Merge branch 'release/0.105.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jericho committed Feb 1, 2024
2 parents 07850ea + d476024 commit ae876c3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Source/StrongGrid.UnitTests/WebhookParserTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@ public async Task UniqueArguments_are_serialized()
[InlineData("this-messageId-does-not-contain-any-separator", "this-messageId-does-not-contain-any-separator")] // This is to validate that we can handle the case where messageId does not contain any of the known separators
public async Task Can_handle_various_message_id_separators(string internalMessageId, string expectedMesageId)
{
var jsonPayload = $"[{{\"event\":\"processed\",\r\n\"sg_message_id\":\"{internalMessageId}\"}}]";
var jsonPayload = $"[{{\"event\":\"processed\",\"sg_message_id\":\"{internalMessageId}\"}}]";
var parser = new WebhookParser();
using (var stream = GetStream(jsonPayload))
{
Expand Down
28 changes: 2 additions & 26 deletions Source/StrongGrid/Models/IpAddress.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,75 +12,51 @@ public class IpAddress
/// <summary>
/// Gets or sets the IP address.
/// </summary>
/// <value>
/// The IP address.
/// </value>
[JsonPropertyName("ip")]
public string Address { get; set; }

/// <summary>
/// Gets or sets the subusers that are able to send email from this IP.
/// </summary>
/// <value>
/// The subusers.
/// </value>
[JsonPropertyName("subusers")]
public string[] Subusers { get; set; }

/// <summary>
/// Gets or sets the reverse DNS record for this IP address.
/// </summary>
/// <value>
/// The cost.
/// </value>
[JsonPropertyName("rdns")]
public string ReverseDns { get; set; }

/// <summary>
/// Gets or sets the IP pools that this IP has been added to.
/// </summary>
/// <value>
/// The cost.
/// </value>
[JsonPropertyName("pools")]
public string[] Pools { get; set; }

/// <summary>
/// Gets or sets a value indicating whether the IP address is currently warming up.
/// </summary>
/// <value>
/// The warmup indicator.
/// </value>
[JsonPropertyName("warmup")]
public bool Warmup { get; set; }

/// <summary>
/// Gets or sets a value indicating whether the IP address has been whitelabeled.
/// </summary>
/// <value>
/// The cost.
/// </value>
[JsonPropertyName("whitelabeled")]
public bool WhiteLabeled { get; set; }

/// <summary>
/// Gets or sets the date that the IP address was entered into warmup.
/// </summary>
/// <value>
/// The cost.
/// </value>
[JsonPropertyName("start_date")]
[JsonConverter(typeof(NullableEpochConverter))]
public DateTime? WarmupStartedOn { get; set; }

/// <summary>
/// Gets or sets the date that the IP address was assigned to the user.
/// </summary>
/// <value>
/// The cost.
/// </value>
[JsonPropertyName("assigned_at")]
[JsonConverter(typeof(EpochConverter))]
public DateTime AssignedOn { get; set; }
[JsonConverter(typeof(NullableEpochConverter))]
public DateTime? AssignedOn { get; set; }
}
}
2 changes: 1 addition & 1 deletion build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#tool dotnet:?package=coveralls.net&version=4.0.1
#tool nuget:https://f.feedz.io/jericho/jericho/nuget/?package=GitReleaseManager&version=0.17.0-collaborators0003
#tool nuget:?package=ReportGenerator&version=5.2.0
#tool nuget:?package=xunit.runner.console&version=2.6.5
#tool nuget:?package=xunit.runner.console&version=2.6.6
#tool nuget:?package=CodecovUploader&version=0.7.1

// Install addins.
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"version": "8.0.101",
"rollForward": "patch",
"allowPrerelease": false
}
Expand Down

0 comments on commit ae876c3

Please sign in to comment.