diff --git a/Applications/ConsoleReferenceClient/Program.cs b/Applications/ConsoleReferenceClient/Program.cs index de85fe079d..5f2c1a4800 100644 --- a/Applications/ConsoleReferenceClient/Program.cs +++ b/Applications/ConsoleReferenceClient/Program.cs @@ -325,6 +325,7 @@ public static async Task Main(string[] args) // override logfile if (logFile != null) { +#pragma warning disable CS0618 // Type or member is obsolete string logFilePath = config.TraceConfiguration.OutputFilePath; string filename = Path.GetFileNameWithoutExtension(logFilePath); config.TraceConfiguration.OutputFilePath = logFilePath.Replace( @@ -333,7 +334,6 @@ public static async Task Main(string[] args) StringComparison.Ordinal ); config.TraceConfiguration.DeleteOnLoad = true; -#pragma warning disable CS0618 // Type or member is obsolete config.TraceConfiguration.ApplySettings(); #pragma warning restore CS0618 // Type or member is obsolete } diff --git a/Applications/ConsoleReferenceServer/ConsoleUtils.cs b/Applications/ConsoleReferenceServer/ConsoleUtils.cs index 31d5bf5bce..45b0edb2df 100644 --- a/Applications/ConsoleReferenceServer/ConsoleUtils.cs +++ b/Applications/ConsoleReferenceServer/ConsoleUtils.cs @@ -149,7 +149,9 @@ public void ConfigureLogging( LogLevel fileLevel = LogLevel.Information; // switch for Trace/Verbose output +#pragma warning disable CS0618 // Type or member is obsolete int traceMasks = configuration.TraceConfiguration.TraceMasks; +#pragma warning restore CS0618 // Type or member is obsolete if ((traceMasks & ~( Utils.TraceMasks.Information | @@ -165,7 +167,9 @@ public void ConfigureLogging( // add file logging if configured if (logFile) { +#pragma warning disable CS0618 // Type or member is obsolete string outputFilePath = configuration.TraceConfiguration.OutputFilePath; +#pragma warning restore CS0618 // Type or member is obsolete if (!string.IsNullOrWhiteSpace(outputFilePath)) { loggerConfiguration.WriteTo.File( diff --git a/Applications/ConsoleReferenceServer/Program.cs b/Applications/ConsoleReferenceServer/Program.cs index 911da3b194..9aab9f17d4 100644 --- a/Applications/ConsoleReferenceServer/Program.cs +++ b/Applications/ConsoleReferenceServer/Program.cs @@ -137,6 +137,7 @@ public static async Task Main(string[] args) if (shadowConfig) { Console.WriteLine("Using shadow configuration."); +#pragma warning disable CS0618 // Type or member is obsolete string shadowPath = Directory .GetParent( Path.GetDirectoryName( @@ -144,6 +145,7 @@ public static async Task Main(string[] args) ) ) .FullName; +#pragma warning restore CS0618 // Type or member is obsolete string shadowFilePath = Path.Combine( shadowPath, Path.GetFileName(server.Configuration.SourceFilePath) diff --git a/Libraries/Opc.Ua.Configuration/ApplicationConfigurationBuilder.cs b/Libraries/Opc.Ua.Configuration/ApplicationConfigurationBuilder.cs index 3a73ba222d..b6bf1ed82b 100644 --- a/Libraries/Opc.Ua.Configuration/ApplicationConfigurationBuilder.cs +++ b/Libraries/Opc.Ua.Configuration/ApplicationConfigurationBuilder.cs @@ -1078,24 +1078,33 @@ public IApplicationConfigurationBuilderClientOptions SetClientOperationLimits( } /// + [Obsolete("Use ITelemetryContext and ILogger-based diagnostics instead.")] public IApplicationConfigurationBuilderTraceConfiguration SetOutputFilePath( string outputFilePath) { +#pragma warning disable CS0618 // Type or member is obsolete ApplicationConfiguration.TraceConfiguration.OutputFilePath = outputFilePath; +#pragma warning restore CS0618 // Type or member is obsolete return this; } /// + [Obsolete("Use ITelemetryContext and ILogger-based diagnostics instead.")] public IApplicationConfigurationBuilderTraceConfiguration SetDeleteOnLoad(bool deleteOnLoad) { +#pragma warning disable CS0618 // Type or member is obsolete ApplicationConfiguration.TraceConfiguration.DeleteOnLoad = deleteOnLoad; +#pragma warning restore CS0618 // Type or member is obsolete return this; } /// + [Obsolete("Use ITelemetryContext and ILogger-based diagnostics instead.")] public IApplicationConfigurationBuilderTraceConfiguration SetTraceMasks(int traceMasks) { +#pragma warning disable CS0618 // Type or member is obsolete ApplicationConfiguration.TraceConfiguration.TraceMasks = traceMasks; +#pragma warning restore CS0618 // Type or member is obsolete return this; } diff --git a/Libraries/Opc.Ua.Configuration/ApplicationInstance.cs b/Libraries/Opc.Ua.Configuration/ApplicationInstance.cs index e580a22275..bef910d99d 100644 --- a/Libraries/Opc.Ua.Configuration/ApplicationInstance.cs +++ b/Libraries/Opc.Ua.Configuration/ApplicationInstance.cs @@ -248,7 +248,9 @@ public IApplicationConfigurationBuilderTypes Build(string applicationUri, string ApplicationType = ApplicationType, ApplicationUri = applicationUri, ProductUri = productUri, +#pragma warning disable CS0618 // Type or member is obsolete TraceConfiguration = new TraceConfiguration { TraceMasks = Utils.TraceMasks.None }, +#pragma warning restore CS0618 // Type or member is obsolete TransportQuotas = new TransportQuotas() }; diff --git a/Libraries/Opc.Ua.Configuration/IApplicationConfigurationBuilder.cs b/Libraries/Opc.Ua.Configuration/IApplicationConfigurationBuilder.cs index 55dbd79837..1e8ee579de 100644 --- a/Libraries/Opc.Ua.Configuration/IApplicationConfigurationBuilder.cs +++ b/Libraries/Opc.Ua.Configuration/IApplicationConfigurationBuilder.cs @@ -664,12 +664,15 @@ IApplicationConfigurationBuilderGlobalConfiguration SetHiResClockDisabled( public interface IApplicationConfigurationBuilderTraceConfiguration : IApplicationConfigurationBuilderCreate { /// + [Obsolete("Use ITelemetryContext and ILogger-based diagnostics instead.")] IApplicationConfigurationBuilderTraceConfiguration SetOutputFilePath(string outputFilePath); /// + [Obsolete("Use ITelemetryContext and ILogger-based diagnostics instead.")] IApplicationConfigurationBuilderTraceConfiguration SetDeleteOnLoad(bool deleteOnLoad); /// + [Obsolete("Use ITelemetryContext and ILogger-based diagnostics instead.")] IApplicationConfigurationBuilderTraceConfiguration SetTraceMasks(int traceMasks); } diff --git a/Libraries/Opc.Ua.Server/Server/StandardServer.cs b/Libraries/Opc.Ua.Server/Server/StandardServer.cs index f457950d68..5dbc4c67e3 100644 --- a/Libraries/Opc.Ua.Server/Server/StandardServer.cs +++ b/Libraries/Opc.Ua.Server/Server/StandardServer.cs @@ -2884,10 +2884,9 @@ await Configuration.CertificateValidator.UpdateAsync( ct: cancellationToken).ConfigureAwait(false); // update trace configuration. +#pragma warning disable CS0618 // Type or member is obsolete Configuration.TraceConfiguration = configuration.TraceConfiguration ?? new TraceConfiguration(); - -#pragma warning disable CS0618 // Type or member is obsolete Configuration.TraceConfiguration.ApplySettings(); #pragma warning restore CS0618 // Type or member is obsolete } diff --git a/Stack/Opc.Ua.Core/Schema/ApplicationConfiguration.cs b/Stack/Opc.Ua.Core/Schema/ApplicationConfiguration.cs index ba3cbfea7e..fa7bd3c7a6 100644 --- a/Stack/Opc.Ua.Core/Schema/ApplicationConfiguration.cs +++ b/Stack/Opc.Ua.Core/Schema/ApplicationConfiguration.cs @@ -77,7 +77,9 @@ public ApplicationConfiguration(ApplicationConfiguration template) DisableHiResClock = template.DisableHiResClock; CertificateValidator = template.CertificateValidator; TransportQuotas = template.TransportQuotas; +#pragma warning disable CS0618 // Type or member is obsolete TraceConfiguration = template.TraceConfiguration; +#pragma warning restore CS0618 // Type or member is obsolete m_extensions = template.m_extensions; m_extensionObjects = template.m_extensionObjects; SourceFilePath = template.SourceFilePath; @@ -240,6 +242,7 @@ public XmlElementCollection Extensions /// /// The trace configuration. [DataMember(IsRequired = false, EmitDefaultValue = false, Order = 11)] + [Obsolete("Use ITelemetryContext and ILogger-based diagnostics instead.")] public TraceConfiguration TraceConfiguration { get; set; } /// diff --git a/Stack/Opc.Ua.Core/Stack/Configuration/ApplicationConfiguration.cs b/Stack/Opc.Ua.Core/Stack/Configuration/ApplicationConfiguration.cs index d5f15bf598..e5459924da 100644 --- a/Stack/Opc.Ua.Core/Stack/Configuration/ApplicationConfiguration.cs +++ b/Stack/Opc.Ua.Core/Stack/Configuration/ApplicationConfiguration.cs @@ -518,12 +518,12 @@ public static async Task LoadAsync( if (configuration != null) { // should not be here but need to preserve old behavior. +#pragma warning disable CS0618 // Type or member is obsolete if (applyTraceSettings && configuration.TraceConfiguration != null) { -#pragma warning disable CS0618 // Type or member is obsolete configuration.TraceConfiguration.ApplySettings(); -#pragma warning restore CS0618 // Type or member is obsolete } +#pragma warning restore CS0618 // Type or member is obsolete configuration.SecurityConfiguration.CertificatePasswordProvider = certificatePasswordProvider; diff --git a/Tests/Opc.Ua.Client.Tests/ClientFixture.cs b/Tests/Opc.Ua.Client.Tests/ClientFixture.cs index 7632a8672e..8693670528 100644 --- a/Tests/Opc.Ua.Client.Tests/ClientFixture.cs +++ b/Tests/Opc.Ua.Client.Tests/ClientFixture.cs @@ -129,6 +129,7 @@ public async Task LoadClientConfigurationAsync( pkiRoot); // build the application configuration. +#pragma warning disable CS0618 // Type or member is obsolete Config = await application .Build( "urn:localhost:opcfoundation.org:" + clientName, @@ -151,6 +152,7 @@ public async Task LoadClientConfigurationAsync( .SetOutputFilePath(Path.Combine(pkiRoot, "Logs", "Opc.Ua.Client.Tests.log.txt")) .CreateAsync() .ConfigureAwait(false); +#pragma warning restore CS0618 // Type or member is obsolete // check the application certificate. bool haveAppCertificate = await application diff --git a/Tests/Opc.Ua.Gds.Tests/GlobalDiscoveryTestClient.cs b/Tests/Opc.Ua.Gds.Tests/GlobalDiscoveryTestClient.cs index dc434e8882..a84424dc5b 100644 --- a/Tests/Opc.Ua.Gds.Tests/GlobalDiscoveryTestClient.cs +++ b/Tests/Opc.Ua.Gds.Tests/GlobalDiscoveryTestClient.cs @@ -114,6 +114,7 @@ public async Task LoadClientConfigurationAsync(int port = -1, bool clean = true) pkiRoot); // build the application configuration. +#pragma warning disable CS0618 // Type or member is obsolete Configuration = await m_application .Build( "urn:localhost:opcfoundation.org:GlobalDiscoveryTestClient", @@ -131,6 +132,7 @@ public async Task LoadClientConfigurationAsync(int port = -1, bool clean = true) .SetTraceMasks(519) .CreateAsync() .ConfigureAwait(false); +#pragma warning restore CS0618 // Type or member is obsolete #endif if (clean) @@ -269,10 +271,12 @@ public async Task DisconnectClientAsync() } } - public string ReadLogFile() + internal string ReadLogFile() { +#pragma warning disable CS0618 // Type or member is obsolete return File.ReadAllText( Utils.ReplaceSpecialFolderNames(Configuration.TraceConfiguration.OutputFilePath)); +#pragma warning restore CS0618 // Type or member is obsolete } private async Task ApplyNewApplicationInstanceCertificateAsync( diff --git a/Tests/Opc.Ua.Gds.Tests/GlobalDiscoveryTestServer.cs b/Tests/Opc.Ua.Gds.Tests/GlobalDiscoveryTestServer.cs index 070ce96aad..a5bc568050 100644 --- a/Tests/Opc.Ua.Gds.Tests/GlobalDiscoveryTestServer.cs +++ b/Tests/Opc.Ua.Gds.Tests/GlobalDiscoveryTestServer.cs @@ -289,6 +289,7 @@ private static async Task LoadAsync( gdsRoot); // build the application configuration. +#pragma warning disable CS0618 // Type or member is obsolete ApplicationConfiguration config = await application .Build( "urn:localhost:opcfoundation.org:GlobalDiscoveryTestServer", @@ -314,6 +315,7 @@ private static async Task LoadAsync( .SetTraceMasks(519) .CreateAsync() .ConfigureAwait(false); +#pragma warning restore CS0618 // Type or member is obsolete #endif config.ServerConfiguration.MaxTrustListSize = maxTrustListSize; diff --git a/Tests/Opc.Ua.Gds.Tests/ServerConfigurationPushTestClient.cs b/Tests/Opc.Ua.Gds.Tests/ServerConfigurationPushTestClient.cs index 42130c3225..846c62788b 100644 --- a/Tests/Opc.Ua.Gds.Tests/ServerConfigurationPushTestClient.cs +++ b/Tests/Opc.Ua.Gds.Tests/ServerConfigurationPushTestClient.cs @@ -106,6 +106,7 @@ public async Task LoadClientConfigurationAsync(int port = -1) pkiRoot); // build the application configuration. +#pragma warning disable CS0618 // Type or member is obsolete Config = await application .Build( "urn:localhost:opcfoundation.org:ServerConfigurationPushTestClient", @@ -122,6 +123,7 @@ public async Task LoadClientConfigurationAsync(int port = -1) .SetTraceMasks(Utils.TraceMasks.Error) .CreateAsync() .ConfigureAwait(false); +#pragma warning restore CS0618 // Type or member is obsolete #endif // check the application certificate. bool haveAppCertificate = await application @@ -178,10 +180,12 @@ public async Task DisconnectClientAsync() } } - public string ReadLogFile() + internal string ReadLogFile() { +#pragma warning disable CS0618 // Type or member is obsolete return File.ReadAllText( Utils.ReplaceSpecialFolderNames(Config.TraceConfiguration.OutputFilePath)); +#pragma warning restore CS0618 // Type or member is obsolete } private void CertificateValidator_CertificateValidation(