diff --git a/src/dotnet/aspire-session-host/ResourceProto/ResourceProto/ResourceService.cs b/src/dotnet/aspire-session-host/ResourceProto/ResourceProto/ResourceService.cs index 1211db9e..8cb07ea9 100644 --- a/src/dotnet/aspire-session-host/ResourceProto/ResourceProto/ResourceService.cs +++ b/src/dotnet/aspire-session-host/ResourceProto/ResourceProto/ResourceService.cs @@ -9,7 +9,7 @@ using pbc = global::Google.Protobuf.Collections; using pbr = global::Google.Protobuf.Reflection; using scg = global::System.Collections.Generic; -namespace Aspire.V1 { +namespace Aspire.ResourceService.Proto.V1 { /// Holder for reflection information generated from ResourceProto/resource_service.proto public static partial class ResourceServiceReflection { @@ -43,82 +43,73 @@ static ResourceServiceReflection() { "bGF5X25hbWUYAiABKAlIAIgBARIsCghjb21tYW5kcxgDIAMoCzIaLmFzcGly", "ZS52MS5SZXNvdXJjZUNvbW1hbmRCDwoNX2Rpc3BsYXlfbmFtZSJXChNFbnZp", "cm9ubWVudFZhcmlhYmxlEgwKBG5hbWUYASABKAkSEgoFdmFsdWUYAiABKAlI", - "AIgBARIUCgxpc19mcm9tX3NwZWMYAyABKAhCCAoGX3ZhbHVlIjMKCEVuZHBv", - "aW50EhQKDGVuZHBvaW50X3VybBgBIAEoCRIRCglwcm94eV91cmwYAiABKAki", - "fQoHU2VydmljZRIMCgRuYW1lGAEgASgJEh4KEWFsbG9jYXRlZF9hZGRyZXNz", - "GAIgASgJSACIAQESGwoOYWxsb2NhdGVkX3BvcnQYAyABKAVIAYgBAUIUChJf", - "YWxsb2NhdGVkX2FkZHJlc3NCEQoPX2FsbG9jYXRlZF9wb3J0IjoKA1VybBIM", + "AIgBARIUCgxpc19mcm9tX3NwZWMYAyABKAhCCAoGX3ZhbHVlIjoKA1VybBIM", "CgRuYW1lGAEgASgJEhAKCGZ1bGxfdXJsGAIgASgJEhMKC2lzX2ludGVybmFs", "GAMgASgIInMKEFJlc291cmNlUHJvcGVydHkSDAoEbmFtZRgBIAEoCRIZCgxk", "aXNwbGF5X25hbWUYAiABKAlIAIgBARIlCgV2YWx1ZRgDIAEoCzIWLmdvb2ds", - "ZS5wcm90b2J1Zi5WYWx1ZUIPCg1fZGlzcGxheV9uYW1lIq4ECghSZXNvdXJj", + "ZS5wcm90b2J1Zi5WYWx1ZUIPCg1fZGlzcGxheV9uYW1lIqIDCghSZXNvdXJj", "ZRIMCgRuYW1lGAEgASgJEhUKDXJlc291cmNlX3R5cGUYAiABKAkSFAoMZGlz", "cGxheV9uYW1lGAMgASgJEgsKA3VpZBgEIAEoCRISCgVzdGF0ZRgFIAEoCUgA", "iAEBEjMKCmNyZWF0ZWRfYXQYBiABKAsyGi5nb29nbGUucHJvdG9idWYuVGlt", "ZXN0YW1wSAGIAQESMwoLZW52aXJvbm1lbnQYByADKAsyHi5hc3BpcmUudjEu", - "RW52aXJvbm1lbnRWYXJpYWJsZRIpChhleHBlY3RlZF9lbmRwb2ludHNfY291", - "bnQYCCABKAVCAhgBSAKIAQESKgoJZW5kcG9pbnRzGAkgAygLMhMuYXNwaXJl", - "LnYxLkVuZHBvaW50QgIYARIoCghzZXJ2aWNlcxgKIAMoCzISLmFzcGlyZS52", - "MS5TZXJ2aWNlQgIYARIsCghjb21tYW5kcxgLIAMoCzIaLmFzcGlyZS52MS5S", - "ZXNvdXJjZUNvbW1hbmQSLwoKcHJvcGVydGllcxgMIAMoCzIbLmFzcGlyZS52", - "MS5SZXNvdXJjZVByb3BlcnR5EhwKBHVybHMYDSADKAsyDi5hc3BpcmUudjEu", - "VXJsEhgKC3N0YXRlX3N0eWxlGA4gASgJSAOIAQFCCAoGX3N0YXRlQg0KC19j", - "cmVhdGVkX2F0QhsKGV9leHBlY3RlZF9lbmRwb2ludHNfY291bnRCDgoMX3N0", - "YXRlX3N0eWxlIm4KE0luaXRpYWxSZXNvdXJjZURhdGESJgoJcmVzb3VyY2Vz", - "GAEgAygLMhMuYXNwaXJlLnYxLlJlc291cmNlEi8KDnJlc291cmNlX3R5cGVz", - "GAIgAygLMhcuYXNwaXJlLnYxLlJlc291cmNlVHlwZSJAChBSZXNvdXJjZURl", - "bGV0aW9uEhUKDXJlc291cmNlX25hbWUYASABKAkSFQoNcmVzb3VyY2VfdHlw", - "ZRgCIAEoCSJ0ChRXYXRjaFJlc291cmNlc0NoYW5nZRItCgZkZWxldGUYASAB", - "KAsyGy5hc3BpcmUudjEuUmVzb3VyY2VEZWxldGlvbkgAEiUKBnVwc2VydBgC", - "IAEoCzITLmFzcGlyZS52MS5SZXNvdXJjZUgAQgYKBGtpbmQiRwoVV2F0Y2hS", - "ZXNvdXJjZXNDaGFuZ2VzEi4KBXZhbHVlGAEgAygLMh8uYXNwaXJlLnYxLldh", - "dGNoUmVzb3VyY2VzQ2hhbmdlIkMKFVdhdGNoUmVzb3VyY2VzUmVxdWVzdBIZ", - "Cgxpc19yZWNvbm5lY3QYASABKAhIAIgBAUIPCg1faXNfcmVjb25uZWN0IosB", - "ChRXYXRjaFJlc291cmNlc1VwZGF0ZRI2Cgxpbml0aWFsX2RhdGEYASABKAsy", - "Hi5hc3BpcmUudjEuSW5pdGlhbFJlc291cmNlRGF0YUgAEjMKB2NoYW5nZXMY", - "AiABKAsyIC5hc3BpcmUudjEuV2F0Y2hSZXNvdXJjZXNDaGFuZ2VzSABCBgoE", - "a2luZCJbCg5Db25zb2xlTG9nTGluZRIMCgR0ZXh0GAEgASgJEhcKCmlzX3N0", - "ZF9lcnIYAiABKAhIAIgBARITCgtsaW5lX251bWJlchgDIAEoBUINCgtfaXNf", - "c3RkX2VyciI4Ch9XYXRjaFJlc291cmNlQ29uc29sZUxvZ3NSZXF1ZXN0EhUK", - "DXJlc291cmNlX25hbWUYASABKAkiTgoeV2F0Y2hSZXNvdXJjZUNvbnNvbGVM", - "b2dzVXBkYXRlEiwKCWxvZ19saW5lcxgBIAMoCzIZLmFzcGlyZS52MS5Db25z", - "b2xlTG9nTGluZSpWChtSZXNvdXJjZUNvbW1hbmRSZXNwb25zZUtpbmQSDQoJ", - "VU5ERUZJTkVEEAASDQoJU1VDQ0VFREVEEAESCgoGRkFJTEVEEAISDQoJQ0FO", - "Q0VMTEVEEAMysQMKEERhc2hib2FyZFNlcnZpY2UScAoZR2V0QXBwbGljYXRp", - "b25JbmZvcm1hdGlvbhIoLmFzcGlyZS52MS5BcHBsaWNhdGlvbkluZm9ybWF0", - "aW9uUmVxdWVzdBopLmFzcGlyZS52MS5BcHBsaWNhdGlvbkluZm9ybWF0aW9u", - "UmVzcG9uc2USVQoOV2F0Y2hSZXNvdXJjZXMSIC5hc3BpcmUudjEuV2F0Y2hS", - "ZXNvdXJjZXNSZXF1ZXN0Gh8uYXNwaXJlLnYxLldhdGNoUmVzb3VyY2VzVXBk", - "YXRlMAEScwoYV2F0Y2hSZXNvdXJjZUNvbnNvbGVMb2dzEiouYXNwaXJlLnYx", - "LldhdGNoUmVzb3VyY2VDb25zb2xlTG9nc1JlcXVlc3QaKS5hc3BpcmUudjEu", - "V2F0Y2hSZXNvdXJjZUNvbnNvbGVMb2dzVXBkYXRlMAESXwoWRXhlY3V0ZVJl", - "c291cmNlQ29tbWFuZBIhLmFzcGlyZS52MS5SZXNvdXJjZUNvbW1hbmRSZXF1", - "ZXN0GiIuYXNwaXJlLnYxLlJlc291cmNlQ29tbWFuZFJlc3BvbnNlYgZwcm90", - "bzM=")); + "RW52aXJvbm1lbnRWYXJpYWJsZRIsCghjb21tYW5kcxgLIAMoCzIaLmFzcGly", + "ZS52MS5SZXNvdXJjZUNvbW1hbmQSLwoKcHJvcGVydGllcxgMIAMoCzIbLmFz", + "cGlyZS52MS5SZXNvdXJjZVByb3BlcnR5EhwKBHVybHMYDSADKAsyDi5hc3Bp", + "cmUudjEuVXJsEhgKC3N0YXRlX3N0eWxlGA4gASgJSAKIAQFCCAoGX3N0YXRl", + "Qg0KC19jcmVhdGVkX2F0Qg4KDF9zdGF0ZV9zdHlsZUoECAgQCUoECAkQCkoE", + "CAoQCyJuChNJbml0aWFsUmVzb3VyY2VEYXRhEiYKCXJlc291cmNlcxgBIAMo", + "CzITLmFzcGlyZS52MS5SZXNvdXJjZRIvCg5yZXNvdXJjZV90eXBlcxgCIAMo", + "CzIXLmFzcGlyZS52MS5SZXNvdXJjZVR5cGUiQAoQUmVzb3VyY2VEZWxldGlv", + "bhIVCg1yZXNvdXJjZV9uYW1lGAEgASgJEhUKDXJlc291cmNlX3R5cGUYAiAB", + "KAkidAoUV2F0Y2hSZXNvdXJjZXNDaGFuZ2USLQoGZGVsZXRlGAEgASgLMhsu", + "YXNwaXJlLnYxLlJlc291cmNlRGVsZXRpb25IABIlCgZ1cHNlcnQYAiABKAsy", + "Ey5hc3BpcmUudjEuUmVzb3VyY2VIAEIGCgRraW5kIkcKFVdhdGNoUmVzb3Vy", + "Y2VzQ2hhbmdlcxIuCgV2YWx1ZRgBIAMoCzIfLmFzcGlyZS52MS5XYXRjaFJl", + "c291cmNlc0NoYW5nZSJDChVXYXRjaFJlc291cmNlc1JlcXVlc3QSGQoMaXNf", + "cmVjb25uZWN0GAEgASgISACIAQFCDwoNX2lzX3JlY29ubmVjdCKLAQoUV2F0", + "Y2hSZXNvdXJjZXNVcGRhdGUSNgoMaW5pdGlhbF9kYXRhGAEgASgLMh4uYXNw", + "aXJlLnYxLkluaXRpYWxSZXNvdXJjZURhdGFIABIzCgdjaGFuZ2VzGAIgASgL", + "MiAuYXNwaXJlLnYxLldhdGNoUmVzb3VyY2VzQ2hhbmdlc0gAQgYKBGtpbmQi", + "WwoOQ29uc29sZUxvZ0xpbmUSDAoEdGV4dBgBIAEoCRIXCgppc19zdGRfZXJy", + "GAIgASgISACIAQESEwoLbGluZV9udW1iZXIYAyABKAVCDQoLX2lzX3N0ZF9l", + "cnIiOAofV2F0Y2hSZXNvdXJjZUNvbnNvbGVMb2dzUmVxdWVzdBIVCg1yZXNv", + "dXJjZV9uYW1lGAEgASgJIk4KHldhdGNoUmVzb3VyY2VDb25zb2xlTG9nc1Vw", + "ZGF0ZRIsCglsb2dfbGluZXMYASADKAsyGS5hc3BpcmUudjEuQ29uc29sZUxv", + "Z0xpbmUqVgobUmVzb3VyY2VDb21tYW5kUmVzcG9uc2VLaW5kEg0KCVVOREVG", + "SU5FRBAAEg0KCVNVQ0NFRURFRBABEgoKBkZBSUxFRBACEg0KCUNBTkNFTExF", + "RBADMrEDChBEYXNoYm9hcmRTZXJ2aWNlEnAKGUdldEFwcGxpY2F0aW9uSW5m", + "b3JtYXRpb24SKC5hc3BpcmUudjEuQXBwbGljYXRpb25JbmZvcm1hdGlvblJl", + "cXVlc3QaKS5hc3BpcmUudjEuQXBwbGljYXRpb25JbmZvcm1hdGlvblJlc3Bv", + "bnNlElUKDldhdGNoUmVzb3VyY2VzEiAuYXNwaXJlLnYxLldhdGNoUmVzb3Vy", + "Y2VzUmVxdWVzdBofLmFzcGlyZS52MS5XYXRjaFJlc291cmNlc1VwZGF0ZTAB", + "EnMKGFdhdGNoUmVzb3VyY2VDb25zb2xlTG9ncxIqLmFzcGlyZS52MS5XYXRj", + "aFJlc291cmNlQ29uc29sZUxvZ3NSZXF1ZXN0GikuYXNwaXJlLnYxLldhdGNo", + "UmVzb3VyY2VDb25zb2xlTG9nc1VwZGF0ZTABEl8KFkV4ZWN1dGVSZXNvdXJj", + "ZUNvbW1hbmQSIS5hc3BpcmUudjEuUmVzb3VyY2VDb21tYW5kUmVxdWVzdBoi", + "LmFzcGlyZS52MS5SZXNvdXJjZUNvbW1hbmRSZXNwb25zZUIiqgIfQXNwaXJl", + "LlJlc291cmNlU2VydmljZS5Qcm90by5WMWIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.StructReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Aspire.V1.ResourceCommandResponseKind), }, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.ApplicationInformationRequest), global::Aspire.V1.ApplicationInformationRequest.Parser, null, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.ApplicationInformationResponse), global::Aspire.V1.ApplicationInformationResponse.Parser, new[]{ "ApplicationName" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.ResourceCommand), global::Aspire.V1.ResourceCommand.Parser, new[]{ "CommandType", "DisplayName", "ConfirmationMessage", "Parameter" }, new[]{ "ConfirmationMessage", "Parameter" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.ResourceCommandRequest), global::Aspire.V1.ResourceCommandRequest.Parser, new[]{ "CommandType", "ResourceName", "ResourceType", "Parameter" }, new[]{ "Parameter" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.ResourceCommandResponse), global::Aspire.V1.ResourceCommandResponse.Parser, new[]{ "Kind", "ErrorMessage" }, new[]{ "ErrorMessage" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.ResourceType), global::Aspire.V1.ResourceType.Parser, new[]{ "UniqueName", "DisplayName", "Commands" }, new[]{ "DisplayName" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.EnvironmentVariable), global::Aspire.V1.EnvironmentVariable.Parser, new[]{ "Name", "Value", "IsFromSpec" }, new[]{ "Value" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.Endpoint), global::Aspire.V1.Endpoint.Parser, new[]{ "EndpointUrl", "ProxyUrl" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.Service), global::Aspire.V1.Service.Parser, new[]{ "Name", "AllocatedAddress", "AllocatedPort" }, new[]{ "AllocatedAddress", "AllocatedPort" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.Url), global::Aspire.V1.Url.Parser, new[]{ "Name", "FullUrl", "IsInternal" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.ResourceProperty), global::Aspire.V1.ResourceProperty.Parser, new[]{ "Name", "DisplayName", "Value" }, new[]{ "DisplayName" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.Resource), global::Aspire.V1.Resource.Parser, new[]{ "Name", "ResourceType", "DisplayName", "Uid", "State", "CreatedAt", "Environment", "ExpectedEndpointsCount", "Endpoints", "Services", "Commands", "Properties", "Urls", "StateStyle" }, new[]{ "State", "CreatedAt", "ExpectedEndpointsCount", "StateStyle" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.InitialResourceData), global::Aspire.V1.InitialResourceData.Parser, new[]{ "Resources", "ResourceTypes" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.ResourceDeletion), global::Aspire.V1.ResourceDeletion.Parser, new[]{ "ResourceName", "ResourceType" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.WatchResourcesChange), global::Aspire.V1.WatchResourcesChange.Parser, new[]{ "Delete", "Upsert" }, new[]{ "Kind" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.WatchResourcesChanges), global::Aspire.V1.WatchResourcesChanges.Parser, new[]{ "Value" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.WatchResourcesRequest), global::Aspire.V1.WatchResourcesRequest.Parser, new[]{ "IsReconnect" }, new[]{ "IsReconnect" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.WatchResourcesUpdate), global::Aspire.V1.WatchResourcesUpdate.Parser, new[]{ "InitialData", "Changes" }, new[]{ "Kind" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.ConsoleLogLine), global::Aspire.V1.ConsoleLogLine.Parser, new[]{ "Text", "IsStdErr", "LineNumber" }, new[]{ "IsStdErr" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.WatchResourceConsoleLogsRequest), global::Aspire.V1.WatchResourceConsoleLogsRequest.Parser, new[]{ "ResourceName" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.V1.WatchResourceConsoleLogsUpdate), global::Aspire.V1.WatchResourceConsoleLogsUpdate.Parser, new[]{ "LogLines" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Aspire.ResourceService.Proto.V1.ResourceCommandResponseKind), }, null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.ApplicationInformationRequest), global::Aspire.ResourceService.Proto.V1.ApplicationInformationRequest.Parser, null, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.ApplicationInformationResponse), global::Aspire.ResourceService.Proto.V1.ApplicationInformationResponse.Parser, new[]{ "ApplicationName" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.ResourceCommand), global::Aspire.ResourceService.Proto.V1.ResourceCommand.Parser, new[]{ "CommandType", "DisplayName", "ConfirmationMessage", "Parameter" }, new[]{ "ConfirmationMessage", "Parameter" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.ResourceCommandRequest), global::Aspire.ResourceService.Proto.V1.ResourceCommandRequest.Parser, new[]{ "CommandType", "ResourceName", "ResourceType", "Parameter" }, new[]{ "Parameter" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.ResourceCommandResponse), global::Aspire.ResourceService.Proto.V1.ResourceCommandResponse.Parser, new[]{ "Kind", "ErrorMessage" }, new[]{ "ErrorMessage" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.ResourceType), global::Aspire.ResourceService.Proto.V1.ResourceType.Parser, new[]{ "UniqueName", "DisplayName", "Commands" }, new[]{ "DisplayName" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.EnvironmentVariable), global::Aspire.ResourceService.Proto.V1.EnvironmentVariable.Parser, new[]{ "Name", "Value", "IsFromSpec" }, new[]{ "Value" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.Url), global::Aspire.ResourceService.Proto.V1.Url.Parser, new[]{ "Name", "FullUrl", "IsInternal" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.ResourceProperty), global::Aspire.ResourceService.Proto.V1.ResourceProperty.Parser, new[]{ "Name", "DisplayName", "Value" }, new[]{ "DisplayName" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.Resource), global::Aspire.ResourceService.Proto.V1.Resource.Parser, new[]{ "Name", "ResourceType", "DisplayName", "Uid", "State", "CreatedAt", "Environment", "Commands", "Properties", "Urls", "StateStyle" }, new[]{ "State", "CreatedAt", "StateStyle" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.InitialResourceData), global::Aspire.ResourceService.Proto.V1.InitialResourceData.Parser, new[]{ "Resources", "ResourceTypes" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.ResourceDeletion), global::Aspire.ResourceService.Proto.V1.ResourceDeletion.Parser, new[]{ "ResourceName", "ResourceType" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.WatchResourcesChange), global::Aspire.ResourceService.Proto.V1.WatchResourcesChange.Parser, new[]{ "Delete", "Upsert" }, new[]{ "Kind" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.WatchResourcesChanges), global::Aspire.ResourceService.Proto.V1.WatchResourcesChanges.Parser, new[]{ "Value" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.WatchResourcesRequest), global::Aspire.ResourceService.Proto.V1.WatchResourcesRequest.Parser, new[]{ "IsReconnect" }, new[]{ "IsReconnect" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.WatchResourcesUpdate), global::Aspire.ResourceService.Proto.V1.WatchResourcesUpdate.Parser, new[]{ "InitialData", "Changes" }, new[]{ "Kind" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.ConsoleLogLine), global::Aspire.ResourceService.Proto.V1.ConsoleLogLine.Parser, new[]{ "Text", "IsStdErr", "LineNumber" }, new[]{ "IsStdErr" }, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.WatchResourceConsoleLogsRequest), global::Aspire.ResourceService.Proto.V1.WatchResourceConsoleLogsRequest.Parser, new[]{ "ResourceName" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Aspire.ResourceService.Proto.V1.WatchResourceConsoleLogsUpdate), global::Aspire.ResourceService.Proto.V1.WatchResourceConsoleLogsUpdate.Parser, new[]{ "LogLines" }, null, null, null, null) })); } #endregion @@ -150,7 +141,7 @@ public sealed partial class ApplicationInformationRequest : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Aspire.V1.ResourceServiceReflection.Descriptor.MessageTypes[2]; } + get { return global::Aspire.ResourceService.Proto.V1.ResourceServiceReflection.Descriptor.MessageTypes[2]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -827,7 +818,7 @@ public void MergeFrom(pb::CodedInputStream input) { /// /// Represents a request to execute a command. /// Sent by the dashboard to DashboardService.ExecuteResourceCommand. - /// Constructed with data from a corresponding + /// Constructed with data from a corresponding ResourceCommand. /// [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class ResourceCommandRequest : pb::IMessage @@ -844,7 +835,7 @@ public sealed partial class ResourceCommandRequest : pb::IMessageField number for the "kind" field. public const int KindFieldNumber = 1; - private global::Aspire.V1.ResourceCommandResponseKind kind_ = global::Aspire.V1.ResourceCommandResponseKind.Undefined; + private global::Aspire.ResourceService.Proto.V1.ResourceCommandResponseKind kind_ = global::Aspire.ResourceService.Proto.V1.ResourceCommandResponseKind.Undefined; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::Aspire.V1.ResourceCommandResponseKind Kind { + public global::Aspire.ResourceService.Proto.V1.ResourceCommandResponseKind Kind { get { return kind_; } set { kind_ = value; @@ -1263,7 +1254,7 @@ public bool Equals(ResourceCommandResponse other) { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - if (Kind != global::Aspire.V1.ResourceCommandResponseKind.Undefined) hash ^= Kind.GetHashCode(); + if (Kind != global::Aspire.ResourceService.Proto.V1.ResourceCommandResponseKind.Undefined) hash ^= Kind.GetHashCode(); if (HasErrorMessage) hash ^= ErrorMessage.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -1283,7 +1274,7 @@ public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (Kind != global::Aspire.V1.ResourceCommandResponseKind.Undefined) { + if (Kind != global::Aspire.ResourceService.Proto.V1.ResourceCommandResponseKind.Undefined) { output.WriteRawTag(8); output.WriteEnum((int) Kind); } @@ -1301,7 +1292,7 @@ public void WriteTo(pb::CodedOutputStream output) { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (Kind != global::Aspire.V1.ResourceCommandResponseKind.Undefined) { + if (Kind != global::Aspire.ResourceService.Proto.V1.ResourceCommandResponseKind.Undefined) { output.WriteRawTag(8); output.WriteEnum((int) Kind); } @@ -1319,7 +1310,7 @@ public void WriteTo(pb::CodedOutputStream output) { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - if (Kind != global::Aspire.V1.ResourceCommandResponseKind.Undefined) { + if (Kind != global::Aspire.ResourceService.Proto.V1.ResourceCommandResponseKind.Undefined) { size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Kind); } if (HasErrorMessage) { @@ -1337,7 +1328,7 @@ public void MergeFrom(ResourceCommandResponse other) { if (other == null) { return; } - if (other.Kind != global::Aspire.V1.ResourceCommandResponseKind.Undefined) { + if (other.Kind != global::Aspire.ResourceService.Proto.V1.ResourceCommandResponseKind.Undefined) { Kind = other.Kind; } if (other.HasErrorMessage) { @@ -1359,7 +1350,7 @@ public void MergeFrom(pb::CodedInputStream input) { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - Kind = (global::Aspire.V1.ResourceCommandResponseKind) input.ReadEnum(); + Kind = (global::Aspire.ResourceService.Proto.V1.ResourceCommandResponseKind) input.ReadEnum(); break; } case 18: { @@ -1382,7 +1373,7 @@ public void MergeFrom(pb::CodedInputStream input) { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - Kind = (global::Aspire.V1.ResourceCommandResponseKind) input.ReadEnum(); + Kind = (global::Aspire.ResourceService.Proto.V1.ResourceCommandResponseKind) input.ReadEnum(); break; } case 18: { @@ -1411,7 +1402,7 @@ public sealed partial class ResourceType : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Aspire.V1.ResourceServiceReflection.Descriptor.MessageTypes[5]; } + get { return global::Aspire.ResourceService.Proto.V1.ResourceServiceReflection.Descriptor.MessageTypes[5]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1491,9 +1482,9 @@ public void ClearDisplayName() { /// Field number for the "commands" field. public const int CommandsFieldNumber = 3; - private static readonly pb::FieldCodec _repeated_commands_codec - = pb::FieldCodec.ForMessage(26, global::Aspire.V1.ResourceCommand.Parser); - private readonly pbc::RepeatedField commands_ = new pbc::RepeatedField(); + private static readonly pb::FieldCodec _repeated_commands_codec + = pb::FieldCodec.ForMessage(26, global::Aspire.ResourceService.Proto.V1.ResourceCommand.Parser); + private readonly pbc::RepeatedField commands_ = new pbc::RepeatedField(); /// /// Any commands that may be executed against resources of this type, avoiding /// the need to copy the value to every Resource instance. @@ -1505,7 +1496,7 @@ public void ClearDisplayName() { /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField Commands { + public pbc::RepeatedField Commands { get { return commands_; } } @@ -1695,7 +1686,7 @@ public sealed partial class EnvironmentVariable : pb::IMessage - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - , pb::IBufferMessage - #endif - { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Endpoint()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pbr::MessageDescriptor Descriptor { - get { return global::Aspire.V1.ResourceServiceReflection.Descriptor.MessageTypes[7]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public Endpoint() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public Endpoint(Endpoint other) : this() { - endpointUrl_ = other.endpointUrl_; - proxyUrl_ = other.proxyUrl_; - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public Endpoint Clone() { - return new Endpoint(this); - } - - /// Field number for the "endpoint_url" field. - public const int EndpointUrlFieldNumber = 1; - private string endpointUrl_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public string EndpointUrl { - get { return endpointUrl_; } - set { - endpointUrl_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "proxy_url" field. - public const int ProxyUrlFieldNumber = 2; - private string proxyUrl_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public string ProxyUrl { - get { return proxyUrl_; } - set { - proxyUrl_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override bool Equals(object other) { - return Equals(other as Endpoint); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Equals(Endpoint other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (EndpointUrl != other.EndpointUrl) return false; - if (ProxyUrl != other.ProxyUrl) return false; - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override int GetHashCode() { - int hash = 1; - if (EndpointUrl.Length != 0) hash ^= EndpointUrl.GetHashCode(); - if (ProxyUrl.Length != 0) hash ^= ProxyUrl.GetHashCode(); - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void WriteTo(pb::CodedOutputStream output) { - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - output.WriteRawMessage(this); - #else - if (EndpointUrl.Length != 0) { - output.WriteRawTag(10); - output.WriteString(EndpointUrl); - } - if (ProxyUrl.Length != 0) { - output.WriteRawTag(18); - output.WriteString(ProxyUrl); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - #endif - } - - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (EndpointUrl.Length != 0) { - output.WriteRawTag(10); - output.WriteString(EndpointUrl); - } - if (ProxyUrl.Length != 0) { - output.WriteRawTag(18); - output.WriteString(ProxyUrl); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(ref output); - } - } - #endif - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public int CalculateSize() { - int size = 0; - if (EndpointUrl.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(EndpointUrl); - } - if (ProxyUrl.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(ProxyUrl); - } - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(Endpoint other) { - if (other == null) { - return; - } - if (other.EndpointUrl.Length != 0) { - EndpointUrl = other.EndpointUrl; - } - if (other.ProxyUrl.Length != 0) { - ProxyUrl = other.ProxyUrl; - } - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(pb::CodedInputStream input) { - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - input.ReadRawMessage(this); - #else - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - case 10: { - EndpointUrl = input.ReadString(); - break; - } - case 18: { - ProxyUrl = input.ReadString(); - break; - } - } - } - #endif - } - - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); - break; - case 10: { - EndpointUrl = input.ReadString(); - break; - } - case 18: { - ProxyUrl = input.ReadString(); - break; - } - } - } - } - #endif - - } - - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] - public sealed partial class Service : pb::IMessage - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - , pb::IBufferMessage - #endif - { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Service()); - private pb::UnknownFieldSet _unknownFields; - private int _hasBits0; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pbr::MessageDescriptor Descriptor { - get { return global::Aspire.V1.ResourceServiceReflection.Descriptor.MessageTypes[8]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public Service() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public Service(Service other) : this() { - _hasBits0 = other._hasBits0; - name_ = other.name_; - allocatedAddress_ = other.allocatedAddress_; - allocatedPort_ = other.allocatedPort_; - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public Service Clone() { - return new Service(this); - } - - /// Field number for the "name" field. - public const int NameFieldNumber = 1; - private string name_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public string Name { - get { return name_; } - set { - name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "allocated_address" field. - public const int AllocatedAddressFieldNumber = 2; - private readonly static string AllocatedAddressDefaultValue = ""; - - private string allocatedAddress_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public string AllocatedAddress { - get { return allocatedAddress_ ?? AllocatedAddressDefaultValue; } - set { - allocatedAddress_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - /// Gets whether the "allocated_address" field is set - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool HasAllocatedAddress { - get { return allocatedAddress_ != null; } - } - /// Clears the value of the "allocated_address" field - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void ClearAllocatedAddress() { - allocatedAddress_ = null; - } - - /// Field number for the "allocated_port" field. - public const int AllocatedPortFieldNumber = 3; - private readonly static int AllocatedPortDefaultValue = 0; - - private int allocatedPort_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public int AllocatedPort { - get { if ((_hasBits0 & 1) != 0) { return allocatedPort_; } else { return AllocatedPortDefaultValue; } } - set { - _hasBits0 |= 1; - allocatedPort_ = value; - } - } - /// Gets whether the "allocated_port" field is set - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool HasAllocatedPort { - get { return (_hasBits0 & 1) != 0; } - } - /// Clears the value of the "allocated_port" field - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void ClearAllocatedPort() { - _hasBits0 &= ~1; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override bool Equals(object other) { - return Equals(other as Service); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Equals(Service other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (Name != other.Name) return false; - if (AllocatedAddress != other.AllocatedAddress) return false; - if (AllocatedPort != other.AllocatedPort) return false; - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override int GetHashCode() { - int hash = 1; - if (Name.Length != 0) hash ^= Name.GetHashCode(); - if (HasAllocatedAddress) hash ^= AllocatedAddress.GetHashCode(); - if (HasAllocatedPort) hash ^= AllocatedPort.GetHashCode(); - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void WriteTo(pb::CodedOutputStream output) { - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - output.WriteRawMessage(this); - #else - if (Name.Length != 0) { - output.WriteRawTag(10); - output.WriteString(Name); - } - if (HasAllocatedAddress) { - output.WriteRawTag(18); - output.WriteString(AllocatedAddress); - } - if (HasAllocatedPort) { - output.WriteRawTag(24); - output.WriteInt32(AllocatedPort); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - #endif - } - - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (Name.Length != 0) { - output.WriteRawTag(10); - output.WriteString(Name); - } - if (HasAllocatedAddress) { - output.WriteRawTag(18); - output.WriteString(AllocatedAddress); - } - if (HasAllocatedPort) { - output.WriteRawTag(24); - output.WriteInt32(AllocatedPort); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(ref output); - } - } - #endif - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public int CalculateSize() { - int size = 0; - if (Name.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(Name); - } - if (HasAllocatedAddress) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(AllocatedAddress); - } - if (HasAllocatedPort) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(AllocatedPort); - } - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(Service other) { - if (other == null) { - return; - } - if (other.Name.Length != 0) { - Name = other.Name; - } - if (other.HasAllocatedAddress) { - AllocatedAddress = other.AllocatedAddress; - } - if (other.HasAllocatedPort) { - AllocatedPort = other.AllocatedPort; - } - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(pb::CodedInputStream input) { - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - input.ReadRawMessage(this); - #else - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - case 10: { - Name = input.ReadString(); - break; - } - case 18: { - AllocatedAddress = input.ReadString(); - break; - } - case 24: { - AllocatedPort = input.ReadInt32(); - break; - } - } - } - #endif - } - - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); - break; - case 10: { - Name = input.ReadString(); - break; - } - case 18: { - AllocatedAddress = input.ReadString(); - break; - } - case 24: { - AllocatedPort = input.ReadInt32(); - break; - } - } - } - } - #endif - - } - [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class Url : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -2495,7 +1964,7 @@ public sealed partial class Url : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Aspire.V1.ResourceServiceReflection.Descriptor.MessageTypes[9]; } + get { return global::Aspire.ResourceService.Proto.V1.ResourceServiceReflection.Descriptor.MessageTypes[7]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -2769,7 +2238,7 @@ public sealed partial class ResourceProperty : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Aspire.V1.ResourceServiceReflection.Descriptor.MessageTypes[10]; } + get { return global::Aspire.ResourceService.Proto.V1.ResourceServiceReflection.Descriptor.MessageTypes[8]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -3062,7 +2531,6 @@ public sealed partial class Resource : pb::IMessage { private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Resource()); private pb::UnknownFieldSet _unknownFields; - private int _hasBits0; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } @@ -3070,7 +2538,7 @@ public sealed partial class Resource : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Aspire.V1.ResourceServiceReflection.Descriptor.MessageTypes[11]; } + get { return global::Aspire.ResourceService.Proto.V1.ResourceServiceReflection.Descriptor.MessageTypes[9]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -3090,7 +2558,6 @@ public Resource() { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public Resource(Resource other) : this() { - _hasBits0 = other._hasBits0; name_ = other.name_; resourceType_ = other.resourceType_; displayName_ = other.displayName_; @@ -3098,9 +2565,6 @@ public Resource(Resource other) : this() { state_ = other.state_; createdAt_ = other.createdAt_ != null ? other.createdAt_.Clone() : null; environment_ = other.environment_.Clone(); - expectedEndpointsCount_ = other.expectedEndpointsCount_; - endpoints_ = other.endpoints_.Clone(); - services_ = other.services_.Clone(); commands_ = other.commands_.Clone(); properties_ = other.properties_.Clone(); urls_ = other.urls_.Clone(); @@ -3202,88 +2666,31 @@ public void ClearState() { /// Field number for the "environment" field. public const int EnvironmentFieldNumber = 7; - private static readonly pb::FieldCodec _repeated_environment_codec - = pb::FieldCodec.ForMessage(58, global::Aspire.V1.EnvironmentVariable.Parser); - private readonly pbc::RepeatedField environment_ = new pbc::RepeatedField(); + private static readonly pb::FieldCodec _repeated_environment_codec + = pb::FieldCodec.ForMessage(58, global::Aspire.ResourceService.Proto.V1.EnvironmentVariable.Parser); + private readonly pbc::RepeatedField environment_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField Environment { + public pbc::RepeatedField Environment { get { return environment_; } } - /// Field number for the "expected_endpoints_count" field. - public const int ExpectedEndpointsCountFieldNumber = 8; - private readonly static int ExpectedEndpointsCountDefaultValue = 0; - - private int expectedEndpointsCount_; - /// - /// Deprecated and replaced with urls - /// - [global::System.ObsoleteAttribute] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public int ExpectedEndpointsCount { - get { if ((_hasBits0 & 1) != 0) { return expectedEndpointsCount_; } else { return ExpectedEndpointsCountDefaultValue; } } - set { - _hasBits0 |= 1; - expectedEndpointsCount_ = value; - } - } - /// Gets whether the "expected_endpoints_count" field is set - [global::System.ObsoleteAttribute] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool HasExpectedEndpointsCount { - get { return (_hasBits0 & 1) != 0; } - } - /// Clears the value of the "expected_endpoints_count" field - [global::System.ObsoleteAttribute] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void ClearExpectedEndpointsCount() { - _hasBits0 &= ~1; - } - - /// Field number for the "endpoints" field. - public const int EndpointsFieldNumber = 9; - private static readonly pb::FieldCodec _repeated_endpoints_codec - = pb::FieldCodec.ForMessage(74, global::Aspire.V1.Endpoint.Parser); - private readonly pbc::RepeatedField endpoints_ = new pbc::RepeatedField(); - [global::System.ObsoleteAttribute] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField Endpoints { - get { return endpoints_; } - } - - /// Field number for the "services" field. - public const int ServicesFieldNumber = 10; - private static readonly pb::FieldCodec _repeated_services_codec - = pb::FieldCodec.ForMessage(82, global::Aspire.V1.Service.Parser); - private readonly pbc::RepeatedField services_ = new pbc::RepeatedField(); - [global::System.ObsoleteAttribute] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField Services { - get { return services_; } - } - /// Field number for the "commands" field. public const int CommandsFieldNumber = 11; - private static readonly pb::FieldCodec _repeated_commands_codec - = pb::FieldCodec.ForMessage(90, global::Aspire.V1.ResourceCommand.Parser); - private readonly pbc::RepeatedField commands_ = new pbc::RepeatedField(); + private static readonly pb::FieldCodec _repeated_commands_codec + = pb::FieldCodec.ForMessage(90, global::Aspire.ResourceService.Proto.V1.ResourceCommand.Parser); + private readonly pbc::RepeatedField commands_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField Commands { + public pbc::RepeatedField Commands { get { return commands_; } } /// Field number for the "properties" field. public const int PropertiesFieldNumber = 12; - private static readonly pb::FieldCodec _repeated_properties_codec - = pb::FieldCodec.ForMessage(98, global::Aspire.V1.ResourceProperty.Parser); - private readonly pbc::RepeatedField properties_ = new pbc::RepeatedField(); + private static readonly pb::FieldCodec _repeated_properties_codec + = pb::FieldCodec.ForMessage(98, global::Aspire.ResourceService.Proto.V1.ResourceProperty.Parser); + private readonly pbc::RepeatedField properties_ = new pbc::RepeatedField(); /// /// Properties holding data not modeled directly on the message. /// @@ -3294,21 +2701,21 @@ public void ClearExpectedEndpointsCount() { /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField Properties { + public pbc::RepeatedField Properties { get { return properties_; } } /// Field number for the "urls" field. public const int UrlsFieldNumber = 13; - private static readonly pb::FieldCodec _repeated_urls_codec - = pb::FieldCodec.ForMessage(106, global::Aspire.V1.Url.Parser); - private readonly pbc::RepeatedField urls_ = new pbc::RepeatedField(); + private static readonly pb::FieldCodec _repeated_urls_codec + = pb::FieldCodec.ForMessage(106, global::Aspire.ResourceService.Proto.V1.Url.Parser); + private readonly pbc::RepeatedField urls_ = new pbc::RepeatedField(); /// /// The list of urls that this resource exposes /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField Urls { + public pbc::RepeatedField Urls { get { return urls_; } } @@ -3365,9 +2772,6 @@ public bool Equals(Resource other) { if (State != other.State) return false; if (!object.Equals(CreatedAt, other.CreatedAt)) return false; if(!environment_.Equals(other.environment_)) return false; - if (ExpectedEndpointsCount != other.ExpectedEndpointsCount) return false; - if(!endpoints_.Equals(other.endpoints_)) return false; - if(!services_.Equals(other.services_)) return false; if(!commands_.Equals(other.commands_)) return false; if(!properties_.Equals(other.properties_)) return false; if(!urls_.Equals(other.urls_)) return false; @@ -3386,9 +2790,6 @@ public override int GetHashCode() { if (HasState) hash ^= State.GetHashCode(); if (createdAt_ != null) hash ^= CreatedAt.GetHashCode(); hash ^= environment_.GetHashCode(); - if (HasExpectedEndpointsCount) hash ^= ExpectedEndpointsCount.GetHashCode(); - hash ^= endpoints_.GetHashCode(); - hash ^= services_.GetHashCode(); hash ^= commands_.GetHashCode(); hash ^= properties_.GetHashCode(); hash ^= urls_.GetHashCode(); @@ -3436,12 +2837,6 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteMessage(CreatedAt); } environment_.WriteTo(output, _repeated_environment_codec); - if (HasExpectedEndpointsCount) { - output.WriteRawTag(64); - output.WriteInt32(ExpectedEndpointsCount); - } - endpoints_.WriteTo(output, _repeated_endpoints_codec); - services_.WriteTo(output, _repeated_services_codec); commands_.WriteTo(output, _repeated_commands_codec); properties_.WriteTo(output, _repeated_properties_codec); urls_.WriteTo(output, _repeated_urls_codec); @@ -3484,12 +2879,6 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteMessage(CreatedAt); } environment_.WriteTo(ref output, _repeated_environment_codec); - if (HasExpectedEndpointsCount) { - output.WriteRawTag(64); - output.WriteInt32(ExpectedEndpointsCount); - } - endpoints_.WriteTo(ref output, _repeated_endpoints_codec); - services_.WriteTo(ref output, _repeated_services_codec); commands_.WriteTo(ref output, _repeated_commands_codec); properties_.WriteTo(ref output, _repeated_properties_codec); urls_.WriteTo(ref output, _repeated_urls_codec); @@ -3526,11 +2915,6 @@ public int CalculateSize() { size += 1 + pb::CodedOutputStream.ComputeMessageSize(CreatedAt); } size += environment_.CalculateSize(_repeated_environment_codec); - if (HasExpectedEndpointsCount) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(ExpectedEndpointsCount); - } - size += endpoints_.CalculateSize(_repeated_endpoints_codec); - size += services_.CalculateSize(_repeated_services_codec); size += commands_.CalculateSize(_repeated_commands_codec); size += properties_.CalculateSize(_repeated_properties_codec); size += urls_.CalculateSize(_repeated_urls_codec); @@ -3571,11 +2955,6 @@ public void MergeFrom(Resource other) { CreatedAt.MergeFrom(other.CreatedAt); } environment_.Add(other.environment_); - if (other.HasExpectedEndpointsCount) { - ExpectedEndpointsCount = other.ExpectedEndpointsCount; - } - endpoints_.Add(other.endpoints_); - services_.Add(other.services_); commands_.Add(other.commands_); properties_.Add(other.properties_); urls_.Add(other.urls_); @@ -3628,18 +3007,6 @@ public void MergeFrom(pb::CodedInputStream input) { environment_.AddEntriesFrom(input, _repeated_environment_codec); break; } - case 64: { - ExpectedEndpointsCount = input.ReadInt32(); - break; - } - case 74: { - endpoints_.AddEntriesFrom(input, _repeated_endpoints_codec); - break; - } - case 82: { - services_.AddEntriesFrom(input, _repeated_services_codec); - break; - } case 90: { commands_.AddEntriesFrom(input, _repeated_commands_codec); break; @@ -3702,18 +3069,6 @@ public void MergeFrom(pb::CodedInputStream input) { environment_.AddEntriesFrom(ref input, _repeated_environment_codec); break; } - case 64: { - ExpectedEndpointsCount = input.ReadInt32(); - break; - } - case 74: { - endpoints_.AddEntriesFrom(ref input, _repeated_endpoints_codec); - break; - } - case 82: { - services_.AddEntriesFrom(ref input, _repeated_services_codec); - break; - } case 90: { commands_.AddEntriesFrom(ref input, _repeated_commands_codec); break; @@ -3755,7 +3110,7 @@ public sealed partial class InitialResourceData : pb::IMessageField number for the "resources" field. public const int ResourcesFieldNumber = 1; - private static readonly pb::FieldCodec _repeated_resources_codec - = pb::FieldCodec.ForMessage(10, global::Aspire.V1.Resource.Parser); - private readonly pbc::RepeatedField resources_ = new pbc::RepeatedField(); + private static readonly pb::FieldCodec _repeated_resources_codec + = pb::FieldCodec.ForMessage(10, global::Aspire.ResourceService.Proto.V1.Resource.Parser); + private readonly pbc::RepeatedField resources_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField Resources { + public pbc::RepeatedField Resources { get { return resources_; } } /// Field number for the "resource_types" field. public const int ResourceTypesFieldNumber = 2; - private static readonly pb::FieldCodec _repeated_resourceTypes_codec - = pb::FieldCodec.ForMessage(18, global::Aspire.V1.ResourceType.Parser); - private readonly pbc::RepeatedField resourceTypes_ = new pbc::RepeatedField(); + private static readonly pb::FieldCodec _repeated_resourceTypes_codec + = pb::FieldCodec.ForMessage(18, global::Aspire.ResourceService.Proto.V1.ResourceType.Parser); + private readonly pbc::RepeatedField resourceTypes_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField ResourceTypes { + public pbc::RepeatedField ResourceTypes { get { return resourceTypes_; } } @@ -3960,7 +3315,7 @@ public sealed partial class ResourceDeletion : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Aspire.V1.ResourceServiceReflection.Descriptor.MessageTypes[13]; } + get { return global::Aspire.ResourceService.Proto.V1.ResourceServiceReflection.Descriptor.MessageTypes[11]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -4187,7 +3542,7 @@ public sealed partial class WatchResourcesChange : pb::IMessageField number for the "value" field. public const int ValueFieldNumber = 1; - private static readonly pb::FieldCodec _repeated_value_codec - = pb::FieldCodec.ForMessage(10, global::Aspire.V1.WatchResourcesChange.Parser); - private readonly pbc::RepeatedField value_ = new pbc::RepeatedField(); + private static readonly pb::FieldCodec _repeated_value_codec + = pb::FieldCodec.ForMessage(10, global::Aspire.ResourceService.Proto.V1.WatchResourcesChange.Parser); + private readonly pbc::RepeatedField value_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField Value { + public pbc::RepeatedField Value { get { return value_; } } @@ -4656,7 +4011,7 @@ public sealed partial class WatchResourcesRequest : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::Aspire.V1.InitialResourceData InitialData { - get { return kindCase_ == KindOneofCase.InitialData ? (global::Aspire.V1.InitialResourceData) kind_ : null; } + public global::Aspire.ResourceService.Proto.V1.InitialResourceData InitialData { + get { return kindCase_ == KindOneofCase.InitialData ? (global::Aspire.ResourceService.Proto.V1.InitialResourceData) kind_ : null; } set { kind_ = value; kindCase_ = value == null ? KindOneofCase.None : KindOneofCase.InitialData; @@ -4929,8 +4284,8 @@ public WatchResourcesUpdate Clone() { /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::Aspire.V1.WatchResourcesChanges Changes { - get { return kindCase_ == KindOneofCase.Changes ? (global::Aspire.V1.WatchResourcesChanges) kind_ : null; } + public global::Aspire.ResourceService.Proto.V1.WatchResourcesChanges Changes { + get { return kindCase_ == KindOneofCase.Changes ? (global::Aspire.ResourceService.Proto.V1.WatchResourcesChanges) kind_ : null; } set { kind_ = value; kindCase_ = value == null ? KindOneofCase.None : KindOneofCase.Changes; @@ -5061,13 +4416,13 @@ public void MergeFrom(WatchResourcesUpdate other) { switch (other.KindCase) { case KindOneofCase.InitialData: if (InitialData == null) { - InitialData = new global::Aspire.V1.InitialResourceData(); + InitialData = new global::Aspire.ResourceService.Proto.V1.InitialResourceData(); } InitialData.MergeFrom(other.InitialData); break; case KindOneofCase.Changes: if (Changes == null) { - Changes = new global::Aspire.V1.WatchResourcesChanges(); + Changes = new global::Aspire.ResourceService.Proto.V1.WatchResourcesChanges(); } Changes.MergeFrom(other.Changes); break; @@ -5089,7 +4444,7 @@ public void MergeFrom(pb::CodedInputStream input) { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 10: { - global::Aspire.V1.InitialResourceData subBuilder = new global::Aspire.V1.InitialResourceData(); + global::Aspire.ResourceService.Proto.V1.InitialResourceData subBuilder = new global::Aspire.ResourceService.Proto.V1.InitialResourceData(); if (kindCase_ == KindOneofCase.InitialData) { subBuilder.MergeFrom(InitialData); } @@ -5098,7 +4453,7 @@ public void MergeFrom(pb::CodedInputStream input) { break; } case 18: { - global::Aspire.V1.WatchResourcesChanges subBuilder = new global::Aspire.V1.WatchResourcesChanges(); + global::Aspire.ResourceService.Proto.V1.WatchResourcesChanges subBuilder = new global::Aspire.ResourceService.Proto.V1.WatchResourcesChanges(); if (kindCase_ == KindOneofCase.Changes) { subBuilder.MergeFrom(Changes); } @@ -5122,7 +4477,7 @@ public void MergeFrom(pb::CodedInputStream input) { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 10: { - global::Aspire.V1.InitialResourceData subBuilder = new global::Aspire.V1.InitialResourceData(); + global::Aspire.ResourceService.Proto.V1.InitialResourceData subBuilder = new global::Aspire.ResourceService.Proto.V1.InitialResourceData(); if (kindCase_ == KindOneofCase.InitialData) { subBuilder.MergeFrom(InitialData); } @@ -5131,7 +4486,7 @@ public void MergeFrom(pb::CodedInputStream input) { break; } case 18: { - global::Aspire.V1.WatchResourcesChanges subBuilder = new global::Aspire.V1.WatchResourcesChanges(); + global::Aspire.ResourceService.Proto.V1.WatchResourcesChanges subBuilder = new global::Aspire.ResourceService.Proto.V1.WatchResourcesChanges(); if (kindCase_ == KindOneofCase.Changes) { subBuilder.MergeFrom(Changes); } @@ -5162,7 +4517,7 @@ public sealed partial class ConsoleLogLine : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::Aspire.V1.ResourceServiceReflection.Descriptor.MessageTypes[18]; } + get { return global::Aspire.ResourceService.Proto.V1.ResourceServiceReflection.Descriptor.MessageTypes[16]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -5448,7 +4803,7 @@ public sealed partial class WatchResourceConsoleLogsRequest : pb::IMessageField number for the "log_lines" field. public const int LogLinesFieldNumber = 1; - private static readonly pb::FieldCodec _repeated_logLines_codec - = pb::FieldCodec.ForMessage(10, global::Aspire.V1.ConsoleLogLine.Parser); - private readonly pbc::RepeatedField logLines_ = new pbc::RepeatedField(); + private static readonly pb::FieldCodec _repeated_logLines_codec + = pb::FieldCodec.ForMessage(10, global::Aspire.ResourceService.Proto.V1.ConsoleLogLine.Parser); + private readonly pbc::RepeatedField logLines_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField LogLines { + public pbc::RepeatedField LogLines { get { return logLines_; } } diff --git a/src/dotnet/aspire-session-host/ResourceProto/ResourceProto/ResourceServiceGrpc.cs b/src/dotnet/aspire-session-host/ResourceProto/ResourceProto/ResourceServiceGrpc.cs index fd82e6d0..c207c7fb 100644 --- a/src/dotnet/aspire-session-host/ResourceProto/ResourceProto/ResourceServiceGrpc.cs +++ b/src/dotnet/aspire-session-host/ResourceProto/ResourceProto/ResourceServiceGrpc.cs @@ -11,7 +11,7 @@ using grpc = global::Grpc.Core; -namespace Aspire.V1 { +namespace Aspire.ResourceService.Proto.V1 { public static partial class DashboardService { static readonly string __ServiceName = "aspire.v1.DashboardService"; @@ -50,24 +50,24 @@ static T __Helper_DeserializeMessage(grpc::DeserializationContext context, gl } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - static readonly grpc::Marshaller __Marshaller_aspire_v1_ApplicationInformationRequest = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.V1.ApplicationInformationRequest.Parser)); + static readonly grpc::Marshaller __Marshaller_aspire_v1_ApplicationInformationRequest = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.ResourceService.Proto.V1.ApplicationInformationRequest.Parser)); [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - static readonly grpc::Marshaller __Marshaller_aspire_v1_ApplicationInformationResponse = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.V1.ApplicationInformationResponse.Parser)); + static readonly grpc::Marshaller __Marshaller_aspire_v1_ApplicationInformationResponse = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.ResourceService.Proto.V1.ApplicationInformationResponse.Parser)); [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - static readonly grpc::Marshaller __Marshaller_aspire_v1_WatchResourcesRequest = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.V1.WatchResourcesRequest.Parser)); + static readonly grpc::Marshaller __Marshaller_aspire_v1_WatchResourcesRequest = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.ResourceService.Proto.V1.WatchResourcesRequest.Parser)); [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - static readonly grpc::Marshaller __Marshaller_aspire_v1_WatchResourcesUpdate = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.V1.WatchResourcesUpdate.Parser)); + static readonly grpc::Marshaller __Marshaller_aspire_v1_WatchResourcesUpdate = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.ResourceService.Proto.V1.WatchResourcesUpdate.Parser)); [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - static readonly grpc::Marshaller __Marshaller_aspire_v1_WatchResourceConsoleLogsRequest = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.V1.WatchResourceConsoleLogsRequest.Parser)); + static readonly grpc::Marshaller __Marshaller_aspire_v1_WatchResourceConsoleLogsRequest = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.ResourceService.Proto.V1.WatchResourceConsoleLogsRequest.Parser)); [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - static readonly grpc::Marshaller __Marshaller_aspire_v1_WatchResourceConsoleLogsUpdate = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.V1.WatchResourceConsoleLogsUpdate.Parser)); + static readonly grpc::Marshaller __Marshaller_aspire_v1_WatchResourceConsoleLogsUpdate = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.ResourceService.Proto.V1.WatchResourceConsoleLogsUpdate.Parser)); [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - static readonly grpc::Marshaller __Marshaller_aspire_v1_ResourceCommandRequest = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.V1.ResourceCommandRequest.Parser)); + static readonly grpc::Marshaller __Marshaller_aspire_v1_ResourceCommandRequest = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.ResourceService.Proto.V1.ResourceCommandRequest.Parser)); [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - static readonly grpc::Marshaller __Marshaller_aspire_v1_ResourceCommandResponse = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.V1.ResourceCommandResponse.Parser)); + static readonly grpc::Marshaller __Marshaller_aspire_v1_ResourceCommandResponse = grpc::Marshallers.Create(__Helper_SerializeMessage, context => __Helper_DeserializeMessage(context, global::Aspire.ResourceService.Proto.V1.ResourceCommandResponse.Parser)); [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - static readonly grpc::Method __Method_GetApplicationInformation = new grpc::Method( + static readonly grpc::Method __Method_GetApplicationInformation = new grpc::Method( grpc::MethodType.Unary, __ServiceName, "GetApplicationInformation", @@ -75,7 +75,7 @@ static T __Helper_DeserializeMessage(grpc::DeserializationContext context, gl __Marshaller_aspire_v1_ApplicationInformationResponse); [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - static readonly grpc::Method __Method_WatchResources = new grpc::Method( + static readonly grpc::Method __Method_WatchResources = new grpc::Method( grpc::MethodType.ServerStreaming, __ServiceName, "WatchResources", @@ -83,7 +83,7 @@ static T __Helper_DeserializeMessage(grpc::DeserializationContext context, gl __Marshaller_aspire_v1_WatchResourcesUpdate); [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - static readonly grpc::Method __Method_WatchResourceConsoleLogs = new grpc::Method( + static readonly grpc::Method __Method_WatchResourceConsoleLogs = new grpc::Method( grpc::MethodType.ServerStreaming, __ServiceName, "WatchResourceConsoleLogs", @@ -91,7 +91,7 @@ static T __Helper_DeserializeMessage(grpc::DeserializationContext context, gl __Marshaller_aspire_v1_WatchResourceConsoleLogsUpdate); [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - static readonly grpc::Method __Method_ExecuteResourceCommand = new grpc::Method( + static readonly grpc::Method __Method_ExecuteResourceCommand = new grpc::Method( grpc::MethodType.Unary, __ServiceName, "ExecuteResourceCommand", @@ -101,7 +101,7 @@ static T __Helper_DeserializeMessage(grpc::DeserializationContext context, gl /// Service descriptor public static global::Google.Protobuf.Reflection.ServiceDescriptor Descriptor { - get { return global::Aspire.V1.ResourceServiceReflection.Descriptor.Services[0]; } + get { return global::Aspire.ResourceService.Proto.V1.ResourceServiceReflection.Descriptor.Services[0]; } } /// Base class for server-side implementations of DashboardService @@ -109,25 +109,25 @@ static T __Helper_DeserializeMessage(grpc::DeserializationContext context, gl public abstract partial class DashboardServiceBase { [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual global::System.Threading.Tasks.Task GetApplicationInformation(global::Aspire.V1.ApplicationInformationRequest request, grpc::ServerCallContext context) + public virtual global::System.Threading.Tasks.Task GetApplicationInformation(global::Aspire.ResourceService.Proto.V1.ApplicationInformationRequest request, grpc::ServerCallContext context) { throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, "")); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual global::System.Threading.Tasks.Task WatchResources(global::Aspire.V1.WatchResourcesRequest request, grpc::IServerStreamWriter responseStream, grpc::ServerCallContext context) + public virtual global::System.Threading.Tasks.Task WatchResources(global::Aspire.ResourceService.Proto.V1.WatchResourcesRequest request, grpc::IServerStreamWriter responseStream, grpc::ServerCallContext context) { throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, "")); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual global::System.Threading.Tasks.Task WatchResourceConsoleLogs(global::Aspire.V1.WatchResourceConsoleLogsRequest request, grpc::IServerStreamWriter responseStream, grpc::ServerCallContext context) + public virtual global::System.Threading.Tasks.Task WatchResourceConsoleLogs(global::Aspire.ResourceService.Proto.V1.WatchResourceConsoleLogsRequest request, grpc::IServerStreamWriter responseStream, grpc::ServerCallContext context) { throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, "")); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual global::System.Threading.Tasks.Task ExecuteResourceCommand(global::Aspire.V1.ResourceCommandRequest request, grpc::ServerCallContext context) + public virtual global::System.Threading.Tasks.Task ExecuteResourceCommand(global::Aspire.ResourceService.Proto.V1.ResourceCommandRequest request, grpc::ServerCallContext context) { throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, "")); } @@ -162,62 +162,62 @@ protected DashboardServiceClient(ClientBaseConfiguration configuration) : base(c } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual global::Aspire.V1.ApplicationInformationResponse GetApplicationInformation(global::Aspire.V1.ApplicationInformationRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) + public virtual global::Aspire.ResourceService.Proto.V1.ApplicationInformationResponse GetApplicationInformation(global::Aspire.ResourceService.Proto.V1.ApplicationInformationRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) { return GetApplicationInformation(request, new grpc::CallOptions(headers, deadline, cancellationToken)); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual global::Aspire.V1.ApplicationInformationResponse GetApplicationInformation(global::Aspire.V1.ApplicationInformationRequest request, grpc::CallOptions options) + public virtual global::Aspire.ResourceService.Proto.V1.ApplicationInformationResponse GetApplicationInformation(global::Aspire.ResourceService.Proto.V1.ApplicationInformationRequest request, grpc::CallOptions options) { return CallInvoker.BlockingUnaryCall(__Method_GetApplicationInformation, null, options, request); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual grpc::AsyncUnaryCall GetApplicationInformationAsync(global::Aspire.V1.ApplicationInformationRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) + public virtual grpc::AsyncUnaryCall GetApplicationInformationAsync(global::Aspire.ResourceService.Proto.V1.ApplicationInformationRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) { return GetApplicationInformationAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken)); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual grpc::AsyncUnaryCall GetApplicationInformationAsync(global::Aspire.V1.ApplicationInformationRequest request, grpc::CallOptions options) + public virtual grpc::AsyncUnaryCall GetApplicationInformationAsync(global::Aspire.ResourceService.Proto.V1.ApplicationInformationRequest request, grpc::CallOptions options) { return CallInvoker.AsyncUnaryCall(__Method_GetApplicationInformation, null, options, request); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual grpc::AsyncServerStreamingCall WatchResources(global::Aspire.V1.WatchResourcesRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) + public virtual grpc::AsyncServerStreamingCall WatchResources(global::Aspire.ResourceService.Proto.V1.WatchResourcesRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) { return WatchResources(request, new grpc::CallOptions(headers, deadline, cancellationToken)); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual grpc::AsyncServerStreamingCall WatchResources(global::Aspire.V1.WatchResourcesRequest request, grpc::CallOptions options) + public virtual grpc::AsyncServerStreamingCall WatchResources(global::Aspire.ResourceService.Proto.V1.WatchResourcesRequest request, grpc::CallOptions options) { return CallInvoker.AsyncServerStreamingCall(__Method_WatchResources, null, options, request); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual grpc::AsyncServerStreamingCall WatchResourceConsoleLogs(global::Aspire.V1.WatchResourceConsoleLogsRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) + public virtual grpc::AsyncServerStreamingCall WatchResourceConsoleLogs(global::Aspire.ResourceService.Proto.V1.WatchResourceConsoleLogsRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) { return WatchResourceConsoleLogs(request, new grpc::CallOptions(headers, deadline, cancellationToken)); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual grpc::AsyncServerStreamingCall WatchResourceConsoleLogs(global::Aspire.V1.WatchResourceConsoleLogsRequest request, grpc::CallOptions options) + public virtual grpc::AsyncServerStreamingCall WatchResourceConsoleLogs(global::Aspire.ResourceService.Proto.V1.WatchResourceConsoleLogsRequest request, grpc::CallOptions options) { return CallInvoker.AsyncServerStreamingCall(__Method_WatchResourceConsoleLogs, null, options, request); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual global::Aspire.V1.ResourceCommandResponse ExecuteResourceCommand(global::Aspire.V1.ResourceCommandRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) + public virtual global::Aspire.ResourceService.Proto.V1.ResourceCommandResponse ExecuteResourceCommand(global::Aspire.ResourceService.Proto.V1.ResourceCommandRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) { return ExecuteResourceCommand(request, new grpc::CallOptions(headers, deadline, cancellationToken)); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual global::Aspire.V1.ResourceCommandResponse ExecuteResourceCommand(global::Aspire.V1.ResourceCommandRequest request, grpc::CallOptions options) + public virtual global::Aspire.ResourceService.Proto.V1.ResourceCommandResponse ExecuteResourceCommand(global::Aspire.ResourceService.Proto.V1.ResourceCommandRequest request, grpc::CallOptions options) { return CallInvoker.BlockingUnaryCall(__Method_ExecuteResourceCommand, null, options, request); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual grpc::AsyncUnaryCall ExecuteResourceCommandAsync(global::Aspire.V1.ResourceCommandRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) + public virtual grpc::AsyncUnaryCall ExecuteResourceCommandAsync(global::Aspire.ResourceService.Proto.V1.ResourceCommandRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) { return ExecuteResourceCommandAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken)); } [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] - public virtual grpc::AsyncUnaryCall ExecuteResourceCommandAsync(global::Aspire.V1.ResourceCommandRequest request, grpc::CallOptions options) + public virtual grpc::AsyncUnaryCall ExecuteResourceCommandAsync(global::Aspire.ResourceService.Proto.V1.ResourceCommandRequest request, grpc::CallOptions options) { return CallInvoker.AsyncUnaryCall(__Method_ExecuteResourceCommand, null, options, request); } @@ -248,10 +248,10 @@ protected override DashboardServiceClient NewInstance(ClientBaseConfiguration co [global::System.CodeDom.Compiler.GeneratedCode("grpc_csharp_plugin", null)] public static void BindService(grpc::ServiceBinderBase serviceBinder, DashboardServiceBase serviceImpl) { - serviceBinder.AddMethod(__Method_GetApplicationInformation, serviceImpl == null ? null : new grpc::UnaryServerMethod(serviceImpl.GetApplicationInformation)); - serviceBinder.AddMethod(__Method_WatchResources, serviceImpl == null ? null : new grpc::ServerStreamingServerMethod(serviceImpl.WatchResources)); - serviceBinder.AddMethod(__Method_WatchResourceConsoleLogs, serviceImpl == null ? null : new grpc::ServerStreamingServerMethod(serviceImpl.WatchResourceConsoleLogs)); - serviceBinder.AddMethod(__Method_ExecuteResourceCommand, serviceImpl == null ? null : new grpc::UnaryServerMethod(serviceImpl.ExecuteResourceCommand)); + serviceBinder.AddMethod(__Method_GetApplicationInformation, serviceImpl == null ? null : new grpc::UnaryServerMethod(serviceImpl.GetApplicationInformation)); + serviceBinder.AddMethod(__Method_WatchResources, serviceImpl == null ? null : new grpc::ServerStreamingServerMethod(serviceImpl.WatchResources)); + serviceBinder.AddMethod(__Method_WatchResourceConsoleLogs, serviceImpl == null ? null : new grpc::ServerStreamingServerMethod(serviceImpl.WatchResourceConsoleLogs)); + serviceBinder.AddMethod(__Method_ExecuteResourceCommand, serviceImpl == null ? null : new grpc::UnaryServerMethod(serviceImpl.ExecuteResourceCommand)); } } diff --git a/src/dotnet/aspire-session-host/ResourceProto/resource_service.proto b/src/dotnet/aspire-session-host/ResourceProto/resource_service.proto index dc29a19e..db475754 100644 --- a/src/dotnet/aspire-session-host/ResourceProto/resource_service.proto +++ b/src/dotnet/aspire-session-host/ResourceProto/resource_service.proto @@ -5,6 +5,8 @@ syntax = "proto3"; package aspire.v1; +option csharp_namespace = "Aspire.ResourceService.Proto.V1"; + import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; @@ -40,7 +42,7 @@ message ResourceCommand { // Represents a request to execute a command. // Sent by the dashboard to DashboardService.ExecuteResourceCommand. -// Constructed with data from a corresponding +// Constructed with data from a corresponding ResourceCommand. message ResourceCommandRequest { // Unique identifier for the command. // Copied from the ResourceCommand that this request object is initialized from. @@ -97,17 +99,6 @@ message EnvironmentVariable { bool is_from_spec = 3; } -message Endpoint { - string endpoint_url = 1; - string proxy_url = 2; -} - -message Service { - string name = 1; - optional string allocated_address = 2; - optional int32 allocated_port = 3; -} - message Url { // The name of the url string name = 1; @@ -130,6 +121,7 @@ message ResourceProperty { // Models the full state of an resource (container, executable, project, etc) at a particular point in time. message Resource { + reserved 8, 9, 10; string name = 1; string resource_type = 2; string display_name = 3; @@ -138,11 +130,6 @@ message Resource { optional google.protobuf.Timestamp created_at = 6; repeated EnvironmentVariable environment = 7; - // Deprecated and replaced with urls - optional int32 expected_endpoints_count = 8 [deprecated = true]; - repeated Endpoint endpoints = 9 [deprecated = true]; - repeated Service services = 10 [deprecated = true]; - repeated ResourceCommand commands = 11; // Properties holding data not modeled directly on the message. diff --git a/src/dotnet/aspire-session-host/Resources/ResourceExtensions.cs b/src/dotnet/aspire-session-host/Resources/ResourceExtensions.cs index d6428087..30960e48 100644 --- a/src/dotnet/aspire-session-host/Resources/ResourceExtensions.cs +++ b/src/dotnet/aspire-session-host/Resources/ResourceExtensions.cs @@ -1,5 +1,5 @@ using System.Globalization; -using Aspire.V1; +using Aspire.ResourceService.Proto.V1; using AspireSessionHost.Generated; using Google.Protobuf.WellKnownTypes; using ResourceProperty = AspireSessionHost.Generated.ResourceProperty; @@ -50,7 +50,7 @@ internal static class ResourceExtensions _ => ResourceStateStyle.Unknown }; - private static ResourceProperty ToModel(this Aspire.V1.ResourceProperty property) => new( + private static ResourceProperty ToModel(this Aspire.ResourceService.Proto.V1.ResourceProperty property) => new( property.Name, property.HasDisplayName ? property.DisplayName : null, GetStringValue(property.Value) @@ -81,7 +81,7 @@ internal static class ResourceExtensions return value.ToString(); } - private static ResourceEnvironmentVariable ToModel(this Aspire.V1.EnvironmentVariable variable) => new( + private static ResourceEnvironmentVariable ToModel(this EnvironmentVariable variable) => new( variable.Name, variable.HasValue ? variable.Value : null ); diff --git a/src/dotnet/aspire-session-host/Resources/ResourceLogService.cs b/src/dotnet/aspire-session-host/Resources/ResourceLogService.cs index bd16a86f..25b616b5 100644 --- a/src/dotnet/aspire-session-host/Resources/ResourceLogService.cs +++ b/src/dotnet/aspire-session-host/Resources/ResourceLogService.cs @@ -1,4 +1,4 @@ -using Aspire.V1; +using Aspire.ResourceService.Proto.V1; using AspireSessionHost.Generated; using Grpc.Core; using JetBrains.Collections.Viewable; diff --git a/src/dotnet/aspire-session-host/Resources/ResourceService.cs b/src/dotnet/aspire-session-host/Resources/ResourceService.cs index 49e9bac4..751b0fba 100644 --- a/src/dotnet/aspire-session-host/Resources/ResourceService.cs +++ b/src/dotnet/aspire-session-host/Resources/ResourceService.cs @@ -1,4 +1,4 @@ -using Aspire.V1; +using Aspire.ResourceService.Proto.V1; using AspireSessionHost.Generated; using Grpc.Core; using JetBrains.Lifetimes; diff --git a/src/dotnet/aspire-session-host/Resources/ResourceServiceRegistration.cs b/src/dotnet/aspire-session-host/Resources/ResourceServiceRegistration.cs index 46637b85..ac2dbc83 100644 --- a/src/dotnet/aspire-session-host/Resources/ResourceServiceRegistration.cs +++ b/src/dotnet/aspire-session-host/Resources/ResourceServiceRegistration.cs @@ -1,4 +1,4 @@ -using Aspire.V1; +using Aspire.ResourceService.Proto.V1; using Grpc.Core; using Grpc.Net.Client.Configuration; using Polly; diff --git a/src/main/kotlin/com/jetbrains/rider/aspire/database/mysql/DummyMySqlConnectionString.kt b/src/main/kotlin/com/jetbrains/rider/aspire/database/mysql/DummyMySqlConnectionString.kt index 77fab789..0e0d1347 100644 --- a/src/main/kotlin/com/jetbrains/rider/aspire/database/mysql/DummyMySqlConnectionString.kt +++ b/src/main/kotlin/com/jetbrains/rider/aspire/database/mysql/DummyMySqlConnectionString.kt @@ -29,10 +29,12 @@ class DummyMySqlConnectionString(project: Project, properties: List() { init { diff --git a/src/main/kotlin/com/jetbrains/rider/aspire/database/mysql/DummyMySqlJdbcUrl.kt b/src/main/kotlin/com/jetbrains/rider/aspire/database/mysql/DummyMySqlJdbcUrl.kt index c6085550..863d6c05 100644 --- a/src/main/kotlin/com/jetbrains/rider/aspire/database/mysql/DummyMySqlJdbcUrl.kt +++ b/src/main/kotlin/com/jetbrains/rider/aspire/database/mysql/DummyMySqlJdbcUrl.kt @@ -41,6 +41,7 @@ class DummyMySqlJdbcUrl(properties: Collection) : JdbcUrl(pr return false } + @Suppress("MemberVisibilityCanBePrivate") var serverName get() = get(Property.Server) set(value) = set(Property.Server, value) @@ -53,10 +54,12 @@ class DummyMySqlJdbcUrl(properties: Collection) : JdbcUrl(pr get() = get(Property.Database) set(value) = set(Property.Database, value) + @Suppress("MemberVisibilityCanBePrivate") var user get() = get(Property.User) set(value) = set(Property.User, value) + @Suppress("MemberVisibilityCanBePrivate") var password get() = get(Property.Password) set(value) = set(Property.Password, value) diff --git a/src/main/kotlin/com/jetbrains/rider/aspire/run/runners/AspireHostProgramRunnerUtils.kt b/src/main/kotlin/com/jetbrains/rider/aspire/run/runners/AspireHostProgramRunnerUtils.kt index 08407df2..90d38e1d 100644 --- a/src/main/kotlin/com/jetbrains/rider/aspire/run/runners/AspireHostProgramRunnerUtils.kt +++ b/src/main/kotlin/com/jetbrains/rider/aspire/run/runners/AspireHostProgramRunnerUtils.kt @@ -82,7 +82,8 @@ fun saveRunConfiguration( runConfigurationName: String, aspireHostLifetimeDefinition: LifetimeDefinition ) { - AspireHostRunManager.Companion.getInstance(project) + AspireHostRunManager + .getInstance(project) .saveRunConfiguration(aspireHostProjectPath, aspireHostLifetimeDefinition, runConfigurationName) } @@ -97,7 +98,8 @@ suspend fun startSessionHostAndSubscribe( .syncPublisher(AspireSessionHostListener.TOPIC) .modelCreated(config.aspireHostProjectPath, sessionHostModel, config.aspireHostLifetime) - SessionHostManager.Companion.getInstance(project) + SessionHostManager + .getInstance(project) .startSessionHost(config, protocol.wire.serverPort, sessionHostModel) } diff --git a/src/main/kotlin/com/jetbrains/rider/aspire/services/AspireResource.kt b/src/main/kotlin/com/jetbrains/rider/aspire/services/AspireResource.kt index 482618a8..d4c1285e 100644 --- a/src/main/kotlin/com/jetbrains/rider/aspire/services/AspireResource.kt +++ b/src/main/kotlin/com/jetbrains/rider/aspire/services/AspireResource.kt @@ -43,6 +43,7 @@ class AspireResource( private set var state: ResourceState? private set + @Suppress("MemberVisibilityCanBePrivate") var stateStyle: ResourceStateStyle? private set var urls: Array diff --git a/src/main/kotlin/com/jetbrains/rider/aspire/sessionHost/projectLaunchers/BaseProjectSessionProcessLauncher.kt b/src/main/kotlin/com/jetbrains/rider/aspire/sessionHost/projectLaunchers/BaseProjectSessionProcessLauncher.kt index 8843eca5..0d842792 100644 --- a/src/main/kotlin/com/jetbrains/rider/aspire/sessionHost/projectLaunchers/BaseProjectSessionProcessLauncher.kt +++ b/src/main/kotlin/com/jetbrains/rider/aspire/sessionHost/projectLaunchers/BaseProjectSessionProcessLauncher.kt @@ -156,7 +156,7 @@ abstract class BaseProjectSessionProcessLauncher : SessionProcessLauncherExtensi aspireHostProjectPath: Path? ): RunProfile - protected suspend fun getDotNetExecutable( + private suspend fun getDotNetExecutable( sessionModel: SessionModel, hostRunConfiguration: AspireHostConfiguration?, addBrowserAction: Boolean, @@ -171,7 +171,7 @@ abstract class BaseProjectSessionProcessLauncher : SessionProcessLauncherExtensi return executable } - protected fun getDotNetRuntime(executable: DotNetExecutable, project: Project): DotNetCoreRuntime? { + private fun getDotNetRuntime(executable: DotNetExecutable, project: Project): DotNetCoreRuntime? { val runtime = DotNetRuntime.detectRuntimeForProject( project, RunnableProjectKinds.DotNetCore, @@ -187,7 +187,7 @@ abstract class BaseProjectSessionProcessLauncher : SessionProcessLauncherExtensi return runtime } - protected suspend fun enableHotReload( + private suspend fun enableHotReload( executable: DotNetExecutable, sessionProjectPath: Path, launchProfile: String?, diff --git a/src/main/kotlin/com/jetbrains/rider/aspire/sessionHost/wasmHost/WasmHostProjectSessionDebugProfileState.kt b/src/main/kotlin/com/jetbrains/rider/aspire/sessionHost/wasmHost/WasmHostProjectSessionDebugProfileState.kt index a47d81b4..4873948b 100644 --- a/src/main/kotlin/com/jetbrains/rider/aspire/sessionHost/wasmHost/WasmHostProjectSessionDebugProfileState.kt +++ b/src/main/kotlin/com/jetbrains/rider/aspire/sessionHost/wasmHost/WasmHostProjectSessionDebugProfileState.kt @@ -1,5 +1,3 @@ -@file:OptIn(ExperimentalCoroutinesApi::class) - package com.jetbrains.rider.aspire.sessionHost.wasmHost import com.intellij.execution.CantRunException