Skip to content

Commit 0292189

Browse files
0xced0xced
committed
Make svcutil generate public static methods instead of private
Fixes #5179
1 parent 5b5a784 commit 0292189

File tree

107 files changed

+348
-348
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+348
-348
lines changed

‎src/dotnet-svcutil/lib/src/CodeDomFixup/MethodCreationHelper.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public MethodCreationHelper(CodeTypeDeclaration clientType)
2525
this.GetEndpointAddress = new CodeMemberMethod
2626
{
2727
Name = ConfigToCodeConstants.GetEndpointAddressMethod,
28-
Attributes = MemberAttributes.Private | MemberAttributes.Static,
28+
Attributes = MemberAttributes.Public | MemberAttributes.Static,
2929
ReturnType = new CodeTypeReference(typeof(EndpointAddress)),
3030
};
3131

@@ -34,7 +34,7 @@ public MethodCreationHelper(CodeTypeDeclaration clientType)
3434
this.GetBinding = new CodeMemberMethod
3535
{
3636
Name = ConfigToCodeConstants.GetBindingMethod,
37-
Attributes = MemberAttributes.Private | MemberAttributes.Static,
37+
Attributes = MemberAttributes.Public | MemberAttributes.Static,
3838
ReturnType = new CodeTypeReference(typeof(Binding)),
3939
};
4040

@@ -1998,14 +1998,14 @@ private void CreateDefaultEndpointMethods(string clientTypeName, List<string> en
19981998

19991999
this.GetDefaultBinding = new CodeMemberMethod
20002000
{
2001-
Attributes = MemberAttributes.Static | MemberAttributes.Private,
2001+
Attributes = MemberAttributes.Static | MemberAttributes.Public,
20022002
Name = ConfigToCodeConstants.GetDefaultBindingMethod,
20032003
ReturnType = new CodeTypeReference(typeof(Binding)),
20042004
};
20052005

20062006
this.GetDefaultEndpointAddress = new CodeMemberMethod
20072007
{
2008-
Attributes = MemberAttributes.Static | MemberAttributes.Private,
2008+
Attributes = MemberAttributes.Static | MemberAttributes.Public,
20092009
Name = ConfigToCodeConstants.GetDefaultEndpointAddressMethod,
20102010
ReturnType = new CodeTypeReference(typeof(EndpointAddress)),
20112011
};

‎src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/Auto/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ public virtual System.Threading.Tasks.Task CloseAsync()
894894
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
895895
}
896896

897-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
897+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
898898
{
899899
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
900900
{
@@ -1002,7 +1002,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
10021002
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
10031003
}
10041004

1005-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
1005+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
10061006
{
10071007
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
10081008
{

‎src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/CollectionArray/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ public virtual System.Threading.Tasks.Task CloseAsync()
894894
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
895895
}
896896

897-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
897+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
898898
{
899899
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
900900
{
@@ -1002,7 +1002,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
10021002
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
10031003
}
10041004

1005-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
1005+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
10061006
{
10071007
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
10081008
{

‎src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/DataContractSerializer/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ public virtual System.Threading.Tasks.Task CloseAsync()
894894
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
895895
}
896896

897-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
897+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
898898
{
899899
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
900900
{
@@ -1002,7 +1002,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
10021002
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
10031003
}
10041004

1005-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
1005+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
10061006
{
10071007
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
10081008
{

‎src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/EnableDataBinding/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,7 @@ public virtual System.Threading.Tasks.Task CloseAsync()
11271127
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
11281128
}
11291129

1130-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
1130+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
11311131
{
11321132
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
11331133
{
@@ -1235,7 +1235,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
12351235
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
12361236
}
12371237

1238-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
1238+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
12391239
{
12401240
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
12411241
{

‎src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/ExcludeType/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ public virtual System.Threading.Tasks.Task CloseAsync()
10411041
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
10421042
}
10431043

1044-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
1044+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
10451045
{
10461046
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
10471047
{
@@ -1149,7 +1149,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
11491149
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
11501150
}
11511151

1152-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
1152+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
11531153
{
11541154
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
11551155
{

‎src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/Internal/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ public virtual System.Threading.Tasks.Task CloseAsync()
894894
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
895895
}
896896

897-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
897+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
898898
{
899899
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
900900
{
@@ -1002,7 +1002,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
10021002
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
10031003
}
10041004

1005-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
1005+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
10061006
{
10071007
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
10081008
{

‎src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/MessageContract/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1244,7 +1244,7 @@ public virtual System.Threading.Tasks.Task CloseAsync()
12441244
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
12451245
}
12461246

1247-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
1247+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
12481248
{
12491249
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
12501250
{
@@ -1352,7 +1352,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
13521352
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
13531353
}
13541354

1355-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
1355+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
13561356
{
13571357
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
13581358
{

‎src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/NoStdLib/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ public virtual System.Threading.Tasks.Task CloseAsync()
10681068
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
10691069
}
10701070

1071-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
1071+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
10721072
{
10731073
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
10741074
{
@@ -1176,7 +1176,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
11761176
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
11771177
}
11781178

1179-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
1179+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
11801180
{
11811181
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
11821182
{

‎src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/None/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ public virtual System.Threading.Tasks.Task CloseAsync()
894894
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
895895
}
896896

897-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
897+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
898898
{
899899
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
900900
{
@@ -1002,7 +1002,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
10021002
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
10031003
}
10041004

1005-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
1005+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
10061006
{
10071007
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
10081008
{

‎src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/Sync/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ public virtual System.Threading.Tasks.Task CloseAsync()
10251025
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
10261026
}
10271027

1028-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
1028+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
10291029
{
10301030
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
10311031
{
@@ -1133,7 +1133,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
11331133
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
11341134
}
11351135

1136-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
1136+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
11371137
{
11381138
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
11391139
{

‎src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/XmlSerializer/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1951,7 +1951,7 @@ public virtual System.Threading.Tasks.Task CloseAsync()
19511951
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
19521952
}
19531953

1954-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
1954+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
19551955
{
19561956
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
19571957
{
@@ -2059,7 +2059,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
20592059
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
20602060
}
20612061

2062-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
2062+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
20632063
{
20642064
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
20652065
{

‎src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/wrapped/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2461,7 +2461,7 @@ public virtual System.Threading.Tasks.Task CloseAsync()
24612461
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
24622462
}
24632463

2464-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
2464+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
24652465
{
24662466
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
24672467
{
@@ -2569,7 +2569,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
25692569
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
25702570
}
25712571

2572-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
2572+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
25732573
{
25742574
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
25752575
{

‎src/dotnet-svcutil/lib/tests/Baselines/Collections/array/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ public virtual System.Threading.Tasks.Task OpenAsync()
889889
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginOpen(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndOpen));
890890
}
891891

892-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
892+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
893893
{
894894
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
895895
{
@@ -997,7 +997,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
997997
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
998998
}
999999

1000-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
1000+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
10011001
{
10021002
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
10031003
{

‎src/dotnet-svcutil/lib/tests/Baselines/Collections/arrayList/Reference.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ public virtual System.Threading.Tasks.Task OpenAsync()
889889
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginOpen(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndOpen));
890890
}
891891

892-
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
892+
public static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
893893
{
894894
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
895895
{
@@ -997,7 +997,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
997997
throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
998998
}
999999

1000-
private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
1000+
public static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
10011001
{
10021002
if ((endpointConfiguration == EndpointConfiguration.defaultEndpoint))
10031003
{

0 commit comments

Comments
 (0)