Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Titanium-Web-Proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Titanium-Web-Proxy
Commits
29ffc5b9
Unverified
Commit
29ffc5b9
authored
Apr 26, 2019
by
honfika
Committed by
GitHub
Apr 26, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #586 from honfika/master
nuget package consolidation
parents
a31938f4
4521a9f1
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
16 additions
and
20 deletions
+16
-20
CopyStream.cs
src/StreamExtended/Network/CopyStream.cs
+1
-0
CustomBufferedStream.cs
src/StreamExtended/Network/CustomBufferedStream.cs
+1
-0
StreamExtended.csproj
src/StreamExtended/StreamExtended.csproj
+1
-5
Titanium.Web.Proxy.Mono.csproj
src/Titanium.Web.Proxy/Titanium.Web.Proxy.Mono.csproj
+2
-3
Titanium.Web.Proxy.NetCore.csproj
src/Titanium.Web.Proxy/Titanium.Web.Proxy.NetCore.csproj
+0
-1
Titanium.Web.Proxy.csproj
src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
+4
-4
Titanium.Web.Proxy.nuspec
src/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec
+4
-4
Titanium.Web.Proxy.IntegrationTests.csproj
...tegrationTests/Titanium.Web.Proxy.IntegrationTests.csproj
+2
-2
Titanium.Web.Proxy.UnitTests.csproj
...m.Web.Proxy.UnitTests/Titanium.Web.Proxy.UnitTests.csproj
+1
-1
No files found.
src/StreamExtended/Network/CopyStream.cs
View file @
29ffc5b9
...
...
@@ -36,6 +36,7 @@ namespace StreamExtended.Network
this
.
writer
=
writer
;
BufferSize
=
bufferSize
;
buffer
=
bufferPool
.
GetBuffer
(
bufferSize
);
this
.
bufferPool
=
bufferPool
;
}
public
async
Task
<
bool
>
FillBufferAsync
(
CancellationToken
cancellationToken
=
default
(
CancellationToken
))
...
...
src/StreamExtended/Network/CustomBufferedStream.cs
View file @
29ffc5b9
...
...
@@ -649,6 +649,7 @@ namespace StreamExtended.Network
{
return
baseStream
.
BeginWrite
(
buffer
,
offset
,
count
,
callback
,
state
);
}
public
override
void
EndWrite
(
IAsyncResult
asyncResult
)
{
baseStream
.
EndWrite
(
asyncResult
);
...
...
src/StreamExtended/StreamExtended.csproj
View file @
29ffc5b9
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;netstandard
1.3
</TargetFrameworks>
<TargetFrameworks>net45;netstandard
2.0
</TargetFrameworks>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>StrongKey.snk</AssemblyOriginatorKeyFile>
<Version>1.0.0</Version>
...
...
@@ -18,8 +18,4 @@
<None Remove="StreamExtended.nuspec" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.ValueTuple" Version="4.3.1" />
</ItemGroup>
</Project>
\ No newline at end of file
src/Titanium.Web.Proxy/Titanium.Web.Proxy.Mono.csproj
View file @
29ffc5b9
...
...
@@ -12,9 +12,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BrotliSharpLib" Version="0.3.1" />
<PackageReference Include="Portable.BouncyCastle" Version="1.8.3" />
<PackageReference Include="StreamExtended" Version="1.0.188-beta" />
<PackageReference Include="BrotliSharpLib" Version="0.3.3" />
<PackageReference Include="Portable.BouncyCastle" Version="1.8.5" />
</ItemGroup>
<ItemGroup>
...
...
src/Titanium.Web.Proxy/Titanium.Web.Proxy.NetCore.csproj
View file @
29ffc5b9
...
...
@@ -14,7 +14,6 @@
<ItemGroup>
<PackageReference Include="BrotliSharpLib" Version="0.3.3" />
<PackageReference Include="Portable.BouncyCastle" Version="1.8.5" />
<PackageReference Include="StreamExtended" Version="1.0.209-beta" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
...
...
src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
View file @
29ffc5b9
...
...
@@ -19,19 +19,19 @@
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Win32.Registry">
<Version>4.
4
.0</Version>
<Version>4.
5
.0</Version>
</PackageReference>
<PackageReference Include="System.Security.Principal.Windows">
<Version>4.
4
.1</Version>
<Version>4.
5
.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="Microsoft.Win32.Registry">
<Version>4.
4
.0</Version>
<Version>4.
5
.0</Version>
</PackageReference>
<PackageReference Include="System.Security.Principal.Windows">
<Version>4.
4
.1</Version>
<Version>4.
5
.1</Version>
</PackageReference>
</ItemGroup>
...
...
src/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec
View file @
29ffc5b9
...
...
@@ -21,14 +21,14 @@
<group
targetFramework=
"netstandard2.0"
>
<dependency
id=
"Portable.BouncyCastle"
version=
"1.8.5"
/>
<dependency
id=
"BrotliSharpLib"
version=
"0.3.3"
/>
<dependency
id=
"Microsoft.Win32.Registry"
version=
"4.
4
.0"
/>
<dependency
id=
"System.Security.Principal.Windows"
version=
"4.
4
.1"
/>
<dependency
id=
"Microsoft.Win32.Registry"
version=
"4.
5
.0"
/>
<dependency
id=
"System.Security.Principal.Windows"
version=
"4.
5
.1"
/>
</group>
<group
targetFramework=
"netcoreapp2.1"
>
<dependency
id=
"Portable.BouncyCastle"
version=
"1.8.5"
/>
<dependency
id=
"BrotliSharpLib"
version=
"0.3.3"
/>
<dependency
id=
"Microsoft.Win32.Registry"
version=
"4.
4
.0"
/>
<dependency
id=
"System.Security.Principal.Windows"
version=
"4.
4
.1"
/>
<dependency
id=
"Microsoft.Win32.Registry"
version=
"4.
5
.0"
/>
<dependency
id=
"System.Security.Principal.Windows"
version=
"4.
5
.1"
/>
</group>
</dependencies>
</metadata>
...
...
tests/Titanium.Web.Proxy.IntegrationTests/Titanium.Web.Proxy.IntegrationTests.csproj
View file @
29ffc5b9
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
...
...
@@ -17,7 +17,7 @@
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="1
5.9.0
" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="1
6.0.1
" />
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
</ItemGroup>
...
...
tests/Titanium.Web.Proxy.UnitTests/Titanium.Web.Proxy.UnitTests.csproj
View file @
29ffc5b9
...
...
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="1
5.9.0
" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="1
6.0.1
" />
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
</ItemGroup>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment