Skip to content

Commit

Permalink
Removed obsolete attributes on Machine resources, replaced with issue #…
Browse files Browse the repository at this point in the history
  • Loading branch information
droyad committed Sep 14, 2016
1 parent 26db0f6 commit afb89cd
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 10 deletions.
5 changes: 1 addition & 4 deletions source/Octo/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@
"debugType": "portable",
"emitEntryPoint": true,
"outputName": "Octo",
"warningsAsErrors": true,
"nowarn": [
"CS0612" // Obsolete
]
"warningsAsErrors": true
},
"configurations": {
"Release": {
Expand Down
4 changes: 3 additions & 1 deletion source/Octopus.Client/Model/DeploymentTemplateStep.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ public class DeploymentTemplateStep
public string ActionNumber { get; set; }
public string[] Roles { get; set; }

[Obsolete] // TODO: [ObsoleteEx(TreatAsErrorFromVersion = "4.0", RemoveInVersion = "4.0", ReplacementTypeOrMember = "Machines")]
/// <summary>
/// Obsoleted as Server 3.4
/// </summary>
public string[] MachineNames { get; set; }

public MachineDeploymentPreview[] Machines { get; set; }
Expand Down
4 changes: 3 additions & 1 deletion source/Octopus.Client/Model/MachineModelStatus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

namespace Octopus.Client.Model
{
[Obsolete] // TODO: [ObsoleteEx(TreatAsErrorFromVersion = "4.0", RemoveInVersion = "4.0", ReplacementTypeOrMember = "MachineModelHealthStatus")]
/// <summary>
/// Obsoleted as Server 3.4
/// </summary>
public enum MachineModelStatus
{
Online,
Expand Down
13 changes: 10 additions & 3 deletions source/Octopus.Client/Model/MachineResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,18 @@ public MachineResource()
[Writeable]
public string Name { get; set; }

/// <summary>
/// Obsoleted as Server 3.4
/// </summary>
[Trim]
[Writeable]
[Obsolete] // TODO: [ObsoleteEx(Message = "The Thumbprint property is not supported by all deployment target types; for Tentacle-based deployment targets, use Endpoint.Thumbprint instead.", TreatAsErrorFromVersion = "4.0", RemoveInVersion = "4.0")]
public string Thumbprint { get; set; }

/// <summary>
/// Obsoleted as Server 3.4
/// </summary>
[Trim]
[Writeable]
[Obsolete] // TODO: [ObsoleteEx(Message = "The Uri property is not supported by all deployment target types; use corresponding properties of Endpoint instead.", TreatAsErrorFromVersion = "4.0", RemoveInVersion = "4.0")]
public string Uri { get; set; }

[Writeable]
Expand All @@ -45,7 +49,10 @@ public MachineResource()
[Writeable]
public ReferenceCollection TenantTags { get; set; }

[Obsolete] // TODO: [ObsoleteEx(TreatAsErrorFromVersion = "4.0", RemoveInVersion = "4.0", ReplacementTypeOrMember = "HealthStatus")]

/// <summary>
/// Obsoleted as Server 3.4
/// </summary>
public MachineModelStatus Status { get; set; }

public MachineModelHealthStatus HealthStatus { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion source/Octopus.Client/Model/ScopeValue.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Octopus.Client.Model
{
public class ScopeValue : ReferenceCollection
{
[Obsolete] // TODO: [ObsoleteEx(Message = "For persistence only", TreatAsErrorFromVersion = "3.0")]
[Obsolete("For serialization only")]
public ScopeValue()
{
}
Expand Down

0 comments on commit afb89cd

Please sign in to comment.