organize; clean-up; NET45 developer pack is not available anymore

justcoding121 · Nov 10, 2021 · 400ca56 · 400ca56
1 parent 26f971d
commit 400ca56
Show file tree

Hide file tree

Showing 19 changed files with 15 additions and 175 deletions.
diff --git a/src/Titanium.Web.Proxy.Mono.sln b/src/Titanium.Web.Proxy.Mono.sln
diff --git a/src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs b/src/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
@@ -606,7 +606,7 @@ public void Redirect(string url, bool closeServerConnection = false)
  var response = new RedirectResponse();
  response.HttpVersion = HttpClient.Request.HttpVersion;
  response.Headers.AddHeader(KnownHeaders.Location, url);
-#if NET45
+#if NET451
  response.Body = Net45Compatibility.EmptyArray;
 #else
  response.Body = Array.Empty<byte>();

diff --git a/src/Titanium.Web.Proxy/AsyncEventHandler.cs → ...m.Web.Proxy/Handlers/AsyncEventHandler.cs b/src/Titanium.Web.Proxy/AsyncEventHandler.cs → ...m.Web.Proxy/Handlers/AsyncEventHandler.cs
diff --git a/src/Titanium.Web.Proxy/CertificateHandler.cs → ....Web.Proxy/Handlers/CertificateHandler.cs b/src/Titanium.Web.Proxy/CertificateHandler.cs → ....Web.Proxy/Handlers/CertificateHandler.cs
diff --git a/src/Titanium.Web.Proxy/ExceptionHandler.cs → ...um.Web.Proxy/Handlers/ExceptionHandler.cs b/src/Titanium.Web.Proxy/ExceptionHandler.cs → ...um.Web.Proxy/Handlers/ExceptionHandler.cs
diff --git a/...um.Web.Proxy/ProxyAuthorizationHandler.cs → ...oxy/Handlers/ProxyAuthorizationHandler.cs b/...um.Web.Proxy/ProxyAuthorizationHandler.cs → ...oxy/Handlers/ProxyAuthorizationHandler.cs
diff --git a/src/Titanium.Web.Proxy/WebSocketHandler.cs → ...um.Web.Proxy/Handlers/WebSocketHandler.cs b/src/Titanium.Web.Proxy/WebSocketHandler.cs → ...um.Web.Proxy/Handlers/WebSocketHandler.cs
diff --git a/src/Titanium.Web.Proxy/WinAuthHandler.cs → ...nium.Web.Proxy/Handlers/WinAuthHandler.cs b/src/Titanium.Web.Proxy/WinAuthHandler.cs → ...nium.Web.Proxy/Handlers/WinAuthHandler.cs
diff --git a/src/Titanium.Web.Proxy/Helpers/Net45Compatibility.cs b/src/Titanium.Web.Proxy/Helpers/Net45Compatibility.cs
@@ -1,4 +1,4 @@
-#if NET45
+#if NET451
 using System;
 using System.Threading.Tasks;
 

diff --git a/src/Titanium.Web.Proxy/Helpers/RunTime.cs b/src/Titanium.Web.Proxy/Helpers/RunTime.cs
@@ -13,7 +13,7 @@ public static class RunTime
  {
  private static readonly Lazy<bool> isRunningOnMono = new Lazy<bool>(() => Type.GetType("Mono.Runtime") != null);
 
-#if NET45 || NET461
+#if NET451 || NET461
  /// <summary>
  /// cache for Windows platform check
  /// </summary>

diff --git a/src/Titanium.Web.Proxy/Http/HeaderBuilder.cs b/src/Titanium.Web.Proxy/Http/HeaderBuilder.cs
@@ -94,7 +94,7 @@ public void Write(string str)
 
  public ArraySegment<byte> GetBuffer()
  {
-#if NET45
+#if NET451
  return new ArraySegment<byte>(stream.ToArray());
 #else
  stream.TryGetBuffer(out var buffer);
@@ -104,7 +104,7 @@ public ArraySegment<byte> GetBuffer()
 
  public string GetString(Encoding encoding)
  {
-#if NET45
+#if NET451
  return encoding.GetString(stream.ToArray());
 #else
  stream.TryGetBuffer(out var buffer);

diff --git a/src/Titanium.Web.Proxy/Http2/Hpack/Decoder.cs b/src/Titanium.Web.Proxy/Http2/Hpack/Decoder.cs
@@ -257,7 +257,7 @@ public void Decode(BinaryReader input, IHeaderListener headerListener)
  if (nameLength + HttpHeader.HttpHeaderOverhead > dynamicTable.Capacity)
  {
  dynamicTable.Clear();
-#if NET45
+#if NET451
  name = Net45Compatibility.EmptyArray;
 #else
  name = Array.Empty<byte>();
@@ -378,7 +378,7 @@ public void Decode(BinaryReader input, IHeaderListener headerListener)
 
  if (valueLength == 0)
  {
-#if NET45
+#if NET451
  InsertHeader(headerListener, name, Net45Compatibility.EmptyArray, indexType);
 #else
  name = Array.Empty<byte>();

diff --git a/src/Titanium.Web.Proxy/Http2/Hpack/DynamicTable.cs b/src/Titanium.Web.Proxy/Http2/Hpack/DynamicTable.cs
@@ -23,7 +23,7 @@ namespace Titanium.Web.Proxy.Http2.Hpack
  public class DynamicTable
  {
  // a circular queue of header fields
-#if NET45
+#if NET451
  HttpHeader[] headerFields = new HttpHeader[0];
 #else
  HttpHeader[] headerFields = Array.Empty<HttpHeader>();

diff --git a/src/Titanium.Web.Proxy/Network/TcpConnection/TcpConnectionFactory.cs b/src/Titanium.Web.Proxy/Network/TcpConnection/TcpConnectionFactory.cs
@@ -458,7 +458,7 @@ internal TcpConnectionFactory(ProxyServer server)
 
  try
  {
-#if NET45
+#if NET451
  tcpServerSocket?.Close();
 #else
  tcpServerSocket?.Dispose();
@@ -479,7 +479,7 @@ internal TcpConnectionFactory(ProxyServer server)
  {
  // dispose the current TcpClient and try the next address
  lastException = e;
-#if NET45
+#if NET451
  tcpServerSocket?.Close();
 #else
  tcpServerSocket?.Dispose();

diff --git a/src/Titanium.Web.Proxy/Network/Writers/NullWriter.cs b/src/Titanium.Web.Proxy/Network/Writers/NullWriter.cs
@@ -20,7 +20,7 @@ public void Write(byte[] buffer, int offset, int count)
 
  public Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
  {
-#if NET45
+#if NET451
  return Net45Compatibility.CompletedTask;
 #else
  return Task.CompletedTask;

diff --git a/src/Titanium.Web.Proxy/Titanium.Web.Proxy.Mono.csproj b/src/Titanium.Web.Proxy/Titanium.Web.Proxy.Mono.csproj
diff --git a/src/Titanium.Web.Proxy/Titanium.Web.Proxy.NetCore.csproj b/src/Titanium.Web.Proxy/Titanium.Web.Proxy.NetCore.csproj
diff --git a/src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj b/src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net45;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+ <TargetFrameworks>net451;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
  <RootNamespace>Titanium.Web.Proxy</RootNamespace>
  <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  <SignAssembly>True</SignAssembly>
@@ -23,7 +23,7 @@
  <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
  </ItemGroup>
 
- <ItemGroup Condition="'$(TargetFramework)' != 'net45'">
+ <ItemGroup Condition="'$(TargetFramework)' != 'net451'">
  <PackageReference Include="Microsoft.Win32.Registry">
  <Version>5.0.0</Version>
  </PackageReference>

diff --git a/src/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec b/src/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec
@@ -14,7 +14,7 @@
  <copyright>Copyright &#x00A9; Titanium. All rights reserved.</copyright>
  <tags></tags>
  <dependencies>
- <group targetFramework="net45">
+ <group targetFramework="net451">
  <dependency id="BrotliSharpLib" version="0.3.3" />
  <dependency id="Portable.BouncyCastle" version="1.8.8" />
  <dependency id="System.Buffers" version="4.5.1" />
@@ -48,7 +48,7 @@
  </dependencies>
  </metadata>
  <files>
- <file src="bin\$configuration$\net45\Titanium.Web.Proxy.dll" target="lib\net45" />
+ <file src="bin\$configuration$\net451\Titanium.Web.Proxy.dll" target="lib\net451" />
  <file src="bin\$configuration$\net461\Titanium.Web.Proxy.dll" target="lib\net461" />
  <file src="bin\$configuration$\netstandard2.0\Titanium.Web.Proxy.dll" target="lib\netstandard2.0" />
  <file src="bin\$configuration$\netstandard2.1\Titanium.Web.Proxy.dll" target="lib\netstandard2.1" />