fix rebase problems

SonarSource · Dec 24, 2024 · 9165b4a · 9165b4a
1 parent 877f3ce
commit 9165b4a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git 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<BindCommandArgs>(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
diff --git a/src/SLCore/SLCoreStrings.resx b/src/SLCore/SLCoreStrings.resx
@@ -179,6 +179,7 @@
   </data>
   <data name="UnknowProxyType" xml:space="preserve">
     <value>Proxy type can not be determined from scheme '{0}'. Returning HTTP proxy type.</value>
+  </data>
   <data name="CompilationDatabaseNotFound" xml:space="preserve">
     <value>[SLCoreAnalyzer] No compilation database found for file: {0}. Check that the file is part of a supported project type in the current solution.</value>
   </data>
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,7 +112,6 @@ public async Task BindAsync_CallsBindingProcessInOrder() @@
             {
                 bindingProcessFactory.Create(Arg.Is<BindCommandArgs>(b => b.ProjectToBind == AnyBoundProject));
                 bindingProcess.DownloadQualityProfileAsync(null, cancellationToken);
-                bindingProcess.SaveServerExclusionsAsync(cancellationToken);
             });
         }
@@ Expand Down @@