Skip to content

Commit ec84048

Browse files
borlandOctobob
authored andcommitted
Replace incorrect references to NodaTime Instant with BCL DateTime to fix build
+semver: breaking GitOrigin-RevId: 21f30b3d5b8ab57a31c0dfbc188b1e643c9f95ad
1 parent 64afc08 commit ec84048

File tree

5 files changed

+14
-18
lines changed

5 files changed

+14
-18
lines changed

source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7833,7 +7833,7 @@ Octopus.Client.Model.Observability.ContainerLogs
78337833
{
78347834
.ctor()
78357835
String Message { get; set; }
7836-
Instant Timestamp { get; set; }
7836+
DateTimeOffset Timestamp { get; set; }
78377837
}
78387838
class GetContainerLogsRequest
78397839
{
@@ -7936,7 +7936,7 @@ Octopus.Client.Model.Observability.LiveStatus
79367936
Nullable<Guid> DesiredResourceId { get; set; }
79377937
String HealthStatus { get; set; }
79387938
String Kind { get; set; }
7939-
Instant LastUpdated { get; set; }
7939+
DateTimeOffset LastUpdated { get; set; }
79407940
String MachineId { get; set; }
79417941
Octopus.Client.Model.Observability.LiveStatus.ManifestSummaryResource ManifestSummary { get; set; }
79427942
String Name { get; set; }
@@ -7982,7 +7982,7 @@ Octopus.Client.Model.Observability.LiveStatus
79827982
class LiveStatusSummaryResource
79837983
{
79847984
.ctor()
7985-
Instant LastUpdated { get; set; }
7985+
DateTimeOffset LastUpdated { get; set; }
79867986
String Status { get; set; }
79877987
}
79887988
class ManifestSummaryResource
@@ -8033,8 +8033,8 @@ Octopus.Client.Model.Observability.ResourceEvents
80338033
.ctor()
80348034
String Action { get; set; }
80358035
Int32 Count { get; set; }
8036-
Instant FirstObservedTime { get; set; }
8037-
Instant LastObservedTime { get; set; }
8036+
DateTimeOffset FirstObservedTime { get; set; }
8037+
DateTimeOffset LastObservedTime { get; set; }
80388038
String Manifest { get; set; }
80398039
String Note { get; set; }
80408040
String Reason { get; set; }
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
using System;
22
using System.ComponentModel.DataAnnotations;
3-
using NodaTime;
43

54
namespace Octopus.Client.Model.Observability.ContainerLogs;
65

76
public class ContainerLogLineResource
87
{
98
[Required]
10-
public Instant Timestamp { get; set; }
9+
public DateTimeOffset Timestamp { get; set; }
1110

1211
[Required]
1312
public string Message { get; set; }
14-
}
13+
}

source/Octopus.Server.Client/Model/Observability/LiveStatus/KubernetesLiveStatusDetailedResource.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.ComponentModel.DataAnnotations;
4-
using NodaTime;
54

65
namespace Octopus.Client.Model.Observability.LiveStatus;
76

@@ -24,7 +23,7 @@ public class KubernetesLiveStatusDetailedResource
2423
public string MachineId { get; set; }
2524

2625
[Required]
27-
public Instant LastUpdated { get; set; }
26+
public DateTimeOffset LastUpdated { get; set; }
2827

2928
public ManifestSummaryResource ManifestSummary { get; set; }
3029

@@ -34,4 +33,4 @@ public class KubernetesLiveStatusDetailedResource
3433
public Guid? DesiredResourceId { get; set; }
3534

3635
public Guid? ResourceId { get; set; }
37-
}
36+
}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.ComponentModel.DataAnnotations;
3-
using NodaTime;
43

54
namespace Octopus.Client.Model.Observability.LiveStatus;
65

@@ -10,5 +9,5 @@ public class LiveStatusSummaryResource
109
public string Status { get; set; }
1110

1211
[Required]
13-
public Instant LastUpdated { get; set; }
14-
}
12+
public DateTimeOffset LastUpdated { get; set; }
13+
}

source/Octopus.Server.Client/Model/Observability/ResourceEvents/KubernetesEventResource.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
using System;
22
using System.ComponentModel.DataAnnotations;
3-
using NodaTime;
43

54
namespace Octopus.Client.Model.Observability.ResourceEvents;
65

76
public class KubernetesEventResource
87
{
98
[Required]
10-
public Instant FirstObservedTime { get; set; }
9+
public DateTimeOffset FirstObservedTime { get; set; }
1110

1211
[Required]
13-
public Instant LastObservedTime { get; set; }
12+
public DateTimeOffset LastObservedTime { get; set; }
1413

1514
[Required]
1615
public int Count { get; set; }
@@ -35,4 +34,4 @@ public class KubernetesEventResource
3534

3635
[Required]
3736
public string Manifest { get; set; }
38-
}
37+
}

0 commit comments

Comments
 (0)