From 9165b4a57cb0eaa43163d895549aa94ff7ec86c0 Mon Sep 17 00:00:00 2001 From: Georgii Borovinskikh Date: Tue, 24 Dec 2024 10:36:32 +0100 Subject: [PATCH] fix rebase problems --- .../UnintrusiveBindingControllerTests.cs | 1 - src/SLCore/SLCoreStrings.Designer.cs | 58 +++++++++---------- src/SLCore/SLCoreStrings.resx | 1 + 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/ConnectedMode.UnitTests/Binding/UnintrusiveBindingControllerTests.cs b/src/ConnectedMode.UnitTests/Binding/UnintrusiveBindingControllerTests.cs index 2192a3228..7a19eba58 100644 --- a/src/ConnectedMode.UnitTests/Binding/UnintrusiveBindingControllerTests.cs +++ b/src/ConnectedMode.UnitTests/Binding/UnintrusiveBindingControllerTests.cs @@ -112,7 +112,6 @@ public async Task BindAsync_CallsBindingProcessInOrder() { bindingProcessFactory.Create(Arg.Is(b => b.ProjectToBind == AnyBoundProject)); bindingProcess.DownloadQualityProfileAsync(null, cancellationToken); - bindingProcess.SaveServerExclusionsAsync(cancellationToken); }); } diff --git a/src/SLCore/SLCoreStrings.Designer.cs b/src/SLCore/SLCoreStrings.Designer.cs index b45c16638..655b10580 100644 --- a/src/SLCore/SLCoreStrings.Designer.cs +++ b/src/SLCore/SLCoreStrings.Designer.cs @@ -10,8 +10,8 @@ namespace SonarLint.VisualStudio.SLCore { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -23,15 +23,15 @@ namespace SonarLint.VisualStudio.SLCore { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class SLCoreStrings { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal SLCoreStrings() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ internal SLCoreStrings() { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,7 +59,7 @@ internal SLCoreStrings() { resourceCulture = value; } } - + /// /// Looks up a localized string similar to Internal analysis failure. See logs above.. /// @@ -68,7 +68,7 @@ public static string AnalysisFailedReason { return ResourceManager.GetString("AnalysisFailedReason", resourceCulture); } } - + /// /// Looks up a localized string similar to Updated analysis readiness: {0}. /// @@ -77,7 +77,7 @@ public static string AnalysisReadinessUpdate { return ResourceManager.GetString("AnalysisReadinessUpdate", resourceCulture); } } - + /// /// Looks up a localized string similar to [CertificateChainValidator] Certificate validation failed for the following reason(s):. /// @@ -86,7 +86,7 @@ public static string CertificateValidator_Failed { return ResourceManager.GetString("CertificateValidator_Failed", resourceCulture); } } - + /// /// Looks up a localized string similar to [CertificateChainValidator] {0}: {1}. /// @@ -95,7 +95,7 @@ public static string CertificateValidator_FailureReasonTemplate { return ResourceManager.GetString("CertificateValidator_FailureReasonTemplate", resourceCulture); } } - + /// /// Looks up a localized string similar to [SLCoreAnalyzer] No compilation database found for file: {0}. Check that the file is part of a supported project type in the current solution.. /// @@ -104,7 +104,7 @@ public static string CompilationDatabaseNotFound { return ResourceManager.GetString("CompilationDatabaseNotFound", resourceCulture); } } - + /// /// Looks up a localized string similar to Configuration scope conflict. /// @@ -113,7 +113,7 @@ public static string ConfigScopeConflict { return ResourceManager.GetString("ConfigScopeConflict", resourceCulture); } } - + /// /// Looks up a localized string similar to Configuration scope not initialized. /// @@ -122,7 +122,7 @@ public static string ConfigScopeNotInitialized { return ResourceManager.GetString("ConfigScopeNotInitialized", resourceCulture); } } - + /// /// Looks up a localized string similar to [SLCore.Http] Received server trust verification request.... /// @@ -131,7 +131,7 @@ public static string HttpConfiguration_ServerTrustVerificationRequest { return ResourceManager.GetString("HttpConfiguration_ServerTrustVerificationRequest", resourceCulture); } } - + /// /// Looks up a localized string similar to [SLCore.Http] Server verification result: {0}. /// @@ -140,7 +140,7 @@ public static string HttpConfiguration_ServerTrustVerificationResult { return ResourceManager.GetString("HttpConfiguration_ServerTrustVerificationResult", resourceCulture); } } - + /// /// Looks up a localized string similar to Unexpected enum value. /// @@ -149,7 +149,7 @@ public static string ModelExtensions_UnexpectedValue { return ResourceManager.GetString("ModelExtensions_UnexpectedValue", resourceCulture); } } - + /// /// Looks up a localized string similar to Service Provider is unavailable. /// @@ -158,7 +158,7 @@ public static string ServiceProviderNotInitialized { return ResourceManager.GetString("ServiceProviderNotInitialized", resourceCulture); } } - + /// /// Looks up a localized string similar to [SLCoreHandler] Creating SLCore instance. /// @@ -167,7 +167,7 @@ public static string SLCoreHandler_CreatingInstance { return ResourceManager.GetString("SLCoreHandler_CreatingInstance", resourceCulture); } } - + /// /// Looks up a localized string similar to [SLCoreHandler] Error creating SLCore instance. /// @@ -176,7 +176,7 @@ public static string SLCoreHandler_CreatingInstanceError { return ResourceManager.GetString("SLCoreHandler_CreatingInstanceError", resourceCulture); } } - + /// /// Looks up a localized string similar to Current instance is alive. /// @@ -185,7 +185,7 @@ public static string SLCoreHandler_InstanceAlreadyRunning { return ResourceManager.GetString("SLCoreHandler_InstanceAlreadyRunning", resourceCulture); } } - + /// /// Looks up a localized string similar to [SLCoreHandler] SLCore instance exited. /// @@ -194,7 +194,7 @@ public static string SLCoreHandler_InstanceDied { return ResourceManager.GetString("SLCoreHandler_InstanceDied", resourceCulture); } } - + /// /// Looks up a localized string similar to [SLCoreHandler] Starting SLCore instance. /// @@ -203,7 +203,7 @@ public static string SLCoreHandler_StartingInstance { return ResourceManager.GetString("SLCoreHandler_StartingInstance", resourceCulture); } } - + /// /// Looks up a localized string similar to [SLCoreHandler] Error starting SLCore instance. /// @@ -212,7 +212,7 @@ public static string SLCoreHandler_StartingInstanceError { return ResourceManager.GetString("SLCoreHandler_StartingInstanceError", resourceCulture); } } - + /// /// Looks up a localized string similar to [SLCoreServiceProvider]Cannot Create Service. Error: {0}. /// @@ -221,7 +221,7 @@ public static string SLCoreServiceProvider_CreateServiceError { return ResourceManager.GetString("SLCoreServiceProvider_CreateServiceError", resourceCulture); } } - + /// /// Looks up a localized string similar to SonarQube for Visual Studio background service failed to start. /// @@ -230,7 +230,7 @@ public static string SloopRestartFailedNotificationService_GoldBarMessage { return ResourceManager.GetString("SloopRestartFailedNotificationService_GoldBarMessage", resourceCulture); } } - + /// /// Looks up a localized string similar to Restart SonarQube for Visual Studio. /// @@ -239,7 +239,7 @@ public static string SloopRestartFailedNotificationService_Restart { return ResourceManager.GetString("SloopRestartFailedNotificationService_Restart", resourceCulture); } } - + /// /// Looks up a localized string similar to Unexpected server connection type. /// @@ -248,7 +248,7 @@ public static string UnexpectedServerConnectionType { return ResourceManager.GetString("UnexpectedServerConnectionType", resourceCulture); } } - + /// /// Looks up a localized string similar to Proxy type can not be determined from scheme '{0}'. Returning HTTP proxy type.. /// diff --git a/src/SLCore/SLCoreStrings.resx b/src/SLCore/SLCoreStrings.resx index a57a56a5c..dbf2242e1 100644 --- a/src/SLCore/SLCoreStrings.resx +++ b/src/SLCore/SLCoreStrings.resx @@ -179,6 +179,7 @@ Proxy type can not be determined from scheme '{0}'. Returning HTTP proxy type. + [SLCoreAnalyzer] No compilation database found for file: {0}. Check that the file is part of a supported project type in the current solution.