Skip to content

Commit

Permalink
Adding SonarSource/sonarqube-webclient-dotnet as submodule, updating …
Browse files Browse the repository at this point in the history 
…VS2017 solution
  • Loading branch information
@duncanp-sonar
Valeri Hristov authored and duncanp-sonar committed Feb 7, 2019
1 parent f47a694 commit db95f89
Show file tree
Hide file tree
Showing 37 changed files with 68 additions and 36 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
@@ -0,0 +1,3 @@
[submodule "sonarqube-webclient"]
path = sonarqube-webclient
url = https://github.com/SonarSource/sonarqube-webclient-dotnet
13 changes: 13 additions & 0 deletions SonarLint.VisualStudio.Integration.2017.sln
View file
Expand Up @@ -42,6 +42,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SonarQube", "SonarQube", "{
src\SonarLint.xml = src\SonarLint.xml
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SonarQube.Client", "sonarqube-webclient\SonarQube.Client\SonarQube.Client.csproj", "{5E513FC3-BDA7-40F2-8B6A-1BB9372ACB99}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SonarQube.Client.Tests", "sonarqube-webclient\SonarQube.Client.Tests\SonarQube.Client.Tests.csproj", "{8FEFDB82-CBDB-4B52-B221-BB604DFD60E6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -92,6 +96,14 @@ Global
{33315FCB-3D07-4177-944E-AA45CC3C5539}.Debug|Any CPU.Build.0 = Debug|Any CPU
{33315FCB-3D07-4177-944E-AA45CC3C5539}.Release|Any CPU.ActiveCfg = Release|Any CPU
{33315FCB-3D07-4177-944E-AA45CC3C5539}.Release|Any CPU.Build.0 = Release|Any CPU
{5E513FC3-BDA7-40F2-8B6A-1BB9372ACB99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E513FC3-BDA7-40F2-8B6A-1BB9372ACB99}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E513FC3-BDA7-40F2-8B6A-1BB9372ACB99}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E513FC3-BDA7-40F2-8B6A-1BB9372ACB99}.Release|Any CPU.Build.0 = Release|Any CPU
{8FEFDB82-CBDB-4B52-B221-BB604DFD60E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8FEFDB82-CBDB-4B52-B221-BB604DFD60E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8FEFDB82-CBDB-4B52-B221-BB604DFD60E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8FEFDB82-CBDB-4B52-B221-BB604DFD60E6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -104,6 +116,7 @@ Global
{FBD8024A-9795-4E5B-938E-AFE44FCA240C} = {9CF012C2-0303-4643-A5E2-0A45AFE4DBD5}
{AB7A8888-EF8B-4F6D-8005-398744A60BA2} = {9CF012C2-0303-4643-A5E2-0A45AFE4DBD5}
{33315FCB-3D07-4177-944E-AA45CC3C5539} = {9CF012C2-0303-4643-A5E2-0A45AFE4DBD5}
{8FEFDB82-CBDB-4B52-B221-BB604DFD60E6} = {9CF012C2-0303-4643-A5E2-0A45AFE4DBD5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {EDA12FFD-9FED-4677-A517-DDDAF6A44817}
Expand Down
1 change: 1 addition & 0 deletions sonarqube-webclient
Submodule sonarqube-webclient added at 9cee1b
2 changes: 1 addition & 1 deletion src/Integration.UnitTests/Binding/BindingControllerTests.cs
View file
Expand Up @@ -38,7 +38,7 @@
using SonarLint.VisualStudio.Integration.WPF;
using SonarLint.VisualStudio.Progress.Controller;
using SonarQube.Client.Models;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests.Binding
{
Expand Down
2 changes: 1 addition & 1 deletion src/Integration.UnitTests/Binding/BindingWorkflowTests.cs
View file
Expand Up @@ -41,7 +41,7 @@
using SonarLint.VisualStudio.Progress.Controller;
using SonarQube.Client.Messages;
using SonarQube.Client.Models;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests
{
Expand Down
4 changes: 2 additions & 2 deletions src/Integration.UnitTests/Connection/ConnectControllerTests.cs
View file
Expand Up @@ -30,7 +30,7 @@
using SonarLint.VisualStudio.Integration.Resources;
using SonarLint.VisualStudio.Progress.Controller;
using SonarQube.Client.Models;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests.Connection
{
Expand Down Expand Up @@ -322,4 +322,4 @@ public void ConnectionController_SetConnectionInProgress()

#endregion Tests
}
}
}
2 changes: 1 addition & 1 deletion src/Integration.UnitTests/Connection/ConnectionWorkflowTests.cs
View file
Expand Up @@ -39,7 +39,7 @@
using SonarLint.VisualStudio.Integration.WPF;
using SonarQube.Client.Helpers;
using SonarQube.Client.Models;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests.Connection
{
Expand Down
2 changes: 1 addition & 1 deletion ...tTests/LocalServices/ErrorListInfoBarController.QualityProfileBackgroundProcessorTests.cs
View file
Expand Up @@ -33,7 +33,7 @@
using SonarLint.VisualStudio.Integration.Persistence;
using SonarLint.VisualStudio.Integration.Resources;
using SonarQube.Client.Models;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests
{
Expand Down
4 changes: 2 additions & 2 deletions src/Integration.UnitTests/MefServices/ActiveSolutionBoundTrackerTests.cs
View file
Expand Up @@ -32,7 +32,7 @@
using SonarLint.VisualStudio.Integration.NewConnectedMode;
using SonarLint.VisualStudio.Integration.Persistence;
using SonarQube.Client.Models;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests
{
Expand Down Expand Up @@ -518,4 +518,4 @@ private void VerifyServiceDisconnect(Times expected)
sonarQubeServiceMock.Verify(disconnectMethod, expected);
}
}
}
}
2 changes: 1 addition & 1 deletion src/Integration.UnitTests/MefServices/VsSessionHostTests.cs
View file
Expand Up @@ -31,7 +31,7 @@
using SonarLint.VisualStudio.Integration.TeamExplorer;
using SonarLint.VisualStudio.Integration.WPF;
using SonarQube.Client.Models;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests.TeamExplorer
{
Expand Down
2 changes: 1 addition & 1 deletion src/Integration.UnitTests/Notifications/SonarQubeNotificationServiceTests.cs
View file
Expand Up @@ -28,7 +28,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using SonarQube.Client.Models;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.Notifications.UnitTests
{
Expand Down
2 changes: 1 addition & 1 deletion src/Integration.UnitTests/Rules/QualityProfileProviderCachingDecoratorTests.cs
View file
Expand Up @@ -28,7 +28,7 @@
using Moq;
using SonarLint.VisualStudio.Integration.Persistence;
using SonarLint.VisualStudio.Integration.Rules;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests.Rules
{
Expand Down
2 changes: 1 addition & 1 deletion src/Integration.UnitTests/Rules/SonarQubeQualityProfileProviderTests.cs
View file
Expand Up @@ -30,7 +30,7 @@
using SonarLint.VisualStudio.Integration.Rules;
using SonarQube.Client.Messages;
using SonarQube.Client.Models;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests.Rules
{
Expand Down
2 changes: 1 addition & 1 deletion src/Integration.UnitTests/Suppression/SonarQubeIssuesProviderTests.cs
View file
Expand Up @@ -28,7 +28,7 @@
using Moq;
using SonarLint.VisualStudio.Integration.Suppression;
using SonarQube.Client.Models;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests.Suppression
{
Expand Down
2 changes: 1 addition & 1 deletion src/Integration.UnitTests/TeamExplorer/SectionControllerTests.cs
View file
Expand Up @@ -31,7 +31,7 @@
using SonarLint.VisualStudio.Integration.TeamExplorer;
using SonarLint.VisualStudio.Integration.WPF;
using SonarQube.Client.Models;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests.TeamExplorer
{
Expand Down
4 changes: 4 additions & 0 deletions src/Integration.UnitTests_2017/Integration.UnitTests.csproj
View file
Expand Up @@ -265,6 +265,10 @@
</AdditionalFiles>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\sonarqube-webclient\SonarQube.Client\SonarQube.Client.csproj">
<Project>{5e513fc3-bda7-40f2-8b6a-1bb9372acb99}</Project>
<Name>SonarQube.Client</Name>
</ProjectReference>
<ProjectReference Include="..\Integration_2017\Integration.csproj">
<Project>{03278c1a-ee78-4fa7-a5b0-1ab0a81ea76f}</Project>
<Name>Integration</Name>
Expand Down
2 changes: 1 addition & 1 deletion src/Integration.Vsix.UnitTests/Delegates/SonarAnalyzerManagerTests.cs
View file
Expand Up @@ -30,7 +30,7 @@
using SonarLint.VisualStudio.Integration.NewConnectedMode;
using SonarLint.VisualStudio.Integration.Persistence;
using SonarLint.VisualStudio.Integration.Vsix;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests
{
Expand Down
4 changes: 4 additions & 0 deletions src/Integration.Vsix.UnitTests_2017/Integration.Vsix.UnitTests.csproj
View file
Expand Up @@ -334,6 +334,10 @@
</AdditionalFiles>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\sonarqube-webclient\SonarQube.Client\SonarQube.Client.csproj">
<Project>{5e513fc3-bda7-40f2-8b6a-1bb9372acb99}</Project>
<Name>SonarQube.Client</Name>
</ProjectReference>
<ProjectReference Include="..\Integration.Vsix_2017\Integration.Vsix.csproj">
<Project>{ff2ad819-28f4-493a-8e9b-1d3f16bd4689}</Project>
<Name>Integration.Vsix</Name>
Expand Down
2 changes: 1 addition & 1 deletion src/Integration.Vsix/Delegates/SonarAnalyzerManager.cs
View file
Expand Up @@ -27,7 +27,7 @@
using SonarLint.VisualStudio.Integration.NewConnectedMode;
using SonarLint.VisualStudio.Integration.Suppression;
using SonarLint.VisualStudio.Integration.Vsix.Suppression;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.Vsix
{
Expand Down
2 changes: 1 addition & 1 deletion src/Integration.Vsix/SonarLintIntegrationPackage.cs
View file
Expand Up @@ -29,7 +29,7 @@
using Microsoft.VisualStudio.Shell.Interop;
using SonarLint.VisualStudio.Integration.InfoBar;
using SonarLint.VisualStudio.Integration.TeamExplorer;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.Vsix
{
Expand Down
2 changes: 1 addition & 1 deletion src/Integration.Vsix/SonarLintNotificationsPackage.cs
View file
Expand Up @@ -31,7 +31,7 @@
using Microsoft.VisualStudio.Shell.Interop;
using SonarLint.VisualStudio.Integration.NewConnectedMode;
using SonarLint.VisualStudio.Integration.Notifications;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.Vsix
{
Expand Down
4 changes: 4 additions & 0 deletions src/Integration.Vsix_2017/Integration.Vsix.csproj
View file
Expand Up @@ -522,6 +522,10 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\sonarqube-webclient\SonarQube.Client\SonarQube.Client.csproj">
<Project>{5e513fc3-bda7-40f2-8b6a-1bb9372acb99}</Project>
<Name>SonarQube.Client</Name>
</ProjectReference>
<ProjectReference Include="..\Integration_2017\Integration.csproj">
<Project>{03278c1a-ee78-4fa7-a5b0-1ab0a81ea76f}</Project>
<Name>Integration</Name>
Expand Down
1 change: 0 additions & 1 deletion src/Integration/Connection/ConnectionWorkflow.cs
View file
Expand Up @@ -31,7 +31,6 @@
using System.Windows.Input;
using Microsoft.Alm.Authentication;
using SonarLint.VisualStudio.Integration.Connection.UI;
using SonarLint.VisualStudio.Integration.Persistence;
using SonarLint.VisualStudio.Integration.Progress;
using SonarLint.VisualStudio.Integration.Resources;
using SonarLint.VisualStudio.Integration.Service;
Expand Down
2 changes: 1 addition & 1 deletion src/Integration/MefServices/ActiveSolutionBoundTracker.cs
View file
Expand Up @@ -26,7 +26,7 @@
using SonarLint.VisualStudio.Integration.NewConnectedMode;
using SonarLint.VisualStudio.Integration.Persistence;
using SonarLint.VisualStudio.Integration.State;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration
{
Expand Down
2 changes: 1 addition & 1 deletion src/Integration/MefServices/IHost.cs
View file
Expand Up @@ -23,7 +23,7 @@
using System.Windows.Threading;
using SonarLint.VisualStudio.Integration.State;
using SonarLint.VisualStudio.Integration.TeamExplorer;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration
{
Expand Down
6 changes: 2 additions & 4 deletions src/Integration/MefServices/MefSonarQubeService.cs
View file
Expand Up @@ -25,8 +25,7 @@
using SonarLint.VisualStudio.Integration.Service;
using SonarQube.Client;
using SonarQube.Client.Api;
using SonarQube.Client.Api.Requests;
using SonarQube.Client.Services;
using SonarQube.Client.Requests;

namespace SonarLint.VisualStudio.Integration.MefServices
{
Expand All @@ -42,13 +41,12 @@ public class MefSonarQubeService : SonarQubeService
[ImportingConstructor]
public MefSonarQubeService(ILogger logger)
: base(new HttpClientHandler(),
requestFactory: DefaultConfiguration.Configure(new RequestFactory(new LoggerAdapter(logger))),
userAgent: $"SonarLint Visual Studio/{VersionHelper.SonarLintVersion}",
logger: new LoggerAdapter(logger))
{
}

private class LoggerAdapter : SonarQube.Client.Helpers.ILogger
private class LoggerAdapter : SonarQube.Client.Logging.ILogger
{
private readonly ILogger logger;

Expand Down
2 changes: 1 addition & 1 deletion src/Integration/MefServices/VsSessionHost.cs
View file
Expand Up @@ -34,7 +34,7 @@
using SonarLint.VisualStudio.Integration.Progress;
using SonarLint.VisualStudio.Integration.State;
using SonarLint.VisualStudio.Integration.TeamExplorer;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration
{
Expand Down
1 change: 0 additions & 1 deletion src/Integration/NewConnectedMode/ConfigurationSerializer.cs
View file
Expand Up @@ -20,7 +20,6 @@

using System;
using System.IO;
using Microsoft.Alm.Authentication;
using Microsoft.VisualStudio.Shell.Interop;
using SonarLint.VisualStudio.Integration.Helpers;
using SonarLint.VisualStudio.Integration.Persistence;
Expand Down
2 changes: 1 addition & 1 deletion src/Integration/Notifications/SonarQubeNotificationService.cs
View file
Expand Up @@ -23,7 +23,7 @@
using System.Linq;
using System.Threading.Tasks;
using SonarLint.VisualStudio.Integration.Resources;
using SonarQube.Client.Services;
using SonarQube.Client;
using CancellationTokenSource = System.Threading.CancellationTokenSource;

namespace SonarLint.VisualStudio.Integration.Notifications
Expand Down
1 change: 0 additions & 1 deletion src/Integration/Persistence/SolutionBindingSerializer.cs
View file
Expand Up @@ -22,7 +22,6 @@
using System.Diagnostics;
using System.IO;
using EnvDTE;
using Microsoft.Alm.Authentication;
using SonarLint.VisualStudio.Integration.Helpers;

namespace SonarLint.VisualStudio.Integration.Persistence
Expand Down
2 changes: 1 addition & 1 deletion src/Integration/Rules/QualityProfileProviderCachingDecorator.cs
View file
Expand Up @@ -24,7 +24,7 @@
using System.Threading;
using System.Threading.Tasks;
using SonarLint.VisualStudio.Integration.Persistence;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.Rules
{
Expand Down
2 changes: 1 addition & 1 deletion src/Integration/Rules/SonarQubeQualityProfileProvider.cs
View file
Expand Up @@ -25,7 +25,7 @@
using SonarLint.VisualStudio.Integration.Persistence;
using SonarLint.VisualStudio.Integration.Resources;
using SonarQube.Client.Messages;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.Rules
{
Expand Down
2 changes: 1 addition & 1 deletion src/Integration/Suppression/SonarQubeIssuesProvider.cs
View file
Expand Up @@ -26,7 +26,7 @@
using System.Threading;
using System.Threading.Tasks;
using SonarQube.Client.Models;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.Suppression
{
Expand Down
4 changes: 4 additions & 0 deletions src/Integration_2017/Integration.csproj
View file
Expand Up @@ -253,6 +253,10 @@
</AdditionalFiles>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\sonarqube-webclient\SonarQube.Client\SonarQube.Client.csproj">
<Project>{5e513fc3-bda7-40f2-8b6a-1bb9372acb99}</Project>
<Name>SonarQube.Client</Name>
</ProjectReference>
<ProjectReference Include="..\Progress\Progress.csproj">
<Project>{140a6fe4-c8f7-4af7-b4c8-eeeae4e0b1a4}</Project>
<Name>Progress</Name>
Expand Down
4 changes: 2 additions & 2 deletions src/TestInfrastructure/Framework/ConfigurableConnectionWorkflow.cs
View file
Expand Up @@ -24,7 +24,7 @@
using FluentAssertions;
using SonarLint.VisualStudio.Integration.Connection;
using SonarQube.Client.Models;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests
{
Expand Down Expand Up @@ -61,4 +61,4 @@ void IConnectionWorkflowExecutor.EstablishConnection(ConnectionInformation infor

#endregion IConnectionWorkflowExecutor
}
}
}
4 changes: 2 additions & 2 deletions src/TestInfrastructure/Framework/ConfigurableHost.cs
View file
Expand Up @@ -25,7 +25,7 @@
using FluentAssertions;
using SonarLint.VisualStudio.Integration.State;
using SonarLint.VisualStudio.Integration.TeamExplorer;
using SonarQube.Client.Services;
using SonarQube.Client;

namespace SonarLint.VisualStudio.Integration.UnitTests
{
Expand Down Expand Up @@ -122,4 +122,4 @@ public ConfigurableStateManager TestStateManager

#endregion Test helpers
}
}
}
4 changes: 4 additions & 0 deletions src/TestInfrastructure_2017/TestInfrastructure.csproj
View file
Expand Up @@ -353,6 +353,10 @@
</AdditionalFiles>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\sonarqube-webclient\SonarQube.Client\SonarQube.Client.csproj">
<Project>{5e513fc3-bda7-40f2-8b6a-1bb9372acb99}</Project>
<Name>SonarQube.Client</Name>
</ProjectReference>
<ProjectReference Include="..\Integration.Vsix_2017\Integration.Vsix.csproj">
<Project>{ff2ad819-28f4-493a-8e9b-1d3f16bd4689}</Project>
<Name>Integration.Vsix</Name>
Expand Down

0 comments on commit db95f89

Please sign in to comment.