Merge pull request #51 from Drawaes/ServerRefactor

Server refactor

CondenserDotNet.sln

@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Routing", "samples\Routing\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CondenserDotNet.Core", "src\CondenserDotNet.Core\CondenserDotNet.Core.csproj", "{25408E8E-979D-4A36-84EC-F778FEE284CF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CondenserDotNet.Server.WindowsAuthentication", "src\CondenserDotNet.Server.WindowsAuthentication\CondenserDotNet.Server.WindowsAuthentication.csproj", "{626B872C-8A5A-40CB-8F12-2BA8CC9337B5}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RoutingWithWindowsAuth", "samples\RoutingWithWindowsAuth\RoutingWithWindowsAuth.csproj", "{E6E9E36F-1A81-4C1D-8313-ABD21BC4A980}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "script", "script", "{09EDB6E2-E430-462F-BFE8-F38681ABCAD5}"
@@ -52,20 +50,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsocketSampleServer", "sa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PocWebsocketsSupport", "samples\PocWebsocketsSupport\PocWebsocketsSupport.csproj", "{D2ED418F-3B61-4B92-8F4A-37FA96D0BB1B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CondenserDotNet.Server.Websockets", "src\CondenserDotNet.Server.Websockets\CondenserDotNet.Server.Websockets.csproj", "{30143ABB-576F-4108-BFC8-420D1492B0DB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CondenserDotNet.Server.HttpPipelineClient", "src\CondenserDotNet.Server.HttpPipelineClient\CondenserDotNet.Server.HttpPipelineClient.csproj", "{27056898-07EF-4BE6-A2A3-B396BEAF1B09}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CondenserDotNet.Configuration", "src\CondenserDotNet.Configuration\CondenserDotNet.Configuration.csproj", "{6850B566-5210-4234-B9F6-6F543B73ED05}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CondenserDotNet.Server.Extensions", "src\CondenserDotNet.Server.Extensions\CondenserDotNet.Server.Extensions.csproj", "{99180374-30F2-43A2-B040-3EAA36B59227}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CondenserDotNet.ProtocolSwitcher", "src\CondenserDotNet.ProtocolSwitcher\CondenserDotNet.ProtocolSwitcher.csproj", "{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtocolSwitchingTest", "samples\ProtocolSwitchingTest\ProtocolSwitchingTest.csproj", "{6FA1CF9F-FEB3-4275-AA3B-6F7C2273B51E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CondenserDotNet.Middleware", "src\CondenserDotNet.Middleware\CondenserDotNet.Middleware.csproj", "{97225C52-1E71-4EAC-B1D8-A67D746C5D31}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CondenserDotNet.Middleware.Pipelines", "src\CondenserDotNet.Middleware.Pipelines\CondenserDotNet.Middleware.Pipelines.csproj", "{411FFD0F-5117-45E3-8344-86B551067547}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -172,18 +166,6 @@ Global
 		{25408E8E-979D-4A36-84EC-F778FEE284CF}.Release|x64.Build.0 = Release|x64
 		{25408E8E-979D-4A36-84EC-F778FEE284CF}.Release|x86.ActiveCfg = Release|x86
 		{25408E8E-979D-4A36-84EC-F778FEE284CF}.Release|x86.Build.0 = Release|x86
-		{626B872C-8A5A-40CB-8F12-2BA8CC9337B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{626B872C-8A5A-40CB-8F12-2BA8CC9337B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{626B872C-8A5A-40CB-8F12-2BA8CC9337B5}.Debug|x64.ActiveCfg = Debug|x64
-		{626B872C-8A5A-40CB-8F12-2BA8CC9337B5}.Debug|x64.Build.0 = Debug|x64
-		{626B872C-8A5A-40CB-8F12-2BA8CC9337B5}.Debug|x86.ActiveCfg = Debug|x86
-		{626B872C-8A5A-40CB-8F12-2BA8CC9337B5}.Debug|x86.Build.0 = Debug|x86
-		{626B872C-8A5A-40CB-8F12-2BA8CC9337B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{626B872C-8A5A-40CB-8F12-2BA8CC9337B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{626B872C-8A5A-40CB-8F12-2BA8CC9337B5}.Release|x64.ActiveCfg = Release|x64
-		{626B872C-8A5A-40CB-8F12-2BA8CC9337B5}.Release|x64.Build.0 = Release|x64
-		{626B872C-8A5A-40CB-8F12-2BA8CC9337B5}.Release|x86.ActiveCfg = Release|x86
-		{626B872C-8A5A-40CB-8F12-2BA8CC9337B5}.Release|x86.Build.0 = Release|x86
 		{E6E9E36F-1A81-4C1D-8313-ABD21BC4A980}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E6E9E36F-1A81-4C1D-8313-ABD21BC4A980}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E6E9E36F-1A81-4C1D-8313-ABD21BC4A980}.Debug|x64.ActiveCfg = Debug|x64
@@ -232,30 +214,6 @@ Global
 		{D2ED418F-3B61-4B92-8F4A-37FA96D0BB1B}.Release|x64.Build.0 = Release|x64
 		{D2ED418F-3B61-4B92-8F4A-37FA96D0BB1B}.Release|x86.ActiveCfg = Release|x86
 		{D2ED418F-3B61-4B92-8F4A-37FA96D0BB1B}.Release|x86.Build.0 = Release|x86
-		{30143ABB-576F-4108-BFC8-420D1492B0DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30143ABB-576F-4108-BFC8-420D1492B0DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30143ABB-576F-4108-BFC8-420D1492B0DB}.Debug|x64.ActiveCfg = Debug|x64
-		{30143ABB-576F-4108-BFC8-420D1492B0DB}.Debug|x64.Build.0 = Debug|x64
-		{30143ABB-576F-4108-BFC8-420D1492B0DB}.Debug|x86.ActiveCfg = Debug|x86
-		{30143ABB-576F-4108-BFC8-420D1492B0DB}.Debug|x86.Build.0 = Debug|x86
-		{30143ABB-576F-4108-BFC8-420D1492B0DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{30143ABB-576F-4108-BFC8-420D1492B0DB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{30143ABB-576F-4108-BFC8-420D1492B0DB}.Release|x64.ActiveCfg = Release|x64
-		{30143ABB-576F-4108-BFC8-420D1492B0DB}.Release|x64.Build.0 = Release|x64
-		{30143ABB-576F-4108-BFC8-420D1492B0DB}.Release|x86.ActiveCfg = Release|x86
-		{30143ABB-576F-4108-BFC8-420D1492B0DB}.Release|x86.Build.0 = Release|x86
-		{27056898-07EF-4BE6-A2A3-B396BEAF1B09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27056898-07EF-4BE6-A2A3-B396BEAF1B09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27056898-07EF-4BE6-A2A3-B396BEAF1B09}.Debug|x64.ActiveCfg = Debug|x64
-		{27056898-07EF-4BE6-A2A3-B396BEAF1B09}.Debug|x64.Build.0 = Debug|x64
-		{27056898-07EF-4BE6-A2A3-B396BEAF1B09}.Debug|x86.ActiveCfg = Debug|x86
-		{27056898-07EF-4BE6-A2A3-B396BEAF1B09}.Debug|x86.Build.0 = Debug|x86
-		{27056898-07EF-4BE6-A2A3-B396BEAF1B09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27056898-07EF-4BE6-A2A3-B396BEAF1B09}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27056898-07EF-4BE6-A2A3-B396BEAF1B09}.Release|x64.ActiveCfg = Release|x64
-		{27056898-07EF-4BE6-A2A3-B396BEAF1B09}.Release|x64.Build.0 = Release|x64
-		{27056898-07EF-4BE6-A2A3-B396BEAF1B09}.Release|x86.ActiveCfg = Release|x86
-		{27056898-07EF-4BE6-A2A3-B396BEAF1B09}.Release|x86.Build.0 = Release|x86
 		{6850B566-5210-4234-B9F6-6F543B73ED05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6850B566-5210-4234-B9F6-6F543B73ED05}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6850B566-5210-4234-B9F6-6F543B73ED05}.Debug|x64.ActiveCfg = Debug|x64
@@ -280,18 +238,6 @@ Global
 		{99180374-30F2-43A2-B040-3EAA36B59227}.Release|x64.Build.0 = Release|x64
 		{99180374-30F2-43A2-B040-3EAA36B59227}.Release|x86.ActiveCfg = Release|x86
 		{99180374-30F2-43A2-B040-3EAA36B59227}.Release|x86.Build.0 = Release|x86
-		{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B}.Debug|x64.ActiveCfg = Debug|x64
-		{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B}.Debug|x64.Build.0 = Debug|x64
-		{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B}.Debug|x86.ActiveCfg = Debug|x86
-		{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B}.Debug|x86.Build.0 = Debug|x86
-		{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B}.Release|x64.ActiveCfg = Release|x64
-		{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B}.Release|x64.Build.0 = Release|x64
-		{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B}.Release|x86.ActiveCfg = Release|x86
-		{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B}.Release|x86.Build.0 = Release|x86
 		{6FA1CF9F-FEB3-4275-AA3B-6F7C2273B51E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6FA1CF9F-FEB3-4275-AA3B-6F7C2273B51E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6FA1CF9F-FEB3-4275-AA3B-6F7C2273B51E}.Debug|x64.ActiveCfg = Debug|x64
@@ -316,6 +262,18 @@ Global
 		{97225C52-1E71-4EAC-B1D8-A67D746C5D31}.Release|x64.Build.0 = Release|x64
 		{97225C52-1E71-4EAC-B1D8-A67D746C5D31}.Release|x86.ActiveCfg = Release|x86
 		{97225C52-1E71-4EAC-B1D8-A67D746C5D31}.Release|x86.Build.0 = Release|x86
+		{411FFD0F-5117-45E3-8344-86B551067547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{411FFD0F-5117-45E3-8344-86B551067547}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{411FFD0F-5117-45E3-8344-86B551067547}.Debug|x64.ActiveCfg = Debug|x64
+		{411FFD0F-5117-45E3-8344-86B551067547}.Debug|x64.Build.0 = Debug|x64
+		{411FFD0F-5117-45E3-8344-86B551067547}.Debug|x86.ActiveCfg = Debug|x86
+		{411FFD0F-5117-45E3-8344-86B551067547}.Debug|x86.Build.0 = Debug|x86
+		{411FFD0F-5117-45E3-8344-86B551067547}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{411FFD0F-5117-45E3-8344-86B551067547}.Release|Any CPU.Build.0 = Release|Any CPU
+		{411FFD0F-5117-45E3-8344-86B551067547}.Release|x64.ActiveCfg = Release|x64
+		{411FFD0F-5117-45E3-8344-86B551067547}.Release|x64.Build.0 = Release|x64
+		{411FFD0F-5117-45E3-8344-86B551067547}.Release|x86.ActiveCfg = Release|x86
+		{411FFD0F-5117-45E3-8344-86B551067547}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -329,17 +287,14 @@ Global
 		{C4224D81-0A55-4693-8184-4D00C8BB5E3B} = {35C5514B-9E50-4AC6-BC6E-45BEAE7B7B4D}
 		{BD511C62-B3F6-4652-9C46-A59BE8F3EF99} = {35C5514B-9E50-4AC6-BC6E-45BEAE7B7B4D}
 		{25408E8E-979D-4A36-84EC-F778FEE284CF} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
-		{626B872C-8A5A-40CB-8F12-2BA8CC9337B5} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
 		{E6E9E36F-1A81-4C1D-8313-ABD21BC4A980} = {35C5514B-9E50-4AC6-BC6E-45BEAE7B7B4D}
 		{0AFB9686-4548-404E-A937-52CFC447053C} = {35C5514B-9E50-4AC6-BC6E-45BEAE7B7B4D}
 		{A968DC7F-EDDB-427A-BA83-C1F1474E554D} = {35C5514B-9E50-4AC6-BC6E-45BEAE7B7B4D}
 		{D2ED418F-3B61-4B92-8F4A-37FA96D0BB1B} = {35C5514B-9E50-4AC6-BC6E-45BEAE7B7B4D}
-		{30143ABB-576F-4108-BFC8-420D1492B0DB} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
-		{27056898-07EF-4BE6-A2A3-B396BEAF1B09} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
 		{6850B566-5210-4234-B9F6-6F543B73ED05} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
 		{99180374-30F2-43A2-B040-3EAA36B59227} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
-		{BE7F37A8-F84E-4DF9-B5C9-20E377EBDD8B} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
 		{6FA1CF9F-FEB3-4275-AA3B-6F7C2273B51E} = {35C5514B-9E50-4AC6-BC6E-45BEAE7B7B4D}
 		{97225C52-1E71-4EAC-B1D8-A67D746C5D31} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
+		{411FFD0F-5117-45E3-8344-86B551067547} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
 	EndGlobalSection
 EndGlobal

appveyor.yml

@@ -26,13 +26,13 @@ after_test:
   # Build and pack source
   - ps: iex ((Get-ChildItem ($env:USERPROFILE + '\.nuget\packages\OpenCover'))[0].FullName + '\tools\OpenCover.Console.exe' + ' -register:user -target:".\script\runtests.bat" -searchdirs:"..\test\Condenser.Tests.Integration\bin\Debug\netcoreapp1.1;..\test\CondenserTests\bin\debug\netcoreapp1.1" -oldstyle -output:coverage.xml -skipautoprops -returntargetcode -filter:"+[Condenser*]* -[*Test*]*"')
   - ps: iex ((Get-ChildItem ($env:USERPROFILE + '\.nuget\packages\coveralls.io'))[0].FullName + '\tools\coveralls.net.exe' + ' --opencover coverage.xml')
+
   - dotnet build -c Release
   - dotnet pack -c Release src/CondenserDotNet.Client --version-suffix %suffix%
   - dotnet pack -c Release src/CondenserDotNet.Server --version-suffix %suffix%
   - dotnet pack -c Release src/CondenserDotNet.Core --version-suffix %suffix%
   - dotnet pack -c Release src/CondenserDotNet.Configuration --version-suffix %suffix%
-  - dotnet pack -c Release src/CondenserDotNet.ProtocolSwitcher --version-suffix %suffix%
-  - dotnet pack -c Release src/CondenserDotNet.Server.WindowsAuthentication --version-suffix %suffix%
+  - dotnet pack -c Release src/CondenserDotNet.Middleware --version-suffix %suffix%
 
 artifacts:
   path: '**/*.nupkg'

samples/PocWebsocketsSupport/PocWebsocketsSupport.csproj

@@ -11,11 +11,10 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\CondenserDotNet.Core\CondenserDotNet.Core.csproj" />
+    <ProjectReference Include="..\..\src\CondenserDotNet.Middleware.Pipelines\CondenserDotNet.Middleware.Pipelines.csproj" />
+    <ProjectReference Include="..\..\src\CondenserDotNet.Middleware\CondenserDotNet.Middleware.csproj" />
     <ProjectReference Include="..\..\src\CondenserDotNet.Server.Extensions\CondenserDotNet.Server.Extensions.csproj" />
-    <ProjectReference Include="..\..\src\CondenserDotNet.Server.HttpPipelineClient\CondenserDotNet.Server.HttpPipelineClient.csproj" />
-    <ProjectReference Include="..\..\src\CondenserDotNet.Server.Websockets\CondenserDotNet.Server.Websockets.csproj" />
     <ProjectReference Include="..\..\src\CondenserDotNet.Server\CondenserDotNet.Server.csproj" />
-    <ProjectReference Include="..\..\src\CondenserDotNet.Server.WindowsAuthentication\CondenserDotNet.Server.WindowsAuthentication.csproj" />
     <PackageReference Include="System.IO.Pipelines" Version="0.1.0-e170223-1" />
   </ItemGroup>
 

samples/PocWebsocketsSupport/Program.cs

@@ -1,5 +1,5 @@
 using System;
-using CondenserDotNet.Server.WindowsAuthentication;
+using CondenserDotNet.Middleware.WindowsAuthentication;
 using Microsoft.AspNetCore.Hosting;
 
 namespace PocWebsocketsSupport

samples/PocWebsocketsSupport/Startup.cs

@@ -6,15 +6,14 @@
 using CondenserDotNet.Core;
 using CondenserDotNet.Core.Routing;
 using CondenserDotNet.Server;
-using CondenserDotNet.Server.HttpPipelineClient;
 using CondenserDotNet.Server.RoutingTrie;
-using CondenserDotNet.Server.Websockets;
-using CondenserDotNet.Server.WindowsAuthentication;
+using CondenserDotNet.Middleware.WindowsAuthentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using CondenserDotNet.Middleware.Pipelines;
 
 namespace PocWebsocketsSupport
 {

samples/ProtocolSwitchingTest/GlobalSuppressions.cs

@@ -0,0 +1,9 @@
+
+// This file is used by Code Analysis to maintain SuppressMessage 
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given 
+// a specific target and scoped to a namespace, type, member, etc.
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Sonar Code Smell", "S1172:Unused method parameters should be removed", Justification = "<Pending>", Scope = "member", Target = "~M:ProtocolSwitchingTest.Program.Main(System.String[])")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Sonar Code Smell", "S1118:Utility classes should not have public constructors", Justification = "<Pending>", Scope = "type", Target = "~T:ProtocolSwitchingTest.Program")]
+

samples/ProtocolSwitchingTest/Program.cs

@@ -1,5 +1,5 @@
 using System;
-using CondenserDotNet.ProtocolSwitcher;
+using CondenserDotNet.Middleware.ProtocolSwitcher;
 using Microsoft.AspNetCore.Hosting;
 
 namespace ProtocolSwitchingTest

samples/ProtocolSwitchingTest/ProtocolSwitchingTest.csproj

@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\CondenserDotNet.ProtocolSwitcher\CondenserDotNet.ProtocolSwitcher.csproj" />
+    <ProjectReference Include="..\..\src\CondenserDotNet.Middleware\CondenserDotNet.Middleware.csproj" />
   </ItemGroup>
 
   <ItemGroup>

samples/ProtocolSwitchingTest/Startup.cs

@@ -9,10 +9,6 @@ namespace ProtocolSwitchingTest
 {
     public class Startup
     {
-        public void ConfigureServices(IServiceCollection services)
-        {
-        }
-
         public void Configure(IApplicationBuilder app)
         {
             app.Use(async (context, next) =>

samples/RoutingWithWindowsAuth/Program.cs

@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using CondenserDotNet.Server.DataContracts;
 using CondenserDotNet.Server.Extensions;
-using CondenserDotNet.Server.WindowsAuthentication;
+using CondenserDotNet.Middleware.WindowsAuthentication;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;
 

samples/RoutingWithWindowsAuth/RoutingWithWindowsAuth.csproj

@@ -12,9 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\src\CondenserDotNet.Middleware\CondenserDotNet.Middleware.csproj" />
     <ProjectReference Include="..\..\src\CondenserDotNet.Server.Extensions\CondenserDotNet.Server.Extensions.csproj" />
     <ProjectReference Include="..\..\src\CondenserDotNet.Server\CondenserDotNet.Server.csproj" />
-    <ProjectReference Include="..\..\src\CondenserDotNet.Server.WindowsAuthentication\CondenserDotNet.Server.WindowsAuthentication.csproj" />
   </ItemGroup>
 
   <ItemGroup>

samples/ServiceRegistration/Controllers/SomeController.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using CondenserDotNet.Middleware;
+using CondenserDotNet.Middleware.TrailingHeaders;
 using Microsoft.AspNetCore.Mvc;
 
 namespace ServiceRegistration.Controllers

samples/ServiceRegistration/Startup.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using CondenserDotNet.Client;
-using CondenserDotNet.Middleware;
+using CondenserDotNet.Middleware.TrailingHeaders;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.Extensions.DependencyInjection;
@@ -16,13 +16,11 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc();
             services.AddRouting();
-            //services.AddConsulServices();
         }
 
-        public void Configure(IApplicationBuilder app) //, IServiceManager manager)
-        {
+        public void Configure(IApplicationBuilder app)
+        { 
             app.UseMiddleware<TrailingHeadersMiddleware>();
-            //manager.AddHttpHealthCheck("/health",5).AddApiUrl("/testSample/test3/test1").RegisterServiceAsync().Wait();
             app.UseMvcWithDefaultRoute();
         }
     }

src/CondenserDotNet.Server.Websockets/GlobalSuppressions.cs → samples/WebsocketClient/GlobalSuppressions.cs

@@ -4,5 +4,5 @@
 // Project-level suppressions either have no target or are given 
 // a specific target and scoped to a namespace, type, member, etc.
 
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Sonar Code Smell", "S1450:Private fields only used as local variables in methods should become local variables", Justification = "<Pending>", Scope = "member", Target = "~F:CondenserDotNet.Server.Websockets.WebsocketMiddleware._logger")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Sonar Code Smell", "S1118:Utility classes should not have public constructors", Justification = "<Pending>", Scope = "type", Target = "~T:WebsocketClient.Program")]
 

src/CondenserDotNet.Configuration/GlobalSuppressions.cs

@@ -5,4 +5,6 @@
 // a specific target and scoped to a namespace, type, member, etc.
 
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Sonar Code Smell", "S1481:Unused local variables should be removed", Justification = "<Pending>", Scope = "member", Target = "~M:CondenserDotNet.Configuration.Consul.ConsulRegistry.AddUpdatingPathAsync(System.String)~System.Threading.Tasks.Task")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Sonar Code Smell", "S1450:Private fields only used as local variables in methods should become local variables", Justification = "<Pending>", Scope = "member", Target = "~F:CondenserDotNet.Configuration.ConfigurationRegistryProvider._configurationRegistry")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Sonar Code Smell", "S1450:Private fields only used as local variables in methods should become local variables", Justification = "<Pending>", Scope = "member", Target = "~F:CondenserDotNet.Configuration.Consul.JsonKeyValueParser._data")]
 

src/CondenserDotNet.Server.HttpPipelineClient/CondenserDotNet.Server.HttpPipelineClient.csproj → src/CondenserDotNet.Middleware.Pipelines/CondenserDotNet.Middleware.Pipelines.csproj

@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AssemblyName>CondenserDotNet.Server.HttpPipelineClient</AssemblyName>
-    <PackageId>CondenserDotNet.Server.HttpPipelineClient</PackageId>
+    <AssemblyName>CondenserDotNet.Middleware.Pipelines</AssemblyName>
+    <PackageId>CondenserDotNet.Middleware.Pipelines</PackageId>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="$(AspNetVersion)" />