Merge pull request #120 from Drawaes/AspNet3.0

Asp net3.0
Drawaes · Oct 2, 2019 · a9028ea · a9028ea
2 parents 8e8f0d9 + 77f5170
commit a9028ea
Show file tree

Hide file tree

Showing 79 changed files with 50 additions and 3,727 deletions.
diff --git a/CondenserDotNet.sln b/CondenserDotNet.sln
@@ -26,8 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CondenserTests", "test\Cond
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Condenser.Tests.Integration", "test\Condenser.Tests.Integration\Condenser.Tests.Integration.csproj", "{A7E55927-04D3-4EDB-B598-6754611DE8C6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CondenserDotNet.Server", "src\CondenserDotNet.Server\CondenserDotNet.Server.csproj", "{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CondenserDotNet.Core", "src\CondenserDotNet.Core\CondenserDotNet.Core.csproj", "{25408E8E-979D-4A36-84EC-F778FEE284CF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "script", "script", "{09EDB6E2-E430-462F-BFE8-F38681ABCAD5}"
@@ -38,8 +36,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "script", "script", "{09EDB6
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CondenserDotNet.Configuration", "src\CondenserDotNet.Configuration\CondenserDotNet.Configuration.csproj", "{6850B566-5210-4234-B9F6-6F543B73ED05}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CondenserDotNet.Server.Extensions", "src\CondenserDotNet.Server.Extensions\CondenserDotNet.Server.Extensions.csproj", "{99180374-30F2-43A2-B040-3EAA36B59227}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Release Notes", "Release Notes", "{06591E48-DAE7-4EEE-81C8-2469894B9EAF}"
 	ProjectSection(SolutionItems) = preProject
 		releasenotes\2.1.1.props = releasenotes\2.1.1.props
@@ -143,18 +139,6 @@ Global
 		{A7E55927-04D3-4EDB-B598-6754611DE8C6}.Release|x64.Build.0 = Release|Any CPU
 		{A7E55927-04D3-4EDB-B598-6754611DE8C6}.Release|x86.ActiveCfg = Release|Any CPU
 		{A7E55927-04D3-4EDB-B598-6754611DE8C6}.Release|x86.Build.0 = Release|Any CPU
-		{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Debug|x64.Build.0 = Debug|Any CPU
-		{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Debug|x86.Build.0 = Debug|Any CPU
-		{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Release|x64.ActiveCfg = Release|Any CPU
-		{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Release|x64.Build.0 = Release|Any CPU
-		{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Release|x86.ActiveCfg = Release|Any CPU
-		{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Release|x86.Build.0 = Release|Any CPU
 		{25408E8E-979D-4A36-84EC-F778FEE284CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25408E8E-979D-4A36-84EC-F778FEE284CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25408E8E-979D-4A36-84EC-F778FEE284CF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -179,18 +163,6 @@ Global
 		{6850B566-5210-4234-B9F6-6F543B73ED05}.Release|x64.Build.0 = Release|Any CPU
 		{6850B566-5210-4234-B9F6-6F543B73ED05}.Release|x86.ActiveCfg = Release|Any CPU
 		{6850B566-5210-4234-B9F6-6F543B73ED05}.Release|x86.Build.0 = Release|Any CPU
-		{99180374-30F2-43A2-B040-3EAA36B59227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99180374-30F2-43A2-B040-3EAA36B59227}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99180374-30F2-43A2-B040-3EAA36B59227}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{99180374-30F2-43A2-B040-3EAA36B59227}.Debug|x64.Build.0 = Debug|Any CPU
-		{99180374-30F2-43A2-B040-3EAA36B59227}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{99180374-30F2-43A2-B040-3EAA36B59227}.Debug|x86.Build.0 = Debug|Any CPU
-		{99180374-30F2-43A2-B040-3EAA36B59227}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99180374-30F2-43A2-B040-3EAA36B59227}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99180374-30F2-43A2-B040-3EAA36B59227}.Release|x64.ActiveCfg = Release|Any CPU
-		{99180374-30F2-43A2-B040-3EAA36B59227}.Release|x64.Build.0 = Release|Any CPU
-		{99180374-30F2-43A2-B040-3EAA36B59227}.Release|x86.ActiveCfg = Release|Any CPU
-		{99180374-30F2-43A2-B040-3EAA36B59227}.Release|x86.Build.0 = Release|Any CPU
 		{5DC8FA9E-4CB9-4F80-8AA9-7F4ABF8375B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5DC8FA9E-4CB9-4F80-8AA9-7F4ABF8375B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5DC8FA9E-4CB9-4F80-8AA9-7F4ABF8375B3}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -223,10 +195,8 @@ Global
 		{941378DD-52CC-48CD-8CB5-CE9039721DF8} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
 		{17E329C7-CAC6-4D6A-8D83-A4C68476DD04} = {6C110226-F12E-423E-A358-D680889C6CD7}
 		{A7E55927-04D3-4EDB-B598-6754611DE8C6} = {6C110226-F12E-423E-A358-D680889C6CD7}
-		{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
 		{25408E8E-979D-4A36-84EC-F778FEE284CF} = {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}
 		{5DC8FA9E-4CB9-4F80-8AA9-7F4ABF8375B3} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
 		{BC05CC41-9F65-4D0C-A1CD-C6BAED37B0AB} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
 	EndGlobalSection

diff --git a/appveyor.yml b/appveyor.yml
@@ -25,18 +25,16 @@ test_script:
 
 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 -hideskipped:All -returntargetcode -filter:"+[Condenser*]* -[*Test*]*"')
+  - 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\netcoreapp3.10;..\test\CondenserTests\bin\debug\netcoreapp3.0" -oldstyle -output:coverage.xml -skipautoprops -hideskipped:All -returntargetcode -filter:"+[Condenser*]* -[*Test*]*"')
   - ps: iex ((Get-ChildItem ($env:USERPROFILE + '\.nuget\packages\coveralls.io'))[0].FullName + '\tools\coveralls.net.exe' + ' --opencover coverage.xml')
   - "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%"
   - pip install codecov
   - codecov -f "coverage.xml"
   - dotnet build -c Release
   - dotnet pack -c Release src/CondenserDotNet.Client
-  - dotnet pack -c Release src/CondenserDotNet.Server
   - dotnet pack -c Release src/CondenserDotNet.Core
   - dotnet pack -c Release src/CondenserDotNet.Configuration
   - dotnet pack -c Release src/CondenserDotNet.Middleware
-  - dotnet pack -c Release src/CondenserDotNet.Server.Extensions
 
 
 artifacts:

diff --git a/releasenotes/5.0.0.props b/releasenotes/5.0.0.props
@@ -0,0 +1,9 @@
+<Project>
+  <PropertyGroup>
+    <PackageReleaseNotes>
+* Upgraded middleware package to Aspnet Core 3.0
+* Moved project to .net standard 2.1 and upgraded librarys
+* Removed unneeded package references
+</PackageReleaseNotes>
+  </PropertyGroup>
+</Project>
diff --git a/src/CondenserDotNet.Client/CondenserDotNet.Client.csproj b/src/CondenserDotNet.Client/CondenserDotNet.Client.csproj
@@ -14,10 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.0.1" />
   </ItemGroup>
 

diff --git a/src/CondenserDotNet.Configuration/CondenserDotNet.Configuration.csproj b/src/CondenserDotNet.Configuration/CondenserDotNet.Configuration.csproj
@@ -7,7 +7,6 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
   </ItemGroup>
 

diff --git a/src/CondenserDotNet.Core/CondenserDotNet.Core.csproj b/src/CondenserDotNet.Core/CondenserDotNet.Core.csproj
@@ -10,8 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/CondenserDotNet.Middleware.Pipelines/CondenserDotNet.Middleware.Pipelines.csproj b/src/CondenserDotNet.Middleware.Pipelines/CondenserDotNet.Middleware.Pipelines.csproj
diff --git a/src/CondenserDotNet.Middleware.Pipelines/HttpConsts.cs b/src/CondenserDotNet.Middleware.Pipelines/HttpConsts.cs
diff --git a/src/CondenserDotNet.Middleware.Pipelines/HttpRequestHelper.cs b/src/CondenserDotNet.Middleware.Pipelines/HttpRequestHelper.cs