Skip to content

Commit a9028ea

Browse files
DrawaesDrawaes
authored
Merge pull request #120 from Drawaes/AspNet3.0
Asp net3.0
2 parents 8e8f0d9 + 77f5170 commit a9028ea

79 files changed

Lines changed: 50 additions & 3727 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CondenserDotNet.sln‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CondenserTests", "test\Cond
2626
EndProject
2727
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Condenser.Tests.Integration", "test\Condenser.Tests.Integration\Condenser.Tests.Integration.csproj", "{A7E55927-04D3-4EDB-B598-6754611DE8C6}"
2828
EndProject
29-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CondenserDotNet.Server", "src\CondenserDotNet.Server\CondenserDotNet.Server.csproj", "{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}"
30-
EndProject
3129
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CondenserDotNet.Core", "src\CondenserDotNet.Core\CondenserDotNet.Core.csproj", "{25408E8E-979D-4A36-84EC-F778FEE284CF}"
3230
EndProject
3331
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
3836
EndProject
3937
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CondenserDotNet.Configuration", "src\CondenserDotNet.Configuration\CondenserDotNet.Configuration.csproj", "{6850B566-5210-4234-B9F6-6F543B73ED05}"
4038
EndProject
41-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CondenserDotNet.Server.Extensions", "src\CondenserDotNet.Server.Extensions\CondenserDotNet.Server.Extensions.csproj", "{99180374-30F2-43A2-B040-3EAA36B59227}"
42-
EndProject
4339
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Release Notes", "Release Notes", "{06591E48-DAE7-4EEE-81C8-2469894B9EAF}"
4440
ProjectSection(SolutionItems) = preProject
4541
releasenotes\2.1.1.props = releasenotes\2.1.1.props
@@ -143,18 +139,6 @@ Global
143139
{A7E55927-04D3-4EDB-B598-6754611DE8C6}.Release|x64.Build.0 = Release|Any CPU
144140
{A7E55927-04D3-4EDB-B598-6754611DE8C6}.Release|x86.ActiveCfg = Release|Any CPU
145141
{A7E55927-04D3-4EDB-B598-6754611DE8C6}.Release|x86.Build.0 = Release|Any CPU
146-
{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
147-
{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Debug|Any CPU.Build.0 = Debug|Any CPU
148-
{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Debug|x64.ActiveCfg = Debug|Any CPU
149-
{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Debug|x64.Build.0 = Debug|Any CPU
150-
{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Debug|x86.ActiveCfg = Debug|Any CPU
151-
{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Debug|x86.Build.0 = Debug|Any CPU
152-
{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Release|Any CPU.ActiveCfg = Release|Any CPU
153-
{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Release|Any CPU.Build.0 = Release|Any CPU
154-
{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Release|x64.ActiveCfg = Release|Any CPU
155-
{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Release|x64.Build.0 = Release|Any CPU
156-
{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Release|x86.ActiveCfg = Release|Any CPU
157-
{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78}.Release|x86.Build.0 = Release|Any CPU
158142
{25408E8E-979D-4A36-84EC-F778FEE284CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
159143
{25408E8E-979D-4A36-84EC-F778FEE284CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
160144
{25408E8E-979D-4A36-84EC-F778FEE284CF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -179,18 +163,6 @@ Global
179163
{6850B566-5210-4234-B9F6-6F543B73ED05}.Release|x64.Build.0 = Release|Any CPU
180164
{6850B566-5210-4234-B9F6-6F543B73ED05}.Release|x86.ActiveCfg = Release|Any CPU
181165
{6850B566-5210-4234-B9F6-6F543B73ED05}.Release|x86.Build.0 = Release|Any CPU
182-
{99180374-30F2-43A2-B040-3EAA36B59227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
183-
{99180374-30F2-43A2-B040-3EAA36B59227}.Debug|Any CPU.Build.0 = Debug|Any CPU
184-
{99180374-30F2-43A2-B040-3EAA36B59227}.Debug|x64.ActiveCfg = Debug|Any CPU
185-
{99180374-30F2-43A2-B040-3EAA36B59227}.Debug|x64.Build.0 = Debug|Any CPU
186-
{99180374-30F2-43A2-B040-3EAA36B59227}.Debug|x86.ActiveCfg = Debug|Any CPU
187-
{99180374-30F2-43A2-B040-3EAA36B59227}.Debug|x86.Build.0 = Debug|Any CPU
188-
{99180374-30F2-43A2-B040-3EAA36B59227}.Release|Any CPU.ActiveCfg = Release|Any CPU
189-
{99180374-30F2-43A2-B040-3EAA36B59227}.Release|Any CPU.Build.0 = Release|Any CPU
190-
{99180374-30F2-43A2-B040-3EAA36B59227}.Release|x64.ActiveCfg = Release|Any CPU
191-
{99180374-30F2-43A2-B040-3EAA36B59227}.Release|x64.Build.0 = Release|Any CPU
192-
{99180374-30F2-43A2-B040-3EAA36B59227}.Release|x86.ActiveCfg = Release|Any CPU
193-
{99180374-30F2-43A2-B040-3EAA36B59227}.Release|x86.Build.0 = Release|Any CPU
194166
{5DC8FA9E-4CB9-4F80-8AA9-7F4ABF8375B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
195167
{5DC8FA9E-4CB9-4F80-8AA9-7F4ABF8375B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
196168
{5DC8FA9E-4CB9-4F80-8AA9-7F4ABF8375B3}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -223,10 +195,8 @@ Global
223195
{941378DD-52CC-48CD-8CB5-CE9039721DF8} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
224196
{17E329C7-CAC6-4D6A-8D83-A4C68476DD04} = {6C110226-F12E-423E-A358-D680889C6CD7}
225197
{A7E55927-04D3-4EDB-B598-6754611DE8C6} = {6C110226-F12E-423E-A358-D680889C6CD7}
226-
{F8A84ABC-60CD-4EF4-B55D-CB27996B1F78} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
227198
{25408E8E-979D-4A36-84EC-F778FEE284CF} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
228199
{6850B566-5210-4234-B9F6-6F543B73ED05} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
229-
{99180374-30F2-43A2-B040-3EAA36B59227} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
230200
{5DC8FA9E-4CB9-4F80-8AA9-7F4ABF8375B3} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
231201
{BC05CC41-9F65-4D0C-A1CD-C6BAED37B0AB} = {CB18CD55-85E2-46FC-A55B-7DE23EABFAE5}
232202
EndGlobalSection

‎appveyor.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,16 @@ test_script:
2525

2626
after_test:
2727
# Build and pack source
28-
- 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*]*"')
28+
- 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*]*"')
2929
- ps: iex ((Get-ChildItem ($env:USERPROFILE + '\.nuget\packages\coveralls.io'))[0].FullName + '\tools\coveralls.net.exe' + ' --opencover coverage.xml')
3030
- "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%"
3131
- pip install codecov
3232
- codecov -f "coverage.xml"
3333
- dotnet build -c Release
3434
- dotnet pack -c Release src/CondenserDotNet.Client
35-
- dotnet pack -c Release src/CondenserDotNet.Server
3635
- dotnet pack -c Release src/CondenserDotNet.Core
3736
- dotnet pack -c Release src/CondenserDotNet.Configuration
3837
- dotnet pack -c Release src/CondenserDotNet.Middleware
39-
- dotnet pack -c Release src/CondenserDotNet.Server.Extensions
4038

4139

4240
artifacts:

‎releasenotes/5.0.0.props‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
<PropertyGroup>
3+
<PackageReleaseNotes>
4+
* Upgraded middleware package to Aspnet Core 3.0
5+
* Moved project to .net standard 2.1 and upgraded librarys
6+
* Removed unneeded package references
7+
</PackageReleaseNotes>
8+
</PropertyGroup>
9+
</Project>

‎src/CondenserDotNet.Client/CondenserDotNet.Client.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0" />
2119
<PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.0.1" />
2220
</ItemGroup>
2321

‎src/CondenserDotNet.Configuration/CondenserDotNet.Configuration.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<LangVersion>latest</LangVersion>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
1110
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
1211
</ItemGroup>
1312

‎src/CondenserDotNet.Core/CondenserDotNet.Core.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
14-
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.0.1" />
15-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
13+
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
14+
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
1615
</ItemGroup>
1716
</Project>

‎src/CondenserDotNet.Middleware.Pipelines/CondenserDotNet.Middleware.Pipelines.csproj‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/CondenserDotNet.Middleware.Pipelines/HttpConsts.cs‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/CondenserDotNet.Middleware.Pipelines/HttpRequestHelper.cs‎

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)