From f3d1905da9bf4db6af96aa9045f226d2058049f6 Mon Sep 17 00:00:00 2001 From: Gert Driesen Date: Thu, 1 Nov 2007 13:40:59 +0000 Subject: [PATCH] * SoapProtocolImporter.cs: Only output Required argument for SoapHeaderAttribute on .NET 1.0, since it is not used in .NET 1.1 and higher. Avoids numerous warnings when compiling generated code. svn path=/trunk/mcs/; revision=88644 --- .../System.Web.Services.Description/ChangeLog | 6 ++++++ .../System.Web.Services.Description/SoapProtocolImporter.cs | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog index 44c33023c31..f23c5538422 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog @@ -1,3 +1,9 @@ +2007-11-01 Gert Driesen + + * SoapProtocolImporter.cs: Only output Required argument for + SoapHeaderAttribute on .NET 1.0, since it is not used in .NET 1.1 and + higher. Avoids numerous warnings when compiling generated code. + 2007-10-05 Atsushi Enomoto * ServiceDescriptionCollection.cs : added missing members. diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs index 759a4b53621..58d98c43008 100644 --- a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs +++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs @@ -638,8 +638,6 @@ namespace System.Web.Services.Description { soapExporter.ExportTypeMapping (map); } - bool required = false; - string varName = headerVariables [map] as string; if (varName == null) { @@ -652,7 +650,9 @@ namespace System.Web.Services.Description { CodeAttributeDeclaration att = new CodeAttributeDeclaration ("System.Web.Services.Protocols.SoapHeaderAttribute"); att.Arguments.Add (GetArg (varName)); - att.Arguments.Add (GetArg ("Required", required)); +#if ONLY_1_0 + att.Arguments.Add (GetArg ("Required", false)); +#endif if (direction != SoapHeaderDirection.In) att.Arguments.Add (GetEnumArg ("Direction", "System.Web.Services.Protocols.SoapHeaderDirection", direction.ToString ())); AddCustomAttribute (method, att, true); } -- 2.25.1