Skip to content
This repository was archived by the owner on Jul 9, 2023. It is now read-only.

Commit 400ca56

Browse files
committed
organize; clean-up; NET45 developer pack is not available anymore
1 parent 26f971d commit 400ca56

19 files changed

+15
-175
lines changed

src/Titanium.Web.Proxy.Mono.sln

-61
This file was deleted.

src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ public void Redirect(string url, bool closeServerConnection = false)
606606
var response = new RedirectResponse();
607607
response.HttpVersion = HttpClient.Request.HttpVersion;
608608
response.Headers.AddHeader(KnownHeaders.Location, url);
609-
#if NET45
609+
#if NET451
610610
response.Body = Net45Compatibility.EmptyArray;
611611
#else
612612
response.Body = Array.Empty<byte>();

src/Titanium.Web.Proxy/Helpers/Net45Compatibility.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if NET45
1+
#if NET451
22
using System;
33
using System.Threading.Tasks;
44

src/Titanium.Web.Proxy/Helpers/RunTime.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static class RunTime
1313
{
1414
private static readonly Lazy<bool> isRunningOnMono = new Lazy<bool>(() => Type.GetType("Mono.Runtime") != null);
1515

16-
#if NET45 || NET461
16+
#if NET451 || NET461
1717
/// <summary>
1818
/// cache for Windows platform check
1919
/// </summary>

src/Titanium.Web.Proxy/Http/HeaderBuilder.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void Write(string str)
9494

9595
public ArraySegment<byte> GetBuffer()
9696
{
97-
#if NET45
97+
#if NET451
9898
return new ArraySegment<byte>(stream.ToArray());
9999
#else
100100
stream.TryGetBuffer(out var buffer);
@@ -104,7 +104,7 @@ public ArraySegment<byte> GetBuffer()
104104

105105
public string GetString(Encoding encoding)
106106
{
107-
#if NET45
107+
#if NET451
108108
return encoding.GetString(stream.ToArray());
109109
#else
110110
stream.TryGetBuffer(out var buffer);

src/Titanium.Web.Proxy/Http2/Hpack/Decoder.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ public void Decode(BinaryReader input, IHeaderListener headerListener)
257257
if (nameLength + HttpHeader.HttpHeaderOverhead > dynamicTable.Capacity)
258258
{
259259
dynamicTable.Clear();
260-
#if NET45
260+
#if NET451
261261
name = Net45Compatibility.EmptyArray;
262262
#else
263263
name = Array.Empty<byte>();
@@ -378,7 +378,7 @@ public void Decode(BinaryReader input, IHeaderListener headerListener)
378378

379379
if (valueLength == 0)
380380
{
381-
#if NET45
381+
#if NET451
382382
InsertHeader(headerListener, name, Net45Compatibility.EmptyArray, indexType);
383383
#else
384384
name = Array.Empty<byte>();

src/Titanium.Web.Proxy/Http2/Hpack/DynamicTable.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
2323
public class DynamicTable
2424
{
2525
// a circular queue of header fields
26-
#if NET45
26+
#if NET451
2727
HttpHeader[] headerFields = new HttpHeader[0];
2828
#else
2929
HttpHeader[] headerFields = Array.Empty<HttpHeader>();

src/Titanium.Web.Proxy/Network/TcpConnection/TcpConnectionFactory.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ internal Task<TcpServerConnection> GetServerConnection(ProxyServer proxyServer,
458458

459459
try
460460
{
461-
#if NET45
461+
#if NET451
462462
tcpServerSocket?.Close();
463463
#else
464464
tcpServerSocket?.Dispose();
@@ -479,7 +479,7 @@ internal Task<TcpServerConnection> GetServerConnection(ProxyServer proxyServer,
479479
{
480480
// dispose the current TcpClient and try the next address
481481
lastException = e;
482-
#if NET45
482+
#if NET451
483483
tcpServerSocket?.Close();
484484
#else
485485
tcpServerSocket?.Dispose();

src/Titanium.Web.Proxy/Network/Writers/NullWriter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void Write(byte[] buffer, int offset, int count)
2020

2121
public Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
2222
{
23-
#if NET45
23+
#if NET451
2424
return Net45Compatibility.CompletedTask;
2525
#else
2626
return Task.CompletedTask;

src/Titanium.Web.Proxy/Titanium.Web.Proxy.Mono.csproj

-47
This file was deleted.

src/Titanium.Web.Proxy/Titanium.Web.Proxy.NetCore.csproj

-52
This file was deleted.

src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>net451;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
55
<RootNamespace>Titanium.Web.Proxy</RootNamespace>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<SignAssembly>True</SignAssembly>
@@ -23,7 +23,7 @@
2323
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
2424
</ItemGroup>
2525

26-
<ItemGroup Condition="'$(TargetFramework)' != 'net45'">
26+
<ItemGroup Condition="'$(TargetFramework)' != 'net451'">
2727
<PackageReference Include="Microsoft.Win32.Registry">
2828
<Version>5.0.0</Version>
2929
</PackageReference>

src/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<copyright>Copyright &#x00A9; Titanium. All rights reserved.</copyright>
1515
<tags></tags>
1616
<dependencies>
17-
<group targetFramework="net45">
17+
<group targetFramework="net451">
1818
<dependency id="BrotliSharpLib" version="0.3.3" />
1919
<dependency id="Portable.BouncyCastle" version="1.8.8" />
2020
<dependency id="System.Buffers" version="4.5.1" />
@@ -48,7 +48,7 @@
4848
</dependencies>
4949
</metadata>
5050
<files>
51-
<file src="bin\$configuration$\net45\Titanium.Web.Proxy.dll" target="lib\net45" />
51+
<file src="bin\$configuration$\net451\Titanium.Web.Proxy.dll" target="lib\net451" />
5252
<file src="bin\$configuration$\net461\Titanium.Web.Proxy.dll" target="lib\net461" />
5353
<file src="bin\$configuration$\netstandard2.0\Titanium.Web.Proxy.dll" target="lib\netstandard2.0" />
5454
<file src="bin\$configuration$\netstandard2.1\Titanium.Web.Proxy.dll" target="lib\netstandard2.1" />

0 commit comments

Comments
 (0)